From e64c579ad45e77f453cb1b412f32f376bfe5f526 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 4 Apr 2020 14:17:00 +0200 Subject: [PATCH 001/310] sfizz: unstable-2020-01-24 -> 0.3.2 --- pkgs/applications/audio/sfizz/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index d785d3780658..acec8c54e53c 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub , cmake, libjack2, libsndfile }: +{ stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { pname = "sfizz"; - version = "unstable-2020-01-24"; + version = "0.3.2"; src = fetchFromGitHub { owner = "sfztools"; repo = pname; - rev = "b9c332777853cb35faeeda2ff4bf34ea7121ffb9"; - sha256 = "0wzgwpcwal5a7ifrm1hx8y6vx832qixk9ilp8wkjnsdxj6i88p2c"; + rev = version; + sha256 = "1px22x9lb6wyqfbv1jg1sbl1rsnwrzs8sm4dnas1w4ifchiv3ymd"; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libjack2 libsndfile ]; From 3794b600252c6a4763a931632f739d0c4d94a0a0 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 12 Apr 2020 12:00:00 +0000 Subject: [PATCH 002/310] agedu: 20180918 -> 20200206 --- pkgs/tools/misc/agedu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix index d0254e9ce9f5..b3664a4c9286 100644 --- a/pkgs/tools/misc/agedu/default.nix +++ b/pkgs/tools/misc/agedu/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, autoreconfHook, halibut}: let - date = "20180918"; - rev = "80c7beb"; + date = "20200206"; + rev = "963bc9d"; in stdenv.mkDerivation { name = "agedu-${date}.${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchgit { url = https://git.tartarus.org/simon/agedu.git; inherit rev; - sha256 = "0i930izna3s73p2q52qa377ixd14zij5q1n7w3irl7csyy78g0cd"; + sha256 = "1jmvgg2v6aqgbgpxbndrdhgfhlglrq4yv4sdbjaj6bsz9fb8lqhc"; }; nativeBuildInputs = [autoreconfHook halibut]; From f2402e5047f6e5e44e594b8fff18f978757a0d2c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 4 Apr 2020 08:59:24 +0200 Subject: [PATCH 003/310] bjumblr: init at 0.2 --- pkgs/applications/audio/bjumblr/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/bjumblr/default.nix diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix new file mode 100644 index 000000000000..de0cae7a21a3 --- /dev/null +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: + +stdenv.mkDerivation rec { + pname = "BJumblr"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = pname; + rev = "v${version}"; + sha256 = "14z8113zkwykbhm1a8h2xs972dgifvlfij92b08jckyc7cbz84ys"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libX11 cairo lv2 libsndfile + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sjaehn/BJumblr"; + description = "Pattern-controlled audio stream / sample re-sequencer LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17ece30157ed..0becec94ba1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18666,6 +18666,8 @@ in bs1770gain = callPackage ../applications/audio/bs1770gain { }; + bjumblr = callPackage ../applications/audio/bjumblr { }; + bsequencer = callPackage ../applications/audio/bsequencer { }; bslizr = callPackage ../applications/audio/bslizr { }; From 229ef0ea8a94ee889790851264397e285624879b Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:11:14 +0000 Subject: [PATCH 004/310] TotalParserCombinators: remove broken package --- .../agda/TotalParserCombinators/contextfile | 259 ------------------ .../agda/TotalParserCombinators/default.nix | 26 -- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 287 deletions(-) delete mode 100644 pkgs/development/libraries/agda/TotalParserCombinators/contextfile delete mode 100644 pkgs/development/libraries/agda/TotalParserCombinators/default.nix diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile deleted file mode 100644 index 46743cba3b67..000000000000 --- a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile +++ /dev/null @@ -1,259 +0,0 @@ - -Context: - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson **20150319181310 - Ignore-this: 52b9ff613d7f10b0c8f45591a0759d07 -] - -[Rolled back most of "Updated the code in response to changes to Agda". -Nils Anders Danielsson **20150319101420 - Ignore-this: c2ea7bdf79848235fa3ea64ebda116eb - * One of the Agda changes has been reverted. -] - -[Removed an outdated comment. -Nils Anders Danielsson **20150217162945 - Ignore-this: 3ff7732335750305fe220e65693f0cbf -] - -[Added the simplification "nonempty (return x) → fail". -Nils Anders Danielsson **20150217161718 - Ignore-this: 56ad6a68c314446d8986a8c1b49655d0 -] - -[Added Nonempty.nonempty-return. -Nils Anders Danielsson **20150217161629 - Ignore-this: 68829d3f9a248272c46848daa05ccfe3 -] - -[Updated the copyright year range. -Nils Anders Danielsson **20150212154744 - Ignore-this: 3410a12ca1f9de825b00e692b136d500 -] - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson **20150212152207 - Ignore-this: 683b5eeca5fa9c8490bceaf68c23a204 -] - -[Updated the copyright year range. -Nils Anders Danielsson **20141128223227 - Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e -] - -[Updated the code in response to changes to Agda and the library. -Nils Anders Danielsson **20141128223205 - Ignore-this: 6392ec67aab2c534a7195abed55be47 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson **20140425121055 - Ignore-this: 54d80fd647cb897eef85f57e9172f7db -] - -[Workaround for (possible) Agda bug. -Nils Anders Danielsson **20140228200347 - Ignore-this: b17884ad17a3bdb7faff678622365a8 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson **20130307134644 - Ignore-this: 50d070a22a6796b9acdf19d44ba5de16 -] - -[Updated code to reflect changes to Agda and the library API. -Nils Anders Danielsson **20130228122951 - Ignore-this: 761dc4d85683a59cc3667a8706c88093 -] - -[Turned _◇_ into a constructor. -Nils Anders Danielsson **20120316125431 - Ignore-this: 41b492c3106a575f28f146253f78a5ae -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson **20120316125416 - Ignore-this: e77d817d8b391c3b4806119d10848eb3 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson **20120215103344 - Ignore-this: 467716429d5553cd122722108ea82a08 -] - -[Modified a comment. -Nils Anders Danielsson **20120215103319 - Ignore-this: e57d4911f692f8a96a80017d910efc5f -] - -[Updated code to reflect change to library API. -Nils Anders Danielsson **20111006160229 - Ignore-this: 5359da54e7e6e0f92983fa3ecaccebf3 -] - -[Updated code to reflect changes to Agda and the library API. -Nils Anders Danielsson **20111003170117 - Ignore-this: cbdd35172e372779e12642985cf17268 -] - -[Rolled back addition of inversion lemmas. -Nils Anders Danielsson **20110930150912 - Ignore-this: 9c9b083f0afcf95aaaa55a01d871274e -] - -[Added inversion lemmas, implemented other lemmas using these lemmas. -Nils Anders Danielsson **20110930150842 - Ignore-this: 19b832c3f9e14d1e713b5911c094a130 - + This change was a response to a change to Agda's pattern matching - machinery. Subsequently the machinery was made more liberal again, - making this change unnecessary. -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson **20110517220158 - Ignore-this: ea9771a5014a25cb20afc2118638f8b5 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson **20110512124425 - Ignore-this: 97b154661679f574f6ab914583b14580 -] - -[Proved that many constructions preserve various preorders. -Nils Anders Danielsson **20110313012617 - Ignore-this: 8008efaff967c228448baa33b82edb81 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson **20110313002106 - Ignore-this: 94799ba1ae411e59fd8c6c7eac3b8dfb -] - -[Simplified TotalRecognisers.LeftRecursion.MatchingParentheses. -Nils Anders Danielsson **20110118102159 - Ignore-this: 1e01a8092b0c0124979ffc5fe17a245c -] - -[Added TotalRecognisers.LeftRecursion.MatchingParentheses. -Nils Anders Danielsson **20110118102146 - Ignore-this: 13a3bc91425364e26c3047561655bb25 -] - -[Added a simplifying backend. -Nils Anders Danielsson **20101229012716 - Ignore-this: 9ac7ae21cd44c099633678a994fb9a3 -] - -[Fixed another "bug" in the deep simplifier. -Nils Anders Danielsson **20101229010854 - Ignore-this: e258adf963436ef715242db23c6808e - + Sometimes the first layer of bind's right-hand argument was not - simplified. -] - -[Made simplify₁ public and changed its type. -Nils Anders Danielsson **20101228235603 - Ignore-this: d39b8453a15089126261e098080223c6 -] - -[Deep simplification no longer adds casts. -Nils Anders Danielsson **20101228192850 - Ignore-this: 2ba016825adfa3a1e36922869eabfd39 -] - -[The first constructor in a simplified parser can no longer be a cast. -Nils Anders Danielsson **20101228175822 - Ignore-this: ce3e38cc0b9a096aa436655c9013ae97 -] - -[Modified the outline. -Nils Anders Danielsson **20101228173414 - Ignore-this: f8866e69f6d1a344e79fb6f708dfa4c -] - -[Added an example: a right recursive expression grammar. -Nils Anders Danielsson **20101228173159 - Ignore-this: 9a4d732b451cca08ba19aac5d115c678 -] - -[Rearranged the code. -Nils Anders Danielsson **20101228172209 - Ignore-this: 50fa29406d0f150669ff3feec4dbe513 -] - -[Renamed same-bag/set to (initial-bag-)cong. -Nils Anders Danielsson **20101228170706 - Ignore-this: dd3ce43d77dde74cc2428d2568dd2d30 -] - -[Added TotalParserCombinators.Force. -Nils Anders Danielsson **20101228153638 - Ignore-this: 3b6ff6ea20df0c1293494f06845d17eb -] - -[Proved that uses of subst can be erased. -Nils Anders Danielsson **20101228153621 - Ignore-this: f503ba495b923ae521718b6957167128 -] - -[The deep simplifier no longer skips layers. -Nils Anders Danielsson **20101228141138 - Ignore-this: 733a4a4a9aa0f890ad1740ecfc6a599f -] - -[Documented that the deep simplifier misses every second layer. -Nils Anders Danielsson **20101228121910 - Ignore-this: 8a0baf25b12f63f8748dbc1d16affacf -] - -[The simplifier now applies the token-bind rule more often. -Nils Anders Danielsson **20101227165413 - Ignore-this: 40132fa6f19602886bbe29aadd8a683c -] - -[Switched back to deep simplification, now with a proper proof. -Nils Anders Danielsson **20101227125434 - Ignore-this: ccc46e82f6f9c6c2a27ddb43d315f7dd -] - -[Simplified the soundness proof. -Nils Anders Danielsson **20101227123839 - Ignore-this: fb6826dd9836e34fc3bfdce2928ba13d -] - -[Made some _≈[_]P_ constructors conditionally coinductive. -Nils Anders Danielsson **20101227123827 - Ignore-this: f521f70475403697229051b62343a080 - + The structure of the soundness proof was also changed. -] - -[Unified And, AsymmetricChoice and Not. -Nils Anders Danielsson **20101225103109 - Ignore-this: 5ae8b80e1505fe6e707bb2307d22688c -] - -[Modified some comments. -Nils Anders Danielsson **20101225101051 - Ignore-this: e812d8c3e9720895c368f7a286f8315c -] - -[Modified a comment. -Nils Anders Danielsson **20101223202647 - Ignore-this: 16ea5dc01a4cbe0fe38714b2e4b7ff6 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson **20101107162658 - Ignore-this: 9e38a10a9997c9825ece6ad9f871b673 -] - -[Added an alternative backend for TotalRecognisers.Simple. -Nils Anders Danielsson **20101020183743 - Ignore-this: a111a89e0c237e132b649561000f53d6 -] - -[TAG Code corresponding to the paper "Total Parser Combinators" (4). -Nils Anders Danielsson **20100928013815 - Ignore-this: 45ccc28373ed3974047315613eb14833 -] diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix deleted file mode 100644 index 97cceebc1b64..000000000000 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, agda, fetchdarcs, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "2015-03-19"; - name = "TotalParserCombinators-${version}"; - - src = fetchdarcs { - url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/"; - context = ./contextfile; - sha256 = "0jlbz8yni6i7vb2qsd41bdkpchqirvc5pavckaf97z7p4gqi2mlj"; - }; - - buildDepends = [ AgdaStdlib ]; - everythingFile = "TotalParserCombinators.agda"; - sourceDirectories = []; - topSourceDirectories = [ "../$sourceRoot" ]; - - meta = with stdenv.lib; { - homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html"; - description = "A monadic parser combinator library which guarantees termination of parsing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ ]; - broken = true; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbcdaf3a5a73..49fda77d53b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15152,8 +15152,6 @@ in pretty = callPackage ../development/libraries/agda/pretty { }; - TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators { }; - ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; From 99fa0644c9a3cf8f3a9d24c37895e0942259d898 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:11:49 +0000 Subject: [PATCH 005/310] Agda-Sheaves: remove broken package --- .../libraries/agda/Agda-Sheaves/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/agda/Agda-Sheaves/default.nix diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix deleted file mode 100644 index 513b79e63938..000000000000 --- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit }: - -agda.mkDerivation (self: rec { - version = "8a06162a8f0f7df308458db91d720cf8f7345d69"; - name = "Agda-Sheaves-${version}"; - src = fetchgit { - url = "https://github.com/jonsterling/Agda-Sheaves.git"; - rev = version; - sha256 = "1gjffyyi4gk9z380yw2wm0jg0a01zy8dnw7jrcc7222swisk5s2d"; - }; - - everythingFile = "sheaves.agda"; - topSourceDirectories = [ "../$sourceRoot" ]; - sourceDirectories = []; - - meta = { - homepage = "https://github.com/jonsterling/Agda-Sheaves"; - description = "Sheaves in Agda"; - license = stdenv.lib.licenses.cc-by-40; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # replaced by constructive-sheaf-semantics - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49fda77d53b0..6117b5fe7a5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15144,8 +15144,6 @@ in inherit (haskellPackages) ghcWithPackages; }; - AgdaSheaves = callPackage ../development/libraries/agda/Agda-Sheaves { }; - bitvector = callPackage ../development/libraries/agda/bitvector { }; categories = callPackage ../development/libraries/agda/categories { }; From 781a9273a8d998b78fcd47b4f5facaeab7fc8e14 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:12:26 +0000 Subject: [PATCH 006/310] pretty: remove broken package --- .../libraries/agda/pretty/contextfile | 43 ------------------- .../libraries/agda/pretty/default.nix | 26 ----------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 71 deletions(-) delete mode 100644 pkgs/development/libraries/agda/pretty/contextfile delete mode 100644 pkgs/development/libraries/agda/pretty/default.nix diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/pkgs/development/libraries/agda/pretty/contextfile deleted file mode 100644 index 2ea20153bbcc..000000000000 --- a/pkgs/development/libraries/agda/pretty/contextfile +++ /dev/null @@ -1,43 +0,0 @@ - -Context: - -[Updated the code in response to a change to Agda. -Nils Anders Danielsson **20150319181428 - Ignore-this: f83c3dccfe25a2a5b9d0437d1dce0ec0 -] - -[Rolled back most of "Updated the code in response to changes to Agda". -Nils Anders Danielsson **20150319101413 - Ignore-this: 5a26cf9cf83d0d146cca0c15c857d20c - * One of the Agda changes has been reverted. -] - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson **20150217101656 - Ignore-this: a12921aebbe0fb575ef391ba5789a391 -] - -[Modified the copyright year range. -Nils Anders Danielsson **20150213144338 - Ignore-this: 1d1b22457dd6dadcb47f5d7f3eea062 -] - -[Restored Grammar.Abstract and Grammar.Non-terminal. -Nils Anders Danielsson **20130727225031 - Ignore-this: ddccb15caa7a3c26e973997ffdb4eec1 -] - -[Modified the copyright year range. -Nils Anders Danielsson **20141128164015 - Ignore-this: b9c6dddc965738aa2a7670c4c18da67f -] - -[Updated the code to reflect changes to the library API. -Nils Anders Danielsson **20141128163950 - Ignore-this: 8094c47f23cef0fcc596ad0c18a92b56 -] - -[TAG Correct-by-Construction Pretty-Printing (2013-07-28) -Nils Anders Danielsson **20130727224432 - Ignore-this: 6aab9b2e6b638457767c8821f3c27cb4 -] diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix deleted file mode 100644 index de4cfaa6637b..000000000000 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, agda, fetchdarcs, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "2015-03-19"; - name = "pretty-${version}"; - - src = fetchdarcs { - url = "http://www.cse.chalmers.se/~nad/repos/pretty/"; - context = ./contextfile; - sha256 = "0zmwh9kln7ykpmkx1qhqz64qm2arq62b17vs5fswnxk7mqxsmrf0"; - }; - - buildDepends = [ AgdaStdlib ]; - everythingFile = "Pretty.agda"; - sourceDirectories = []; - topSourceDirectories = [ "../$sourceRoot" ]; - - meta = with stdenv.lib; { - homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html"; - description = "Correct-by-Construction Pretty-Printing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ ]; - broken = true; # 2018-04-11 - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6117b5fe7a5b..0fafb6d5642a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15148,8 +15148,6 @@ in categories = callPackage ../development/libraries/agda/categories { }; - pretty = callPackage ../development/libraries/agda/pretty { }; - ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; From 36840c5ff7813de552dedb894e4d9b6ae4e519a8 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:13:23 +0000 Subject: [PATCH 007/310] categories: remove broken package --- .../libraries/agda/categories/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/agda/categories/default.nix diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix deleted file mode 100644 index fef01ee9be70..000000000000 --- a/pkgs/development/libraries/agda/categories/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "33409120d071656f5198c658145889ae2e86249c"; - name = "categories-${version}"; - - src = fetchgit { - url = "https://github.com/copumpkin/categories.git"; - rev = version; - sha256 = "15x834f7jn2s816b9vz8nm8p424ppzv6v9nayaawyl43qmaaaa5p"; - }; - - buildDepends = [ AgdaStdlib ]; - sourceDirectories = [ "Categories" "Graphs" ]; - - meta = { - homepage = "https://github.com/copumpkin/categories"; - description = "Categories parametrized by morphism equality, in Agda"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # doesn't work due to new agdastdlib, see #9471 - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fafb6d5642a..919c78bc00fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15146,8 +15146,6 @@ in bitvector = callPackage ../development/libraries/agda/bitvector { }; - categories = callPackage ../development/libraries/agda/categories { }; - ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; From a519f22c03d65045996b77e89bb50c07728c85fd Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:13:52 +0000 Subject: [PATCH 008/310] bitvector: remove broken package --- .../libraries/agda/bitvector/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/agda/bitvector/default.nix diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix deleted file mode 100644 index bf9798557b10..000000000000 --- a/pkgs/development/libraries/agda/bitvector/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "f1c173313f2a41d95a8dc6053f9365a24690e18d"; - name = "bitvector-${version}"; - - src = fetchgit { - url = "https://github.com/copumpkin/bitvector.git"; - rev = version; - sha256 = "0jb421lxvyxz26sxa81qjmn1gfcxfh0fmbq128f0kslqhiiaqfrh"; - }; - - buildDepends = [ AgdaStdlib ]; - sourceDirectories = [ "Data" ]; - - meta = { - homepage = "https://github.com/copumpkin/bitvector"; - description = "Sequences of bits and common operations on them"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 919c78bc00fd..f8dfe935f55e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15144,8 +15144,6 @@ in inherit (haskellPackages) ghcWithPackages; }; - bitvector = callPackage ../development/libraries/agda/bitvector { }; - ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; From 6cbaa256fab7df0d213be5caa14a6a29c9a47ed0 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:25:43 +0000 Subject: [PATCH 009/310] agda-base: remove broken package --- .../libraries/agda/agda-base/default.nix | 23 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/agda/agda-base/default.nix diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix deleted file mode 100644 index 678b3a28dc7e..000000000000 --- a/pkgs/development/libraries/agda/agda-base/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, agda, fetchurl }: - -agda.mkDerivation (self: rec { - version = "0.1"; - name = "agda-base-${version}"; - - src = fetchurl { - url = "https://github.com/pcapriotti/agda-base/archive/v${version}.tar.gz"; - sha256 = "124h06p7jdiqr2x6r46sfab9r0cgb0fznr2qs5i1psl5yf3z74h8"; - }; - - sourceDirectories = [ "./." ]; - everythingFile = "README.agda"; - - meta = { - homepage = "https://github.com/pcapriotti/agda-base"; - description = "Base library for HoTT in Agda"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # largely replaced by HoTT-Agda - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8dfe935f55e..ea1a07917621 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15134,8 +15134,6 @@ in inherit (haskellPackages) Agda; }; - agdaBase = callPackage ../development/libraries/agda/agda-base { }; - agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { }; agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { }; From a5e6e5c170e19dc4e674f8f46f237c9eb18450f4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 26 Apr 2020 21:25:42 +0200 Subject: [PATCH 010/310] libmpack: fix source url Repository was moved to an organization. --- pkgs/development/libraries/libmpack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index cdc45956e7a3..736474d29a5f 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { - owner = "tarruda"; + owner = "libmpack"; repo = "libmpack"; rev = version; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; From 9a3d12e2aba4432b53d8ce40bdd8e1cf4d2c6e22 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 26 Apr 2020 21:28:40 +0200 Subject: [PATCH 011/310] luaPackages.mpack: use system mpack the luarocks package uses the builtin command and discards the Makefile. While using the makefile one needs to set some more flags. --- pkgs/development/lua-modules/overrides.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index cb429e59c927..84a15e8a674b 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -294,6 +294,12 @@ with super; }; }); + mpack = super.mpack.override({ + buildInputs = [ pkgs.libmpack ]; + # the rockspec doesn't use the makefile so you may need to export more flags + USE_SYSTEM_LUA = "yes"; + USE_SYSTEM_MPACK = "yes"; + }); rapidjson = super.rapidjson.override({ preBuild = '' From 17125fd235005ddd0713754a656d89c75b09bf3e Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 5 May 2020 02:37:27 +0300 Subject: [PATCH 012/310] handbrake: 1.3.1 -> 1.3.2 M pkgs/applications/video/handbrake/default.nix --- pkgs/applications/video/handbrake/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 9b51746b14c9..a9d616912fd1 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,9 +7,9 @@ # be nice to add the native GUI (and/or the GTK GUI) as an option too, but that # requires invoking the Xcode build system, which is non-trivial for now. -{ stdenv, lib, fetchurl, fetchpatch, +{ stdenv, lib, fetchurl, # Main build tools - python2, pkgconfig, autoconf, automake, libtool, m4, lzma, + pkgconfig, autoconf, automake, libtool, m4, lzma, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -49,15 +49,18 @@ assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null stdenv.mkDerivation rec { pname = "handbrake"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = ''https://download.handbrake.fr/releases/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0"; + # 2020-05-05: NOTE: Thou fetching from GitHub, still fetchurl required, + # because this tarball has their "special" packaging and so + # internal "special" version information + url = ''https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2''; + sha256 = "0w7jxjrccvxp7g15dv0spildg5apmqp4gwbcqmg58va2gylynvzc"; }; nativeBuildInputs = [ - python2 pkgconfig autoconf automake libtool m4 + pkgconfig autoconf automake libtool m4 python3 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ @@ -80,12 +83,9 @@ stdenv.mkDerivation rec { substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - substituteInPlace libhb/module.defs \ - --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs - sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ -i make/configure.py From facbf402ac3e9230e796fb54f7431851c1182aa1 Mon Sep 17 00:00:00 2001 From: sjau Date: Thu, 23 Apr 2020 11:56:52 +0200 Subject: [PATCH 013/310] vdagent: fixing 90s timeout on shutdown --- .../virtualization/spice-vdagent/default.nix | 3 + .../virtualization/spice-vdagent/timeout.diff | 84 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 pkgs/applications/virtualization/spice-vdagent/timeout.diff diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 22aa31a6dea3..f577ded70bae 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + patchFlags = [ "-uNp1" ]; + # included in the next release. + patches = [ ./timeout.diff ]; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; diff --git a/pkgs/applications/virtualization/spice-vdagent/timeout.diff b/pkgs/applications/virtualization/spice-vdagent/timeout.diff new file mode 100644 index 000000000000..2021e98e41f2 --- /dev/null +++ b/pkgs/applications/virtualization/spice-vdagent/timeout.diff @@ -0,0 +1,84 @@ +diff --git a/src/udscs.c b/src/udscs.c +index 4de75f8..7c99eed 100644 +--- a/src/udscs.c ++++ b/src/udscs.c +@@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new( + server->read_callback = read_callback; + server->error_cb = error_cb; + server->service = g_socket_service_new(); ++ g_socket_service_stop(server->service); + + g_signal_connect(server->service, "incoming", + G_CALLBACK(udscs_server_accept_cb), server); +@@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server, + g_object_unref(sock_addr); + } + ++void udscs_server_start(struct udscs_server *server) ++{ ++ g_socket_service_start(server->service); ++} ++ + void udscs_server_destroy_connection(struct udscs_server *server, + UdscsConnection *conn) + { +diff --git a/src/udscs.h b/src/udscs.h +index 45ebd3f..4f7ea36 100644 +--- a/src/udscs.h ++++ b/src/udscs.h +@@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server, + const gchar *addr, + GError **err); + ++void udscs_server_start(struct udscs_server *server); ++ + void udscs_server_destroy_connection(struct udscs_server *server, + UdscsConnection *conn); + +diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c +index cfd0a51..753c9bf 100644 +--- a/src/vdagentd/vdagentd.c ++++ b/src/vdagentd/vdagentd.c +@@ -1184,10 +1184,6 @@ int main(int argc, char *argv[]) + uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE); + } + +- g_unix_signal_add(SIGINT, signal_handler, NULL); +- g_unix_signal_add(SIGHUP, signal_handler, NULL); +- g_unix_signal_add(SIGTERM, signal_handler, NULL); +- + openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER); + + /* Setup communication with vdagent process(es) */ +@@ -1228,9 +1224,6 @@ int main(int argc, char *argv[]) + } + } + +- if (do_daemonize) +- daemonize(); +- + #ifdef WITH_STATIC_UINPUT + uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0, + debug > 1, uinput_fake); +@@ -1240,6 +1233,13 @@ int main(int argc, char *argv[]) + } + #endif + ++ if (do_daemonize) ++ daemonize(); ++ ++ g_unix_signal_add(SIGINT, signal_handler, NULL); ++ g_unix_signal_add(SIGHUP, signal_handler, NULL); ++ g_unix_signal_add(SIGTERM, signal_handler, NULL); ++ + if (want_session_info) + session_info = session_info_create(debug); + if (session_info) { +@@ -1252,6 +1252,7 @@ int main(int argc, char *argv[]) + + active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal); + ++ udscs_server_start(server); + loop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(loop); + From f5a90a7aab126857e9cac4f048930ddabc720c55 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Fri, 8 May 2020 21:49:16 +1200 Subject: [PATCH 014/310] dockerTools.buildImage: Preserve environment variables from the parent image --- nixos/tests/docker-tools.nix | 10 ++++++++ pkgs/build-support/docker/default.nix | 9 +++++-- pkgs/build-support/docker/examples.nix | 35 +++++++++++++++++++++++--- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 51b472fcf9ce..2375d15b3813 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -124,6 +124,16 @@ import ./make-test-python.nix ({ pkgs, ... }: { f"docker run --rm ${examples.layersOrder.imageName} cat /tmp/layer{index}" ) + with subtest("Ensure environment variables are correctly inherited"): + docker.succeed( + "docker load --input='${examples.environmentVariables}'" + ) + out = docker.succeed("docker run --rm ${examples.environmentVariables.imageName} env") + env = out.splitlines() + assert "FROM_PARENT=true" in env, "envvars from the parent should be preserved" + assert "FROM_CHILD=true" in env, "envvars from the child should be preserved" + assert "LAST_LAYER=child" in env, "envvars from the child should take priority" + with subtest("Ensure image with only 2 layers can be loaded"): docker.succeed( "docker load --input='${examples.two-layered-image}'" diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index bee6e37cccbb..f2a1378b8b27 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -773,13 +773,17 @@ rec { mkdir image touch baseFiles + baseEnvs='[]' if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." tar -C image -xpf "$fromImage" + # Store the layers and the environment variables from the base image cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list + configName="$(cat ./image/manifest.json | jq -r '.[0].Config')" + baseEnvs="$(cat "./image/$configName" | jq '.config.Env // []')" - # Do not import the base image configuration and manifest + # Otherwise do not import the base image configuration and manifest chmod a+w image image/*.json rm -f image/*.json @@ -859,7 +863,8 @@ rec { ) | sponge layer-list # Create image json and image manifest - imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") + imageJson=$(cat ${baseJson} | jq '.config.Env = $baseenv + .config.Env' --argjson baseenv "$baseEnvs") + imageJson=$(echo "$imageJson" | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") for layerTar in $(cat ./layer-list); do diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index f42b35e64943..c6cf595da103 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -231,14 +231,41 @@ rec { ''; }; - # 14. Create another layered image, for comparing layers with image 10. + # 14. Environment variable inheritance. + # Child image should inherit parents environment variables, + # optionally overriding them. + environmentVariables = let + parent = pkgs.dockerTools.buildImage { + name = "parent"; + tag = "latest"; + config = { + Env = [ + "FROM_PARENT=true" + "LAST_LAYER=parent" + ]; + }; + }; + in pkgs.dockerTools.buildImage { + name = "child"; + fromImage = parent; + tag = "latest"; + contents = [ pkgs.coreutils ]; + config = { + Env = [ + "FROM_CHILD=true" + "LAST_LAYER=child" + ]; + }; + }; + + # 15. Create another layered image, for comparing layers with image 10. another-layered-image = pkgs.dockerTools.buildLayeredImage { name = "another-layered-image"; tag = "latest"; config.Cmd = [ "${pkgs.hello}/bin/hello" ]; }; - # 15. Create a layered image with only 2 layers + # 16. Create a layered image with only 2 layers two-layered-image = pkgs.dockerTools.buildLayeredImage { name = "two-layered-image"; tag = "latest"; @@ -247,7 +274,7 @@ rec { maxLayers = 2; }; - # 16. Create a layered image with more packages than max layers. + # 17. Create a layered image with more packages than max layers. # coreutils and hello are part of the same layer bulk-layer = pkgs.dockerTools.buildLayeredImage { name = "bulk-layer"; @@ -258,7 +285,7 @@ rec { maxLayers = 2; }; - # 17. Create a "layered" image without nix store layers. This is not + # 18. Create a "layered" image without nix store layers. This is not # recommended, but can be useful for base images in rare cases. no-store-paths = pkgs.dockerTools.buildLayeredImage { name = "no-store-paths"; From 1e463bd6024d9f6c34d0ff423d626991a01a17de Mon Sep 17 00:00:00 2001 From: Kovacsics Robert Date: Sun, 29 Mar 2020 21:30:06 +0100 Subject: [PATCH 015/310] libfive: 2018-07-01 -> 2020-02-15 Use proper Qt bindings (#65399). Note, current version didn't work for me, new version does. The libfive library is licensed under MPL 2.0, while the libfive-guile and libfive-studio are under GPL 2+ Superseeds #66128 --- .../development/libraries/libfive/default.nix | 41 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index fa275c0d7805..2670f94fbc2f 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -1,30 +1,41 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen, -zlib, libpng, boost, qt5, guile +{ lib +, mkDerivation +, wrapQtAppsHook +, fetchFromGitHub +, cmake +, ninja +, pkgconfig +, eigen +, zlib +, libpng +, boost +, guile }: -stdenv.mkDerivation { - pname = "libfive"; - version = "2018-07-01"; +mkDerivation { + pname = "libfive-unstable"; + version = "2020-02-15"; src = fetchFromGitHub { - owner = "libfive"; - repo = "libfive"; - rev = "0f517dde9521d751310a22f85ee69b2c84690267"; - sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0"; + owner = "libfive"; + repo = "libfive"; + rev = "5b7717a25064478cd6bdb190683566eaf4c7afdd"; + sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg"; }; - nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ eigen zlib libpng boost qt5.qtimageformats guile ]; + + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ]; + buildInputs = [ eigen zlib libpng boost guile ]; # Link "Studio" binary to "libfive-studio" to be more obvious: postFixup = '' ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; homepage = "https://libfive.com/"; - maintainers = with maintainers; [ hodapp ]; - license = licenses.lgpl2; - platforms = platforms.linux; + maintainers = with maintainers; [ hodapp kovirobi ]; + license = with licenses; [ mpl20 gpl2Plus ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e2c8645d201..039c7c34ad5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12802,7 +12802,7 @@ in libfabric = callPackage ../os-specific/linux/libfabric {}; - libfive = callPackage ../development/libraries/libfive { }; + libfive = libsForQt5.callPackage ../development/libraries/libfive { }; libfixposix = callPackage ../development/libraries/libfixposix {}; From 8007a72a80f02d4409575d033c91ae53a46fc724 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 07:39:20 +0000 Subject: [PATCH 016/310] python27Packages.latexcodec: 1.0.7 -> 2.0.0 --- pkgs/development/python-modules/latexcodec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 2873c8f96220..25a266b3dc26 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "latexcodec"; - version = "1.0.7"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0wnp3yqcgx0rpy8dz51vh75lbp2qif67da19zi7m3ca98n887hgb"; + sha256 = "0pyzhidpnc3q3rh9d5hxhzv99rl5limyyrll7xcyssci92fn8gyd"; }; propagatedBuildInputs = [ six ]; From 2f612756f0e9346a42f06d76f2e8395bbaae082b Mon Sep 17 00:00:00 2001 From: talyz Date: Sat, 9 May 2020 18:33:57 +0200 Subject: [PATCH 017/310] arcanist: Fix on darwin With recent work done on the PHP packaging, the PHP executable is by default a wrapper script. Darwin doesn't like scripts in the shebang of another script, so we have to wrap arcanist, feeding the script as an argument to PHP instead. See #86881 and #23018. --- pkgs/development/tools/misc/arcanist/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 5eeae0ece5cd..a6265ba89d03 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -42,10 +42,12 @@ stdenv.mkDerivation { mkdir -p $out/bin $out/libexec cp -R libphutil $out/libexec/libphutil cp -R arcanist $out/libexec/arcanist - - ln -s $out/libexec/arcanist/bin/arc $out/bin - wrapProgram $out/bin/arc \ - --prefix PATH : "${php}/bin" + ${if stdenv.isDarwin then '' + echo "#! $shell -e" > $out/bin/arc + echo "exec ${php}/bin/php $out/libexec/arcanist/scripts/arcanist.php "'"$@"' >> $out/bin/arc + chmod +x $out/bin/arc'' + else '' + ln -s $out/libexec/arcanist/scripts/arcanist.php $out/bin/arc''} ''; meta = { From 4a07eb225b275105204ab0adbf711b6ba425a3cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 May 2020 06:25:56 +0000 Subject: [PATCH 018/310] redis: 5.0.8 -> 6.0.1 --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 8e75ee4fbde2..16d985f65598 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "5.0.8"; + version = "6.0.1"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1msfxr97aflk5zdgq8xvdbsgmzb906x0vdc1v6l2ccs35z2fmizk"; + sha256 = "0wzjjcjy2pyd3fwwcb9g936ichrrmj4xqi4wp9ic3vbr0i1nwxdq"; }; # Cross-compiling fixes From 85b39960b5e83c3113365b754925449df64929f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 May 2020 13:06:19 +0000 Subject: [PATCH 019/310] SPAdes: 3.14.0 -> 3.14.1 --- pkgs/applications/science/biology/spades/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index 08a6a0d25095..d555f2873a67 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "1ffxswd2ngkpy1d6l3lb6a9cmyy1fglbdsws00b3m1k22zaqv60q"; + sha256 = "1ji3afn6yvx7ysg7p9j0d1g28zrnxg1b7x90mhs2bj3lgs7vfafn"; }; nativeBuildInputs = [ cmake ]; From 89be001b27fb3c591065fcdd9e575f77cbf27b7d Mon Sep 17 00:00:00 2001 From: cmacrae Date: Sun, 10 May 2020 21:54:13 +0100 Subject: [PATCH 020/310] yabai: 3.0.0 -> 3.0.1 --- pkgs/os-specific/darwin/yabai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 7103c7825ccc..821d7ee5620a 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "0ajsh85p2vx18h3s4nicasyhdbh82zg97b1ryhi6l5lkbjpdl4ah"; + sha256 = "1m7hnrbwvahf174g6j5wjlcqa8zgd1fzqwrgnx9pma6pnh8q45lx"; }; buildInputs = [ Carbon Cocoa ScriptingBridge ]; From 5c68f7e94a1c7b5e0d027e261f183be93b7c57b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 11 May 2020 07:42:33 -0300 Subject: [PATCH 021/310] jgmenu: format with nixpkgs-fmt --- pkgs/applications/misc/jgmenu/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 46792588f4cc..9db589b5215d 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, python3Packages +, pango +, librsvg +, libxml2 +, menu-cache +, xorg +, makeWrapper +}: stdenv.mkDerivation rec { pname = "jgmenu"; @@ -27,7 +37,9 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; + makeFlags = [ + "prefix=${placeholder "out"}" + ]; postFixup = '' wrapPythonProgramsIn "$out/lib/jgmenu" From 3baa8c1bdcd32b73766782026bf9e14f01567908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 11 May 2020 08:26:07 -0300 Subject: [PATCH 022/310] jgmenu: no need to explicitly set prefix make flag It is automatically passed to the configure script. --- pkgs/applications/misc/jgmenu/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 9db589b5215d..8588a05b1229 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -37,10 +37,6 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ - "prefix=${placeholder "out"}" - ]; - postFixup = '' wrapPythonProgramsIn "$out/lib/jgmenu" for f in $out/bin/jgmenu{,_run}; do From be7b83b460a6b90367885340121c2edf2a016389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 11 May 2020 08:28:29 -0300 Subject: [PATCH 023/310] jgmenu: optionally install a xfce4 panel plugin - It is a contrib feature. - Default to false. --- pkgs/applications/misc/jgmenu/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 8588a05b1229..12aece3ba550 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -8,6 +8,9 @@ , menu-cache , xorg , makeWrapper +, enableXfcePanelApplet ? false +, xfce +, gtk3 }: stdenv.mkDerivation rec { @@ -35,6 +38,16 @@ stdenv.mkDerivation rec { xorg.libXinerama xorg.libXrandr python3Packages.python + ] ++ stdenv.lib.optionals enableXfcePanelApplet [ + gtk3 + xfce.libxfce4util + xfce.xfce4-panel + ]; + + configureFlags = [ + ] + ++ stdenv.lib.optionals enableXfcePanelApplet [ + "--with-xfce4-panel-applet" ]; postFixup = '' From 7f50c31786ebefc75d04ccb77023d82f306a3bd4 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Mon, 11 May 2020 15:46:35 +0300 Subject: [PATCH 024/310] elpa-packages: 2020-05-11 --- .../editors/emacs-modes/elpa-generated.nix | 93 +++++++++++-------- 1 file changed, 54 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index e0e28f53b816..4a9f1e9a2b0a 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.2.0.tar"; - sha256 = "0j919l3q5sq6h1k1kmk4kyv0vkzl4f98fxcd64v34x5q1ahjhg48"; + url = "https://elpa.gnu.org/packages/auctex-12.2.1.tar"; + sha256 = "14y0kdri2zvz81qwpncsr3ly4ciqab6g8yxl956k3ddn36b3a56s"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -685,10 +685,10 @@ elpaBuild { pname = "darkroom"; ename = "darkroom"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/darkroom-0.2.el"; - sha256 = "1a528brhz4vckhp77n2c1phkyqdliykpj9kzk3f834f4rwnb5mp0"; + url = "https://elpa.gnu.org/packages/darkroom-0.3.el"; + sha256 = "0l1xg5kqmjw22k78qnsln0ifx2dx74xxqj0qp8xxcpqvzzx0xh86"; }; packageRequires = [ cl-lib ]; meta = { @@ -925,10 +925,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.16"; + version = "0.6.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.16.tar"; - sha256 = "0yn0nqjp68kwlrd4qs9fg3xizm9jnddkkyw25l0llq04b53zgjdl"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.17.tar"; + sha256 = "07335pcqvvj1apzbwy4dc4i6pc6w21hr7v9fvgkc9c2x7fqlqg24"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1367,10 +1367,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.6.tar"; - sha256 = "1vlb9q7a622qylrgip5ld2yrzp4l58gl543i2jdxr7jxvamy22bp"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.7.tar"; + sha256 = "17pz6i51z298rk7j3rraw1gxlssn88yi4bbpzyxv9cs7y1lfy8ld"; }; packageRequires = [ cl-lib ]; meta = { @@ -1378,6 +1378,21 @@ license = lib.licenses.free; }; }) {}; + gnu-elpa = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "gnu-elpa"; + ename = "gnu-elpa"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnu-elpa-1.0.tar"; + sha256 = "0ywwlsyvl2g49k0krk35z15l2drqg3rdf26786rw65vz4ip2j3id"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-elpa.html"; + license = lib.licenses.free; + }; + }) {}; gnu-elpa-keyring-update = callPackage ({ elpaBuild , fetchurl , lib }: @@ -1419,10 +1434,10 @@ elpaBuild { pname = "gnus-mock"; ename = "gnus-mock"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.4.4.tar"; - sha256 = "0v94z800f1y3ylbgbrw4nslqm7j2jr592g402nxgj9rlldazzxg0"; + url = "https://elpa.gnu.org/packages/gnus-mock-0.4.5.tar"; + sha256 = "1hfh315vrxd54r2f1wpdfk06b7lhpab7knygav58vdwwdbndlqiz"; }; packageRequires = []; meta = { @@ -1696,10 +1711,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.9"; + version = "1.0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.9.el"; - sha256 = "1ncsdv9pr2zsfa9mxm4n68fppnkpm410mh72r7h5f8yj17lz00ss"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.11.el"; + sha256 = "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23"; }; packageRequires = [ emacs ]; meta = { @@ -1981,10 +1996,10 @@ elpaBuild { pname = "minimap"; ename = "minimap"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/minimap-1.2.el"; - sha256 = "1vcxdxy7mv8mi4lrri3kmyf9kly3rb02z4kpfx5d1xv493havvb8"; + url = "https://elpa.gnu.org/packages/minimap-1.3.el"; + sha256 = "15azlmi6kk9pg1c4zrw952qsh9wq6ggqb4qqc84a7l67nhqb9bqp"; }; packageRequires = []; meta = { @@ -2011,10 +2026,10 @@ elpaBuild { pname = "modus-operandi-theme"; ename = "modus-operandi-theme"; - version = "0.7.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.7.0.el"; - sha256 = "17zvcqplbl3rk39k61v43ganzv06j49rlyickanwll5m1a3iibw2"; + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.8.1.el"; + sha256 = "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb"; }; packageRequires = [ emacs ]; meta = { @@ -2026,10 +2041,10 @@ elpaBuild { pname = "modus-vivendi-theme"; ename = "modus-vivendi-theme"; - version = "0.7.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.7.0.el"; - sha256 = "1w4vrg39dghghkvll3h4kmzykc3zpp6pbychb39gcc13z2b06v8g"; + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.8.1.el"; + sha256 = "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1"; }; packageRequires = [ emacs ]; meta = { @@ -2455,10 +2470,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.43"; + version = "0.3.46"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.43.tar"; - sha256 = "099s7c0ll8bbfgynijjaciv2qnyg4r2akajkhlmchh7y10kp5ii4"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.46.tar"; + sha256 = "1chyhfn90c23awxdmmg9z870ipbdrg47sglgid7n598dx84qyqyz"; }; packageRequires = [ emacs ]; meta = { @@ -2795,10 +2810,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.15"; + version = "1.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.15.tar"; - sha256 = "0sxmdsacj8my942k8j76m2y68nzab7190acv7cwgflc5n4f07yxa"; + url = "https://elpa.gnu.org/packages/relint-1.17.tar"; + sha256 = "1nv13dqdhf72c1jgk1ml4k6jqb8wsyphcx2vhsyhig5198lg4kd7"; }; packageRequires = [ emacs xr ]; meta = { @@ -3255,10 +3270,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.3.3"; + version = "2.4.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.3.3.tar"; - sha256 = "1di9ia59k6x7j9r8flwf05r160j30nrg0jvq5fjc9iazag9lniyw"; + url = "https://elpa.gnu.org/packages/tramp-2.4.3.4.tar"; + sha256 = "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f"; }; packageRequires = [ emacs ]; meta = { @@ -3754,10 +3769,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.18"; + version = "1.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.18.tar"; - sha256 = "1nq9pj47sxgpkw97c2xrkhgcwh3zsfd2a22qiqbl4i9zf2l9yy91"; + url = "https://elpa.gnu.org/packages/xr-1.19.tar"; + sha256 = "1aa3iqh0r635jw8k89zh8y4am9d4hfrqpk9mrdh2b51invjn8llq"; }; packageRequires = [ emacs ]; meta = { From 4fc6c5ef8994326b3a92b8e188568ed4d5706dff Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Mon, 11 May 2020 15:47:29 +0300 Subject: [PATCH 025/310] melpa-packages: 2020-05-11 --- .../emacs-modes/recipes-archive-melpa.json | 3781 ++++++++++------- 1 file changed, 2206 insertions(+), 1575 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 2224c44f9c49..d6015f4cbbae 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -479,8 +479,8 @@ "auto-complete", "eclim" ], - "commit": "23f5b294f833ce58516d7b9ae08a7792d70022a1", - "sha256": "17q972354nkkynfjmwih4vp7s5dzdvr3nf7ni3ci095lzb0zzf4g" + "commit": "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100", + "sha256": "0jdddf8krvg379wlay1xs27qlxpi87nz6v2i526pk59mmg8jrnvc" }, "stable": { "version": [ @@ -960,8 +960,8 @@ "auto-complete", "yasnippet" ], - "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", - "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" + "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", + "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" }, "stable": { "version": [ @@ -997,8 +997,8 @@ "s", "xcscope" ], - "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", - "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" + "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", + "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" }, "stable": { "version": [ @@ -1064,8 +1064,8 @@ "auto-complete", "rtags" ], - "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", - "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -1360,14 +1360,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20200210, - 2031 + 20200509, + 1252 ], "deps": [ "avy" ], - "commit": "9b22793789263b2e2fc06ca8b6073bb01211df9b", - "sha256": "0ik2v881rnik58zvxczjg847fvc9vf493h85rv8q72hb7zi9p0gy" + "commit": "c215d331cf65bf47ad0224480f1f916f64f2a955", + "sha256": "05cvm7zz2c116sr8a2p9rc771i8w4pqkwvwc2hw99g84kf2abaaf" }, "stable": { "version": [ @@ -1963,25 +1963,25 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20200408, - 2114 + 20200501, + 1837 ], "deps": [ "powerline" ], - "commit": "d81ec80d6fc36157c20015e9fd6b192cfc679035", - "sha256": "0h9iximw1n5pwfd8zfn1xx4dcrsvxcy8rmr2ng20kl8bflir3i6s" + "commit": "5ea031bcbdf665afea7e47e519a49e2c33978833", + "sha256": "1jx17g8a6pxkw4zlx3fwhqgxfzcf3019k8fklykamfrkharzsc2l" }, "stable": { "version": [ 1, - 7 + 8 ], "deps": [ "powerline" ], - "commit": "bd9624a94618f4144762032a93549f53ffc1e7b3", - "sha256": "1rlszg7z5k8c6fmjk4sjgrc9xgcjc1jah6c7kdl9kypha7y8s4bq" + "commit": "5ea031bcbdf665afea7e47e519a49e2c33978833", + "sha256": "1jx17g8a6pxkw4zlx3fwhqgxfzcf3019k8fklykamfrkharzsc2l" } }, { @@ -2240,14 +2240,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200411, - 520 + 20200508, + 1157 ], "deps": [ "memoize" ], - "commit": "0b74fc361817e885580c3f3408079f949f5830e1", - "sha256": "0y7wgwkspa800pck4ijyzgp3nrg8xkky079k1ywz7p04jqvgxrpp" + "commit": "d6cb6d4a779eaa3570d8e451fd4d38b2b4554860", + "sha256": "0pnzsnklqjlks6ipaj242vlrk5skmwflpn1sdd00xw9gmb5mxb3m" }, "stable": { "version": [ @@ -2548,11 +2548,11 @@ "repo": "immerrr/ample-regexps.el", "unstable": { "version": [ - 20151023, - 1000 + 20200508, + 1021 ], - "commit": "cbe91e148cac1ee8e223874dc956ed4cf607f046", - "sha256": "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1" + "commit": "153969ce547afe410b8986f01c9ed4087c9cd20b", + "sha256": "0dkp7bcd7h2ds40wyszy11nmh7c2jxrwy04ayz7pbxh53ir7s2k0" } }, { @@ -2676,27 +2676,26 @@ "repo": "didibus/anakondo", "unstable": { "version": [ - 20200426, - 28 + 20200503, + 123 ], "deps": [ + "clojure-mode", "projectile" ], - "commit": "50ca8b69e0e53e4163215f3fcc325620b4d5d5af", - "sha256": "1sy0hxrj1vffqcwl5l48hl9yq4qswwjfgcc4445lairfycd4l9m7" + "commit": "ba6b56c18f2b0ae035b448813b27114d19fb821c", + "sha256": "0dbhkinfn6ahvi9pi7kghlc0fccil15lx0pd1rpgv4d7n3bnsdna" }, "stable": { "version": [ 0, - 1, - 1 + 2 ], "deps": [ - "json", "projectile" ], - "commit": "6ba040e6af4466949dcad2b4a47069705f200322", - "sha256": "05j9x11hy8wzq1fbbal1y1wzkw6h98l9pp8q0qmarg0lb6hjk52x" + "commit": "87760e8326a0e303ca66dda298a79742888b7254", + "sha256": "1l58l0gj3my61yi55hak0c8y26dc2sn8kzbs80v3vsfr6pq916vx" } }, { @@ -2785,11 +2784,15 @@ "repo": "rudolfolah/angularjs-mode", "unstable": { "version": [ - 20151201, - 2127 + 20200510, + 1729 ], - "commit": "8720cde86af0f1859ccc8580571e8d0ad1c52cff", - "sha256": "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377" + "commit": "b24020768217f16b1b86aa236e9729b3d40e17b3", + "error": [ + "exited abnormally with code 1\n", + "", + "error: unable to download 'https://github.com/rudolfolah/angularjs-mode/archive/b24020768217f16b1b86aa236e9729b3d40e17b3.tar.gz': HTTP error 404\n" + ] }, "stable": { "version": [ @@ -3238,19 +3241,16 @@ 20200331, 1717 ], - "commit": "3e34fb3df53c0c68e842fa179c327a7395d1901d", - "sha256": "10jgh1mg8bxmpgaspsmqksgf3cqw9glap84cb9sdirvicsmisbsd" + "commit": "896b2be2ebb1408b8f6a49e12375229fc64fcf41", + "sha256": "047ipsyldkmpn1vw8rsnhqwc7j2cjbwb9nz0ms3r3gmyyrgc3k0g" }, "stable": { "version": [ 0, - 62 + 63 ], - "deps": [ - "cl-lib" - ], - "commit": "3328619fec138862302bbe1b9acf2eea624a4c5e", - "sha256": "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan" + "commit": "a5a22fd537cb3bd2194d1eecc91dca418bedf442", + "sha256": "11k30174a0z738gcmvpvk8wxsnsdnaf4qphrz0aq8yy0k1pidav2" } }, { @@ -3300,20 +3300,20 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20200417, - 857 + 20200501, + 1904 ], - "commit": "2fcf73e0d522e88e99813c84ac1c07f8a83b1e77", - "sha256": "1kfzvgxf34a1wdiiwv4q6bix24avdiwkldxbypkpw57sbrarwiva" + "commit": "ee5f546f6659b9ca3c6895a1959087531b4a016a", + "sha256": "1qpqji2qx4srxk22684gh3sjj8sa87kd5fbr1xh8dscn19h5yvx9" }, "stable": { "version": [ 20, - 4, + 5, 0 ], - "commit": "03d4d55f5d44584d6de50033cdc1b1bc87db83a3", - "sha256": "0yv3l3j3syn2i4ff9rvsx7a2vp7mv7p9y08dzcvl6km1909adzc6" + "commit": "ee5f546f6659b9ca3c6895a1959087531b4a016a", + "sha256": "1qpqji2qx4srxk22684gh3sjj8sa87kd5fbr1xh8dscn19h5yvx9" } }, { @@ -4184,6 +4184,29 @@ "sha256": "0qnqqdpbfr06nqw4hq7c1s7yh7zyrv4gqjj06v70cavjml7pagp6" } }, + { + "ename": "auth-source-xoauth2", + "commit": "8ba0273c8aa2a50b9dc9b8312b860d94dfd808d5", + "sha256": "0g06240ix4gzw3fb74jcadiq7nissi20i1vsbzhkx35j10mv7wn3", + "fetcher": "github", + "repo": "ccrusius/auth-source-xoauth2", + "unstable": { + "version": [ + 20200509, + 2304 + ], + "commit": "5e646a32c9ba31a015a09fce1ad711b85717119a", + "sha256": "0nl859csl8xcd6ybpjj15ph8l8fxwkwf45kbylss68alkyf1rl3v" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "5e646a32c9ba31a015a09fce1ad711b85717119a", + "sha256": "0nl859csl8xcd6ybpjj15ph8l8fxwkwf45kbylss68alkyf1rl3v" + } + }, { "ename": "auto-async-byte-compile", "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af", @@ -4263,8 +4286,8 @@ "cl-lib", "popup" ], - "commit": "2e83566ddfa758c69afe50b8a1c62a66f47471e3", - "sha256": "1rkqjq7wr4aavg08i8mq13w85z14xdhfmpbipj5mhwlpyrrci4bk" + "commit": "2f11a4e6ff7f5d4939c3e1724158411a7efed057", + "sha256": "067ymm5swi9yq3sndzghqxlyyywzk434ip68nf6fxbj51raxzzq8" }, "stable": { "version": [ @@ -4570,11 +4593,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20180612, - 2341 + 20200510, + 1903 ], - "commit": "ec74b4803adeadf06296c84595fb6ccf4e1b4a3f", - "sha256": "0l08kx12k97nag8khb63rz5fl1r9gahgmjg5073h25lypl74895n" + "commit": "a87cf772ac4517864bd11e6d053d7dcedd802012", + "sha256": "112hj631m8dv6hfip0s63kr42nwl8l5b1vzqi3dwsg2xddrsws85" } }, { @@ -4813,14 +4836,26 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20200122, - 857 + 20200427, + 635 ], "deps": [ "f" ], - "commit": "22cd3dd6d3206cdab5c72792479a8f7f04a2b3e9", - "sha256": "0nwnmqhfy4378p43a12bc32y4qqw349xjkrdh6x7fkdsd4wpf7f4" + "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b", + "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "f" + ], + "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b", + "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f" } }, { @@ -4851,16 +4886,16 @@ "repo": "robert-zaremba/auto-virtualenvwrapper.el", "unstable": { "version": [ - 20200416, - 1128 + 20200510, + 1006 ], "deps": [ "cl-lib", "s", "virtualenvwrapper" ], - "commit": "f33e8c40e53c247ee6a4fd90af8805a9806735a1", - "sha256": "0hxwlm364xq66rp8izv0x09r37pg9kiddik0xbss736fdlw0sx4z" + "commit": "30fb54aa3c99f3c614ea9a92669d634df30c9439", + "sha256": "19qycxf6ln60s604j5rn3qfsy2rbzdbw4gwkiprdiq1bkmphbwzj" } }, { @@ -4926,8 +4961,8 @@ "deps": [ "cl-lib" ], - "commit": "b5ac7436be372dffc97280f4b835f61ab6b716d5", - "sha256": "138kzn20gfy6dj15nkfwsz7lz91n6ffsjzz2kkmclnfkazxixjhq" + "commit": "9e7a101e1563eaf6f5d671e5877d652079cea78b", + "sha256": "0khhmhh5fv004xhs3v8v8y3m8i1ibi19w74sv4shpy0ixd5zq1bj" } }, { @@ -4938,11 +4973,11 @@ "url": "https://git.sr.ht/~zge/autocrypt", "unstable": { "version": [ - 20200330, - 2301 + 20200505, + 1717 ], - "commit": "a16bf93ba833264b10d19abfa8fa684d9be32081", - "sha256": "119nii5qdds53cmwz3f8rl7f4k5l783h6k6ahizdawy4rf54xfz4" + "commit": "d77140654405cabd007621606aca9beb512dff7a", + "sha256": "0cr2q5dfvh85m6zlc2glssxj81py0hrvg9kh7bk6r33j0zygbr7r" } }, { @@ -5047,8 +5082,8 @@ 20190331, 2230 ], - "commit": "052881b101d8c2d11c89ae4f1befe7a999de987e", - "sha256": "0k9sjjsqxnrh0cq6m3cd9rk44n0rjbjgqcbfv6fg33a0gpybvryf" + "commit": "b3b85a1a4589430e9255a4ea28c4e94787c6b0fe", + "sha256": "148m78rlymxx5sr17xbvi5v864ki66jkg2hkszhyk9za4f0mgdx0" } }, { @@ -5598,11 +5633,11 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20200414, - 1123 + 20200510, + 1107 ], - "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db", - "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls" + "commit": "f80c7c394b57057499db6409f386ade9ac32f763", + "sha256": "0mj2kr13gpvy4kpzxvy1jmz0c9cdnikazlsb9j0dx94f9777sy04" }, "stable": { "version": [ @@ -5756,8 +5791,8 @@ "repo": "sasanidas/emacs-c64-basic-ide", "unstable": { "version": [ - 20200416, - 1953 + 20200429, + 1104 ], "deps": [ "basic-mode", @@ -5766,8 +5801,8 @@ "f", "flycheck" ], - "commit": "5d186623fb6805db71fe5b226df497e6b2904b96", - "sha256": "1v9mhvi1fqh4pni03y3qrlrzj2jrz2s9jc5g3jjpxll4zhsfr6w4" + "commit": "0f75c944239960445f1e9c8a0b5f7a5b4d37ff89", + "sha256": "0xmi27b3zs8bsvcf9405rg88cjz1x2nivj5pvy6gjy07r9dl7ngf" }, "stable": { "version": [ @@ -5867,11 +5902,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20200424, - 1953 + 20200509, + 1902 ], - "commit": "668a44907f7b3ad0e6fd300e319fba5862780140", - "sha256": "13llvkl40pybi4f1chak3v4f58fwwqw1kn9ygmv6dmn2wg4ag2mp" + "commit": "d0a0284575764cc9efdb3709fe3c320fd0c0873c", + "sha256": "0wbh06xsq9yqzvdfkmqbjggnfpspykyvahpcgmvrwg4kn3dlk3hd" }, "stable": { "version": [ @@ -6542,8 +6577,8 @@ "a", "pdf-tools" ], - "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", - "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" + "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3", + "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z" } }, { @@ -6591,8 +6626,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200417, - 1725 + 20200508, + 945 ], "deps": [ "biblio", @@ -6602,8 +6637,8 @@ "parsebib", "s" ], - "commit": "631dc607e8f29f1a585adde01d6785af1fb35d12", - "sha256": "09l1h1z493dc7hp109sqs1lkkcaw0mh762p5cpda9xymr9hf6w31" + "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", + "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" }, "stable": { "version": [ @@ -6645,11 +6680,11 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20200103, - 1237 + 20200429, + 1021 ], - "commit": "91d9f946690df0a1ed866f2cd1eab1b2e7c7480a", - "sha256": "0pkn99srwyvyibz5zxkh58csbf598x26f31mpizacx3bs4nys0qb" + "commit": "1bd8836171cf8da0be836fc407f2f140f52bdeb1", + "sha256": "0zd8ls2qyxgdzkmhl7mxlh7wbkp627kync8zg95kvrh3qymf5vys" }, "stable": { "version": [ @@ -6672,8 +6707,8 @@ 20200325, 539 ], - "commit": "773a6dde790c4a240e643a9071e4c7bce09d40de", - "sha256": "11dirb13hblfa95hqqshrsjri4d4qzcq5qhhnd4xqajdchr62758" + "commit": "de8d09b08b0b30714c4f9b98c97e9577d47b9be6", + "sha256": "1z3jk232i0h2zakvbkfpb5a5qdbzfqn4zvbja1hms9349x54a07i" }, "stable": { "version": [ @@ -6976,8 +7011,8 @@ 20200404, 1550 ], - "commit": "af37650d99bb5ae3ab05577a5bf99d5ff26b1e66", - "sha256": "18n1l6rwwfjrgaygm7nhrxg92fdd21aqkb38lc55lx3qhlrw1qwv" + "commit": "d99ab1aad84e4bd2bd4a499877764c213cce50ff", + "sha256": "0ay49ars61vr43n4bd3k4n1w89ilmw7d8s53ifixgw0vvjkz74z1" }, "stable": { "version": [ @@ -7376,16 +7411,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20200212, - 1535 + 20200507, + 1851 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "19bc70fa6f9e5c001f8ac714ce90af14788f35dd", - "sha256": "0ippdjd4j8y1xx438pvxiw0h0my6zdmvnbpay3fckrssirhi1m6l" + "commit": "6427c39ace4a1bd34d573773bc896a863e8503a2", + "sha256": "1gg6f9zaggqrb1cd258p3slv1rx083vpwlkgfgwlf8v8i8yr4bxp" }, "stable": { "version": [ @@ -7409,16 +7444,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20200223, - 1448 + 20200430, + 2304 ], "deps": [ - "dash", "epkg", "magit" ], - "commit": "3cfb35f5c54a76f200272ed11b4a39f11a57552c", - "sha256": "1y4c7bdy4vzv630d3yxhgq3v29q5f071d30kig4wwv460nai7c4c" + "commit": "067aa52079c49ecca97ca2d5d870a883b040d53b", + "sha256": "1wiaxr529zyk2m2jvags412qx079b0fwdzgw3nrvhvhcs3bwfwkr" }, "stable": { "version": [ @@ -8173,14 +8207,14 @@ "repo": "alezost/bui.el", "unstable": { "version": [ - 20181218, - 1830 + 20200426, + 2219 ], "deps": [ "dash" ], - "commit": "508577a7225b3d07eaefa9444064410af2518675", - "sha256": "0d9s0gdy5wda86jn8hjs1rq9rbwz5syvr8jxdks3iy27k4hp4wil" + "commit": "28a9b0a36cb69b931cf32db7546ad5c6589752cf", + "sha256": "1gwb95pjwv9k0iq290mcyyl0xasr3jldr086rrhabxpcc9ih3yv8" }, "stable": { "version": [ @@ -8421,8 +8455,8 @@ 20200412, 1148 ], - "commit": "a91f2820256a4e0c8636cc33a2ef8515a26d3f81", - "sha256": "0nhsxj48a9aqfmwqs4m65zh2g0cmvijz4m69cvx1bcia31jaabpx" + "commit": "532d082a363add4f6d9838ca3f924a773ce12136", + "sha256": "10ls012jy8ax43ldlvb86xjn9hsdayvw1k7wg4g8w5hmkd8x98wn" }, "stable": { "version": [ @@ -9414,11 +9448,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20200305, - 809 + 20200506, + 739 ], - "commit": "a5cb624ef5f9e3d51fce6faa8dc153277f61043a", - "sha256": "0gicai05d21909mjjvfc6194ygrqg2pbff60pjh3w593c4l4jmcj" + "commit": "480387b39f6ddd9cd2a9511ecee064ad8e1dd324", + "sha256": "1y5c2ycvmij7klvc9rhg265ha23xlh2hi4q5w50xljzh2mmlp3fb" }, "stable": { "version": [ @@ -9568,11 +9602,11 @@ "repo": "andre-r/centered-cursor-mode.el", "unstable": { "version": [ - 20190306, - 1006 + 20200507, + 1529 ], - "commit": "90e6d68a74d134f67c32d0621d64db90703c46eb", - "sha256": "05x1hppnmhinb92zblkwdpwkf0bhk7jsj2mms8mi1gl27pn7zg14" + "commit": "f376bdb882047347345d5f0e3ec3fcef63ee93ba", + "sha256": "1dnc0vjy6z6kdh8h8bmwi5vgyvy2z4405qpxb20d0dbly8qz9fns" } }, { @@ -9672,8 +9706,8 @@ 20171115, 2108 ], - "commit": "5d5692e7526eb228308f91c10761f22c69c8ea35", - "sha256": "1shwvgakkv9q9mlvzcsxnrj4zd1ld8nf7k8pw6zl6j3wg0sj5fd3" + "commit": "57125f74cc91ed6890346eee7948300437b6cb5e", + "sha256": "1131hx3chpl8qsl33xmnmqkb62cwpzfc0dks52mhcx0xy8wzds6r" }, "stable": { "version": [ @@ -9757,16 +9791,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20190618, - 1458 + 20191125, + 2007 ], "deps": [ "dash", "posframe", "s" ], - "commit": "de83b587affe374d1cf6e6c2d747696e6c33a817", - "sha256": "130g09i38k77y2kyirg54dglksl6vrypdhh4h2j8hzy1mipc5a43" + "commit": "fc5effdc25a926eada4936e5506dcccdf3902137", + "sha256": "1d18wvx2szmpvj5v26qqp2qkdmb764sfkp2f864by2hpad0rx034" }, "stable": { "version": [ @@ -10263,30 +10297,30 @@ "url": "https://framagit.org/contrapunctus/chronometrist/", "unstable": { "version": [ - 20200324, - 653 + 20200503, + 633 ], "deps": [ "dash", "s", "seq" ], - "commit": "dc0fb3bed6b893ecb924f5b1228ab718325cc808", - "sha256": "08mzv8rijsagkj4ykxlgr99axp0kxnz36d3iaffkqzyv50cm4r6f" + "commit": "282c338c21d01932049392f271f66e1725562efd", + "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "dash", "s", "seq" ], - "commit": "cc791cd61ee4580c9786f8c58d9e1964e0ff0c64", - "sha256": "1ccy7qz1wcmggqlf3hwigbqq4wrx1amds4x9bxz9py6bypglyjc5" + "commit": "282c338c21d01932049392f271f66e1725562efd", + "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr" } }, { @@ -10345,8 +10379,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200420, - 735 + 20200507, + 1639 ], "deps": [ "clojure-mode", @@ -10357,8 +10391,8 @@ "sesman", "spinner" ], - "commit": "7f4d4e81816e64238370e028824e6389f02a38c8", - "sha256": "03rbanapb2rg9is91r6c549gx96va5gkpdqhlm0gqgph4jg4jvfi" + "commit": "3a59fe046c9884573512dff88d140d37c0be7b2c", + "sha256": "0fs4mny2qg73nlnjr6ynaa7vqiyklp7mwfyph2195hrrac0f3dq4" }, "stable": { "version": [ @@ -11467,17 +11501,17 @@ 20190710, 1319 ], - "commit": "eadafe2ebc419414fba42a3fe28b534bb2fc7a93", - "sha256": "11yhjsg2y6mxpd674wkqfwzfm4qzrmbh0mywq7617brg6hk71kb9" + "commit": "c2460c0e63e965c6315db666af27dc39bd5a0477", + "sha256": "19xk1m92kx50jqrbfjhklywlsv0rll9qaywkqkpg9cag1pd86bx2" }, "stable": { "version": [ 3, 17, - 1 + 2 ], - "commit": "bd580b7d568493a795a855c0710ba4ad88532485", - "sha256": "1ng8svdxwgjj4aq9f89lx18znrlhcjgl0brsfxwissf1z0539l9d" + "commit": "615129f3ebd308abeaaee7f5f0689e7fc4616c28", + "sha256": "1akclhrc9gx0asvmwcsbvw90wgazlyqd044wql7qj6vibv47cdjd" } }, { @@ -11653,8 +11687,8 @@ "deps": [ "request" ], - "commit": "055c9ce9c1b630d062305919cbffb9cf88fd24a8", - "sha256": "12rydfm05i1qvav1c73wwlk63i8mvqi148hdx1fks7al4lkhg2nl" + "commit": "0d5be395d4233ea533e6eddf50af725c51304205", + "sha256": "12b2skhp9x17ffh1jxpl0nw7cybq9a2iyqmp3fwmvrr51mdg6va1" }, "stable": { "version": [ @@ -11977,11 +12011,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20200419, - 156 + 20200507, + 608 ], - "commit": "344b06ed3c139af717ebff59505fc66635678f6c", - "sha256": "00as07y5q71bscchbz3yzck4ljzbcd5x5ghzzajgz3pj484smz6z" + "commit": "e4e577c24db6ad7f6940a13e1d58418d42ff0c81", + "sha256": "0363fi2q4wprnkrdlvvbsib42czsf4fwhy61c6b9bbj8fvmflzj8" }, "stable": { "version": [ @@ -12408,11 +12442,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20200425, - 118 + 20200510, + 1614 ], - "commit": "fdde3d112ba85d034f83f95deafa24fd13be36e4", - "sha256": "1krc5gxlkhr87hw5wlch1wfrjxdin8isg51f8m6kjy20jx57jalc" + "commit": "1c7a87283146f429c5076e8ea0a559556a4d4272", + "sha256": "0dvvdyg8fc6jzcl1hgrh0cr3nz4vyw5i9xz5w3mc3mn7fixbdcr3" }, "stable": { "version": [ @@ -12582,16 +12616,16 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20190311, - 1745 + 20200511, + 401 ], "deps": [ "company", "dash", "dash-functional" ], - "commit": "8fc6168f2d3a0275156dd3fdf46ba496adbab226", - "sha256": "0mmn7lzl69hmy8rlzhwqb2ffgk29mb2ybb149cdpk7ydv1h63hqn" + "commit": "452f083f6c11793a3723224bce42898a2bedc0e1", + "sha256": "07il7z52ywvkqy5zpkvzsaxsjqx8dqgd91cpba05vywpsl3lis30" } }, { @@ -12801,8 +12835,8 @@ "company", "eclim" ], - "commit": "23f5b294f833ce58516d7b9ae08a7792d70022a1", - "sha256": "17q972354nkkynfjmwih4vp7s5dzdvr3nf7ni3ci095lzb0zzf4g" + "commit": "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100", + "sha256": "0jdddf8krvg379wlay1xs27qlxpi87nz6v2i526pk59mmg8jrnvc" }, "stable": { "version": [ @@ -13319,8 +13353,8 @@ "company", "native-complete" ], - "commit": "ccb5b52940a9374fbfe92947f0101e7254ba445d", - "sha256": "0p3qrl59qhczwysydsak66j7ixpykr3397xdvjj3hkmmcrsachic" + "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41", + "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5" } }, { @@ -13406,22 +13440,22 @@ }, { "ename": "company-org-roam", - "commit": "546d4c869c4d2a0981a572b5653f5e9ab8bcec47", - "sha256": "0kxf4fhs8ikw06ljdkk4ky1fb83xpmknasp7kyd3lpdk63cfvijh", + "commit": "aeb95e34be27dd78a237c0bfe1da94802fa68eae", + "sha256": "0k4w9g1rl94rpcvbcdmvsy47vzs53wz4b4hy9khj4yjn023nbsj7", "fetcher": "github", - "repo": "jethrokuan/company-org-roam", + "repo": "org-roam/company-org-roam", "unstable": { "version": [ - 20200403, - 614 + 20200511, + 743 ], "deps": [ "company", "dash", "org-roam" ], - "commit": "be645587aa51e764127dcbe49e70a13e618d4537", - "sha256": "0gk865wwkb9c6slfvm6sfq88c61s523bf52vi9rdq3gxghvqaaby" + "commit": "b5af6f2e783bfb337c8f0ae33674e0963c71cea0", + "sha256": "16nh58ih73q014crlm3iw55h04klb76g80zf43lmxilbhxyxk9x4" }, "stable": { "version": [ @@ -13452,8 +13486,8 @@ "cl-lib", "company" ], - "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", - "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" + "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", + "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" }, "stable": { "version": [ @@ -13589,8 +13623,8 @@ "company", "prescient" ], - "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", - "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" + "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", + "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" }, "stable": { "version": [ @@ -13778,8 +13812,8 @@ "company", "rtags" ], - "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", - "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -14167,14 +14201,14 @@ "repo": "sei40kr/competitive-programming-snippets", "unstable": { "version": [ - 20200213, - 1521 + 20200501, + 1205 ], "deps": [ "yasnippet" ], - "commit": "b0245fcbabf035d89b80150add5d6a47859ab555", - "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min" + "commit": "22bbf4c5edcc895b67b9f22599f284655ca48858", + "sha256": "14vbpy1y9dq9ip0bkmap7l2y2qx9jxzvisarbwlqqxj0xl7gbwc6" }, "stable": { "version": [ @@ -14197,11 +14231,11 @@ "repo": "muffinmad/emacs-completions-frame", "unstable": { "version": [ - 20200419, - 2027 + 20200507, + 1703 ], - "commit": "2e726a497605752d7d57aaf0adf53178c1e9f7e4", - "sha256": "0f4vaq84si57p7y0zl0l93vixv0ld1srrxvav40ipil3p9fm1yig" + "commit": "192a70060d2a8710ca75aa2336a10c21a4d30eed", + "sha256": "0bi7q2napzfqbsdi4si1kfzdjq39hxg3czwbpmybrljg6rwgr9xf" } }, { @@ -14323,8 +14357,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20200420, - 1418 + 20200509, + 1836 ], "deps": [ "dash", @@ -14332,14 +14366,14 @@ "pythonic", "s" ], - "commit": "f187948f7bda856befb54a08473c9aae3e595c8a", - "sha256": "02i3nq35cq0vlrg3xppyldi7s0zimvlf8j07xdn6pxm5ilrlmsl6" + "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9", + "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v" }, "stable": { "version": [ 0, 0, - 9 + 10 ], "deps": [ "dash", @@ -14347,8 +14381,8 @@ "pythonic", "s" ], - "commit": "64b804c33f2667e8232689770a9f2e332c2dd0ab", - "sha256": "1w1p1m2d0mwi3frkah5cnphyqsix7fp1li8glhlwf923cg48cxfq" + "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9", + "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v" } }, { @@ -14431,8 +14465,8 @@ "repo": "odanoburu/conllu-mode", "unstable": { "version": [ - 20190215, - 2043 + 20200501, + 2328 ], "deps": [ "cl-lib", @@ -14440,8 +14474,8 @@ "hydra", "s" ], - "commit": "1eb5ab3bad5cf36d30a557e64dc218b5fee735bf", - "sha256": "092wvxkscmpfrkpaw33r9qxrp4b2vcah3x61r7wry4f6v7jhd9hw" + "commit": "0db3063572b0de08874822e20570bb153747e6ed", + "sha256": "0l7d88p010z47qhk33k8s13h9596g3dxz3mx9winsm82px8fvcpp" }, "stable": { "version": [ @@ -14803,14 +14837,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200422, - 1208 + 20200507, + 2247 ], "deps": [ "swiper" ], - "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", - "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" + "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", + "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" }, "stable": { "version": [ @@ -14950,26 +14984,44 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200413, - 213 + 20200501, + 540 ], "deps": [ "counsel" ], - "commit": "65298d82468a2221f154de3606ead9a7a7806fa0", - "sha256": "0zk4axx64s9bmwfnhi2yhcfd9bkxxv3l5q33ak6l6q5dmyprp8ay" + "commit": "b03f02e7838199895a7b11cc8b2915f4746f1eba", + "sha256": "08nij19m51vzw8gy2sjxzflsqlnh2ink1ickh9sc4zwifbryimyy" }, "stable": { "version": [ 1, 9, - 6 + 7 ], "deps": [ "counsel" ], - "commit": "9fae8adc833919ffe33ca51d8e3db67e5be13666", - "sha256": "0831ylsl6d1ldrvvg5cs0yl33mh8s5hgxjp38kcy912mc7b1x0q1" + "commit": "b03f02e7838199895a7b11cc8b2915f4746f1eba", + "sha256": "08nij19m51vzw8gy2sjxzflsqlnh2ink1ickh9sc4zwifbryimyy" + } + }, + { + "ename": "counsel-fd", + "commit": "b2e58e2a0bf3825d6ef43455fd3e60b33c88aaa2", + "sha256": "1ywyg2l1dx2rziw23b0i5m4xg4n8laarkq9wbbq80ma5pjb18ims", + "fetcher": "github", + "repo": "CsBigDataHub/counsel-fd", + "unstable": { + "version": [ + 20200505, + 1344 + ], + "deps": [ + "counsel" + ], + "commit": "afba62f73d348cd7dfd10db039769788f5ae7ad4", + "sha256": "1v5iy8axlrapaav0vwhns32xbsnsay62dc9g50bv7n84cn1pvmmy" } }, { @@ -15135,15 +15187,15 @@ "repo": "ericdanan/counsel-projectile", "unstable": { "version": [ - 20200214, - 1450 + 20200430, + 2133 ], "deps": [ "counsel", "projectile" ], - "commit": "b556ed8995f375e57496f3482aef4b0def565de8", - "sha256": "105lvn2bmz6lgxx5y6k9gnhkl4p8igxwgnfz5anxlcv32w7q21pw" + "commit": "126e825bbab872b3befd9ef88660571391ebfdc3", + "sha256": "0shmndgr1plx8kzppn990ybb2144h8p49v4vd37099y5pj6w3zri" }, "stable": { "version": [ @@ -16070,8 +16122,8 @@ 20200417, 1549 ], - "commit": "97b59f1974ddcfcd9eedcf4c2d286a38f5200273", - "sha256": "1axi9wdpr82ghsbjxz1k73v82kkp9g63ahgqy38w6560f40m32dr" + "commit": "0bf26a5688b7f34695310100dc8c28381bfafe34", + "sha256": "1rknqa4qj3gfhlxfb8fqhdcy936sr0a2vi89rcqh5izl76zynisr" }, "stable": { "version": [ @@ -16242,11 +16294,11 @@ "repo": "xuchunyang/curl-to-elisp", "unstable": { "version": [ - 20200321, - 953 + 20200427, + 219 ], - "commit": "79da15f739984e3ce3e0b137df3634582abb4546", - "sha256": "04qjap6wsjd8kdz47bz1a11h1bdn7bmlvfg6y0bqy5yq55f4ampa" + "commit": "25449962e758607762b3df76fc5501cfeedbbd38", + "sha256": "1yk5j8sb1li2zh1w5awwn83rhcwr1g492an4ajxkyikj3b7ljyfv" } }, { @@ -16430,17 +16482,17 @@ 20190111, 2150 ], - "commit": "f09e61ab721ad51526ec7a6798fc01d8346f539d", - "sha256": "0l6yzbshqkkbb4fhvnakrilbyc441va6r3yhczksaz0rxlyminlw" + "commit": "9e04e1ee5b1ab67391bf461e9d1f0ef8d6049902", + "sha256": "013bhb4yb55525lvplnqhia5wlik807dvvh6zim3zimxzyv4b66c" }, "stable": { "version": [ 0, 29, - 16 + 17 ], - "commit": "c8425604fc3e4ea846016689942fa98e886b5f4f", - "sha256": "1794w6d9ams691ah8sah93vzb97wpss0j36z0fcn3sfvnf8kvpby" + "commit": "b648b65ac39291aa546b58e44c8576869c351b66", + "sha256": "1kc172hh7nj8vlf781rr8jal4f7nl7dbh6csxj0qz4h4cyxrsl6z" } }, { @@ -16582,11 +16634,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20200223, - 1128 + 20200507, + 2144 ], - "commit": "c6776c5f40587429a4fd6e9c52008bb9242ef692", - "sha256": "0qh21ry2vjsvr7yz110c6ggn8bhxdq2x37mwqalpibyx81clh3nw" + "commit": "06bcd1c00397a528cf8863b08e93e9a4b1032a57", + "sha256": "1y3xnya33qszxnn2kyzgk339gfxxq485b2fydhc32ayfav6hjfn7" } }, { @@ -16638,8 +16690,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200425, - 606 + 20200511, + 425 ], "deps": [ "bui", @@ -16650,13 +16702,13 @@ "lsp-treemacs", "s" ], - "commit": "43c672747e537620f5385ec4bd86c393b16d84dd", - "sha256": "0mqhzwk0l32k94msxq69wlcwxn8gc34cqbgxs7z1x9nddjirqmb1" + "commit": "3b8fd16cda74a4834594f487b7a540cc165470cf", + "sha256": "0jy70lj5krnj87icb1mgy30chr5jxhmiwy6cm2w2n7k8bp63jh6w" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "bui", @@ -16664,12 +16716,11 @@ "dash-functional", "f", "lsp-mode", - "s", - "tree-mode", - "treemacs" + "lsp-treemacs", + "s" ], - "commit": "4e25c8334f2ace87275f86b11f0ed969c2f20def", - "sha256": "0zajvq6p1d0lzha58yzaacbc060krhlj6m4v4lg9w1c9vdyshin3" + "commit": "6cbf83784788dc2bba85a2baa1492b276252680c", + "sha256": "0w0a9x8lp1z05jv50biidj7vh4yfwkzfkmzwv04il028cy509yh0" } }, { @@ -16904,11 +16955,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20200119, - 2310 + 20200426, + 2244 ], - "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", - "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" + "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b", + "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8" }, "stable": { "version": [ @@ -16983,8 +17034,8 @@ "deps": [ "dash" ], - "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", - "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" + "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b", + "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8" }, "stable": { "version": [ @@ -18004,8 +18055,8 @@ 20200404, 1549 ], - "commit": "6d9b86faecb2ab7c2e1eb90dcf7bffdf70804470", - "sha256": "05v449px4nq565w9kcg2bbz1j27qlgiw17z4drgriz2qf2m50v18" + "commit": "2850e8f27662eb1e8a34425b3032a361a5c989cc", + "sha256": "0p4l6gsfazq6aigvyy8mjkr9jpqs8cbmpzsfwdr7yvr5llxg77ds" }, "stable": { "version": [ @@ -18146,14 +18197,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20200406, - 37 + 20200510, + 1540 ], "deps": [ "cl-lib" ], - "commit": "a625033fb1dde83f6e4c2fc21f632b22ec34b609", - "sha256": "01m0aknqn0pgb46877kbz9n1nqmlamrlm58g2q894imbhybgfpan" + "commit": "ab2f4f0db9b0c3484db837252ce2dc75f4696b1d", + "sha256": "1pb1hp79b3r0nn7dclk3x0d0yrvx6nasgzwi1f918k9n7kzz7n4g" }, "stable": { "version": [ @@ -18266,20 +18317,20 @@ }, { "ename": "digit-groups", - "commit": "eea9d435c7c1889b16549a0ef3f66483b2de3605", - "sha256": "1wy1hf15qi9v0wz2rykpf40v3g2n4mha6h207m0zn8l8rb79hwjq", - "fetcher": "bitbucket", + "commit": "e5768c2d9f77e7fc58b7b293763cab64634e00da", + "sha256": "032dcnbwrm0fbg6dlghrcvslpwxlhw5bp4ank1mnkp5m39iwdn60", + "fetcher": "github", "repo": "adamsmd/digit-groups", "unstable": { "version": [ - 20160817, - 226 + 20200506, + 37 ], "deps": [ "dash" ], - "commit": "ee1d6de372600cb9e1aa481b7ed0eb7ca37c5246", - "sha256": "0rkajjlw820gfx1kclkcvdq7milhiid2yzvn9hd275ydskrhhwlp" + "commit": "7b81930cad19b8b7913b7eedbcb498964bfdcbdb", + "sha256": "1ss8ym7zayhvyrl4lzxjqiy8azx2zciwcp1x6s8vw649gmyi98jc" } }, { @@ -18421,11 +18472,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20200329, - 35 + 20200509, + 1718 ], - "commit": "5298af739ce30bacadda892b620858b95709c84b", - "sha256": "0dlgk66mcbzdbpw0xn6l7fxjayvgczccsx0igda9745pwm8yvy9z" + "commit": "4abe51533a972910f9012029a47b533878ec682e", + "sha256": "023lrm9s8rdq41d19nlizq2s1d2317s4qlc83m4g6ymw54m61z2m" }, "stable": { "version": [ @@ -18822,11 +18873,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20200403, - 308 + 20200430, + 1625 ], - "commit": "6e5d26ca859f7af624351ba2af6b1be83982053b", - "sha256": "0xy8c90d6lv21cp5p2xzqqv5da2m3mry8bdkz54rknv2v9in8g0l" + "commit": "95a411f6d4bb5eec4ef8fdbba9f038ddf60da81f", + "sha256": "0rz8d9lj2zbipz6cwrlw2a3z9y4rybbmz73h73l1i7fjg9q1kqm4" } }, { @@ -19583,17 +19634,17 @@ }, { "ename": "ditz-mode", - "commit": "02e2a2a25f42929626d7237511136ba6826dad33", - "sha256": "0shzm9l31n4ffjs1d26ykxsycd478lhlpl8xcwzbjryywg4gf5nd", - "fetcher": "bitbucket", - "repo": "zondo/ditz-mode", + "commit": "ac0d321e7486f297f783c07268563586aa0e3d92", + "sha256": "1k6rw2xmhlpcixwgfy6207h0jcqv09jfhi3dzj5n56s108z6hqr4", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zondo/ditz-mode", "unstable": { "version": [ 20150729, 940 ], - "commit": "beac4c1f3b7ef82014bb77ad8752dace482897da", - "sha256": "1cbsy4lchl41zmyxfq828cjpl3h2dwvn8xf1qgf2lbscdb6cwbwb" + "commit": "74b6b93b097d595a001c019e3b762abfc60f821a", + "sha256": "194i43s99by2rrb112nh6rkwcd5rmmdj6kfc2bc1k6ygnvynnk67" } }, { @@ -19776,8 +19827,8 @@ "repo": "pythonic-emacs/djangonaut", "unstable": { "version": [ - 20180727, - 1544 + 20200503, + 921 ], "deps": [ "f", @@ -19785,8 +19836,8 @@ "pythonic", "s" ], - "commit": "3e154709def09020a9b9eb29d330fb1f833a8250", - "sha256": "0lfh55disvc1ngysljvcccv5hl3k2xj3czy6h3chwqp7py33i1kc" + "commit": "75f642114e3997308a1e7e67c3025738cecee0fe", + "sha256": "1bka2nj2hqhpjiwdghp56y7z3jdxrpqw10s9divpa910mk33vay8" } }, { @@ -19949,8 +20000,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20200421, - 822 + 20200508, + 1956 ], "deps": [ "dash", @@ -19960,8 +20011,8 @@ "tablist", "transient" ], - "commit": "08745207332d940130a2357eb5c5e00fd88bd6af", - "sha256": "15fgcmld7z83b89jkwi0a5i9lls43kpbqav0lhfdyq3m941whzs4" + "commit": "01a04d0a295f3396833d0b6fa60cf24d52e1a89f", + "sha256": "0gh0h64dwn8v67q5569gifdjhzz5g4hfnsiqmg1nyq0nhvpp2b1c" }, "stable": { "version": [ @@ -20120,11 +20171,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200413, - 157 + 20200504, + 2258 ], - "commit": "c237e72e0bc53a67a83c05d9c1bb28e80fd15c1e", - "sha256": "0bh7yckr1cfampc1kmigbg98b6kwvnjgq8143lqlj1hmg0hw5cb6" + "commit": "992d14ca51ccc1e27c9c4a09f89b072cd6cb3fe3", + "sha256": "0ajyhric6008ik1mzlcmk0i856a3plhk0bri7chc9w7wz4lwshpv" } }, { @@ -20239,16 +20290,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200425, - 553 + 20200502, + 434 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "c177959bbfa7fa6f199b1145c6986e55f462f1c1", - "sha256": "0iclkfryfj72c5377rydsxh090maq6i0sxj90cm6dalyazd7rl4k" + "commit": "df56aad083243124cbd346c1b9ae38b5ebdd2340", + "sha256": "0zylvc8nfpgmss1j8rkln3z23vdav1cqfr2c9s59i9fwd9sv7q0k" }, "stable": { "version": [ @@ -20273,14 +20324,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200331, - 1901 + 20200507, + 524 ], "deps": [ "cl-lib" ], - "commit": "8d5ddbbb72752fdd981407bdc2e33d917675e919", - "sha256": "16d1mlz5ll89p2f4avz8cbyg2wkxkjydb19aff9y6c75pw948cks" + "commit": "34f181c290d2c9fb9628e4ec85c16e633931ede1", + "sha256": "161hp69n3zwnyb9f9pxpidx7jw3190v16j1fgsdsa08c1pq46q8m" }, "stable": { "version": [ @@ -20509,11 +20560,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200412, - 1112 + 20200429, + 1947 ], - "commit": "81d06717d1b75d2b51c1b7d3da93b6a01d7e253d", - "sha256": "1ywzxhygf8qyif4d6kg0rhbpdxxb74wnip8n4n9m9mabmff5xkzk" + "commit": "e5cbc350f49a30ad78a84e68b4e1682d018c9b7f", + "sha256": "1gakipj027mncv3g18ap6lshj89s8cg5wscabr3afs9gavkp52py" }, "stable": { "version": [ @@ -20757,19 +20808,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20200410, - 920 + 20200430, + 1023 ], - "commit": "9163cd990fb1f43dafed3948c6e406c13a45a6be", - "sha256": "1x73akd8l7bsn59wnz2cg0mxms98r1li40w3by121p9md49fd0r8" + "commit": "50c440c80e0d15303d8ab543bce4c56e9c2bf407", + "sha256": "0p5v5xwr0s59hv3s0f85byafphc85qv76g41crad9fhnxzab9rly" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "9163cd990fb1f43dafed3948c6e406c13a45a6be", - "sha256": "1x73akd8l7bsn59wnz2cg0mxms98r1li40w3by121p9md49fd0r8" + "commit": "50c440c80e0d15303d8ab543bce4c56e9c2bf407", + "sha256": "0p5v5xwr0s59hv3s0f85byafphc85qv76g41crad9fhnxzab9rly" } }, { @@ -20893,8 +20944,8 @@ 20191016, 1241 ], - "commit": "17895c30724c2a5ea18c0140d4022e2ef83d7208", - "sha256": "0sgn56g1225ar45kgp5qcdd6fc95skr36zci1lz1fszy94v162z7" + "commit": "73a70c02aa569f92e7c7bda21ff1728e37af53cf", + "sha256": "1ifya6ri0yz8bbncs1qm5ip9pjzq6ykgv1ilya51hggxwf3fs1db" }, "stable": { "version": [ @@ -21353,28 +21404,28 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20200209, - 743 + 20200427, + 1901 ], "deps": [ "popup", "request" ], - "commit": "30145bb0bd5b04d9c413f5ace2fd0e52b2519663", - "sha256": "1i3wjkxksmq4d364sc56243p847rkyzzh10xj1j5a3zm69g3v53z" + "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb", + "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x" }, "stable": { "version": [ 3, 9, - 45 + 46 ], "deps": [ "popup", "request" ], - "commit": "30145bb0bd5b04d9c413f5ace2fd0e52b2519663", - "sha256": "1i3wjkxksmq4d364sc56243p847rkyzzh10xj1j5a3zm69g3v53z" + "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb", + "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x" } }, { @@ -21385,26 +21436,26 @@ "repo": "masasam/emacs-easy-jekyll", "unstable": { "version": [ - 20200209, - 651 + 20200506, + 117 ], "deps": [ "request" ], - "commit": "3582ed543b3e9f5c32834f530abeba92ef0b4244", - "sha256": "0bqp6z1c1bf5gbj4rz717q47cj54ral2gagz8b6d7ihyn7398qq6" + "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0", + "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp" }, "stable": { "version": [ 2, 4, - 24 + 26 ], "deps": [ "request" ], - "commit": "75f057caf54714b4e8a0934107f1ff8a05fc5349", - "sha256": "1753wf817z65sd23bkispsxyk67sd4r2yx9k6f1ncaywcl0z974k" + "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0", + "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp" } }, { @@ -21592,11 +21643,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20200422, - 723 + 20200427, + 1143 ], - "commit": "ec8a5057dd2bf6275c8cdfca53c51e0b7f21b8f3", - "sha256": "0j6g56vqi12m5533dm6f716vsqcw59awfbiiv0jafb5kw9wj698v" + "commit": "9e1878810eaaaa55885d4cbcd6968566e4e3f7a8", + "sha256": "0czrchzz7ljynbkkgpp1ifjybp33wx4lhyzyqkxs4q84rs4m7p2p" } }, { @@ -21633,8 +21684,8 @@ "s", "yasnippet" ], - "commit": "23f5b294f833ce58516d7b9ae08a7792d70022a1", - "sha256": "17q972354nkkynfjmwih4vp7s5dzdvr3nf7ni3ci095lzb0zzf4g" + "commit": "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100", + "sha256": "0jdddf8krvg379wlay1xs27qlxpi87nz6v2i526pk59mmg8jrnvc" }, "stable": { "version": [ @@ -22292,8 +22343,8 @@ "deps": [ "dash" ], - "commit": "64511754e123687930afdb5b05cfcc24a30fbbcb", - "sha256": "1bxf5wssmpgnidf228frzw347fx8fvcqsj8rpg83fz315i16nydb" + "commit": "e683b16ed4265ddb46efcc8cbf9503301cc39e22", + "sha256": "12nsbqrk7clr642kmbaa9xqgx7j2r6as6grx5qmghnp7kjfy1d7l" }, "stable": { "version": [ @@ -22358,8 +22409,8 @@ 20200107, 2333 ], - "commit": "8e0706fdb5ae139a1db93bdd24203a261b13c875", - "sha256": "09jqjdgjrg740a326vn086wj3gv548w19dk8pz9k7k3dvlncw24y" + "commit": "9b17c3a0033d7a4dbcfb48e8fbc50a0d5e073057", + "sha256": "1f3sz0wfx60qv9b0ciqiwnvz46f8xbpnb5x3c9531mfccfhx71ix" }, "stable": { "version": [ @@ -22379,15 +22430,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200424, - 1852 + 20200507, + 2251 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "e5cf30e26bd3107583418f2b4539c7385d37d6c8", - "sha256": "0fx2zx46j4mivb2h1bdz7n17bmmd6811az1wzi8g4q430kiv9hpi" + "commit": "bb51d47dd6e59e5bef1bfb393a39a73a7811d0ee", + "sha256": "0rs15c1biaqjpkxx32dc59w1z9gnd31n13qb80gb9ib8li1cgnr1" }, "stable": { "version": [ @@ -22410,28 +22461,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200413, - 1930 + 20200508, + 1552 ], "deps": [ "eglot", "julia-mode" ], - "commit": "a37aaa7c2a3e0282e02f97c0b8946dbd6d6cbf06", - "sha256": "09mzxg0j5a9dqx8sf5m91sapzdlr3vj5ds2ll7nxmgd57m185pfs" + "commit": "65c70b8203684a34de16868583e2424de41b9ab6", + "sha256": "16jmpkqhkxaqj37d5qax5b2x003pas71rw3k3rlzindhmqnhd0as" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "a37aaa7c2a3e0282e02f97c0b8946dbd6d6cbf06", - "sha256": "09mzxg0j5a9dqx8sf5m91sapzdlr3vj5ds2ll7nxmgd57m185pfs" + "commit": "65c70b8203684a34de16868583e2424de41b9ab6", + "sha256": "16jmpkqhkxaqj37d5qax5b2x003pas71rw3k3rlzindhmqnhd0as" } }, { @@ -22465,20 +22516,20 @@ "url": "https://forge.tedomum.net/eide/eide.git", "unstable": { "version": [ - 20200419, - 2126 + 20200507, + 2238 ], - "commit": "827f29b9fd8e20e2e460cffc67a8f9ac9623c450", - "sha256": "1bqsvk70l9n929b41xz6j3sg3irwrcrlbvqxpvq0d8jqjl4nw51g" + "commit": "f5f858e238c279a134d34a4ff334428dd811ca07", + "sha256": "1y87cbzngn29svx94mqvsk74j7vk912fx29b4fi26hj6myvki1nx" }, "stable": { "version": [ 2, - 1, - 3 + 2, + 0 ], - "commit": "7e4f101923d1aaa4ad4626ff60375ece8dd13e1d", - "sha256": "0j343hdarrlgznc4f59gbix20zlpr4wv5b8db6m0262ajc5q5zfb" + "commit": "93b7f4e6013f378f387586011b6389f7ae366bbc", + "sha256": "04hsk0dbnv4viypq6x5wrg1dd0q35ihb5lvk74r1h508s6ngbvyd" } }, { @@ -22504,19 +22555,20 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200425, - 1940 + 20200508, + 1712 ], "deps": [ "anaphora", "dash", "deferred", + "exec-path-from-shell", "polymode", "request", "websocket" ], - "commit": "42134adf3c95b7768e2d725bab39ddb98feafa09", - "sha256": "07lwxl5kbsc0xlmnvp524p3r4m9f4ldxnkwm0gmbk8aq1lg1gyw6" + "commit": "e39a48334607cacd42011f21fa56ebf291258a1b", + "sha256": "1fk9aryjwh88jmb2a45rs0z7h6sy4r53h1qpairl5bi1jllgg3lb" }, "stable": { "version": [ @@ -22590,8 +22642,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200424, - 1623 + 20200502, + 36 ], "deps": [ "auto-complete", @@ -22600,8 +22652,8 @@ "direx", "spinner" ], - "commit": "0914ff731630ebdaa4e07dba97644e0e57bbf18e", - "sha256": "0qm4sdzxmkm35kg3ldijj6vwbdn8yflivyv09m4w05vz0liks0qa" + "commit": "4aca86cea6b3120b10af52eab26cefdef2965574", + "sha256": "07gn75njy0hmiddymj4khw59mrnzwml0dqpzm0g5il697v4rpqgj" }, "stable": { "version": [ @@ -22684,8 +22736,8 @@ 20181006, 225 ], - "commit": "64abd393d5cefb1d59380dcc1344befdf618735b", - "sha256": "006c2kgkky81mv7an24m55521ay0d6ang5cwi16ac88j8x3n1q4i" + "commit": "3f746410a9024af60a1368d02c2c0d9edd93ab66", + "sha256": "03zvxdbqjzkr6js8g21dzdiqsbmbhphij8jz98ian7gvzi8ady23" }, "stable": { "version": [ @@ -22801,8 +22853,8 @@ 20200404, 1548 ], - "commit": "f5c785a6f951a4aa6d6ab5cda84460dad2a072cc", - "sha256": "12fw4zk3w8kh8g94k4hcqjixxb1vvnv4qivc672lwdj4d8a218jw" + "commit": "46d22e7dfc7f9d8e9cbf5042d365f60b1fc7da0f", + "sha256": "1xjnzy7gp4sqd0mj3zkw741bj7kbpbdgcqxs6ppvlmr5i0adx2hh" }, "stable": { "version": [ @@ -23074,20 +23126,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20200315, - 1527 + 20200510, + 1521 ], - "commit": "98fc3206c36bf6384bf333f93b4ae3d9382f5c57", - "sha256": "0a6a20n4nwfnzh0fbndpf3f77mchax4sdc2bwhn66yncm9kikjyh" + "commit": "f345065592b4bc9a5173b44e12a74400335d4e49", + "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 2 ], - "commit": "77e1e90efa6622c6784ef10f26e6f845aca5ee3e", - "sha256": "0ip9dnyh53m2yd92bp0jddm3db4fbcpm9zniqij9anvzhjdfqx1b" + "commit": "f345065592b4bc9a5173b44e12a74400335d4e49", + "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd" } }, { @@ -23312,8 +23364,8 @@ 20200209, 1942 ], - "commit": "d0405e63863e54a01200740a6717ac875eceabc1", - "sha256": "1pbcs4i9d1v8pmgrsxnacnbdrcswifpbnrb613z18caj1a17nl02" + "commit": "af31f80552f7d081b985d729143a804ad47c0734", + "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan" }, "stable": { "version": [ @@ -23378,28 +23430,28 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20200426, - 1143 + 20200503, + 304 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "294b0d70f2cb85d5563019343f14c64938ae4b07", - "sha256": "0bm6vn61awwa4yd97idjqbbwp3ypz11n5w9mswg5yivhg4kc82sm" + "commit": "2df5237dfa8c51a151bcf9d8fb6746447a8aa3d0", + "sha256": "0n4f621787v3gqfyqg7f37z6nxjqxl0bxxnl5j3gxqrif0ml2725" }, "stable": { "version": [ 0, 7, - 5 + 6 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "bffe74f0f7d7126691f6a9dd9eadf8714545dfe0", - "sha256": "16cmm59lwkgq0yj0pg9sn46afvqqjjx06xv5sc96vgwvn1n0lfi7" + "commit": "fc0beb392386b8ed387e52e7e100354b8549fd7e", + "sha256": "1kh524fkhsq3l9w0dv12b8shdyqfvnkhdr19xzfbhzw10hfdl5js" } }, { @@ -23449,8 +23501,8 @@ "elfeed", "simple-httpd" ], - "commit": "d0405e63863e54a01200740a6717ac875eceabc1", - "sha256": "1pbcs4i9d1v8pmgrsxnacnbdrcswifpbnrb613z18caj1a17nl02" + "commit": "af31f80552f7d081b985d729143a804ad47c0734", + "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan" }, "stable": { "version": [ @@ -23552,11 +23604,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20200329, - 2310 + 20200427, + 151 ], - "commit": "57dd4ae3e47ecca6cb9eee87328f159b3eb53702", - "sha256": "15cjv97240nnmjjbdx9iqz4qwxvbxxsyjllcjwbmkkbpv6x91b89" + "commit": "4cd55a30d5dbd8d36a0e6f87261c4fef17fc6db0", + "sha256": "0g1wnx37pdl3zxmym4fnqvhlw9hj6aw51vpxa18fpsh7fadfjjdp" }, "stable": { "version": [ @@ -23671,16 +23723,16 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20190323, - 1331 + 20200428, + 1707 ], "deps": [ "dash", "loop", "s" ], - "commit": "0a254e6a4dc7fa12857f8334fe6eefa72e49d1c9", - "sha256": "05lw10c11svqp5bi5pfga9iian7c3ikrsxzcr1qwcnhs3c5qjq9c" + "commit": "0e7ea1574717108ddc2eda5e1bc883d44cd28257", + "sha256": "0qkgsac3g02p4w8rkkmwv0p0brmi3rb1yijq45nvyy8kkf331g0g" }, "stable": { "version": [ @@ -24102,11 +24154,11 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20190622, - 730 + 20200502, + 115 ], - "commit": "468adfff8dedb024b90af0e66434dc50de259714", - "sha256": "0cr8pqbbjaxx48zal8cmmjddhapzjg4mvaspn8d3pygz4q7z5lba" + "commit": "9b25a8a2619e1f723528e8a093d31181223d5c85", + "sha256": "0frafk7a86l2g02c1c6vrinp609v480klhkh3y823b5k4bx3m3b7" }, "stable": { "version": [ @@ -24129,8 +24181,8 @@ 20191212, 1858 ], - "commit": "3f56dde4342dcfecc2b8b4d1c6e07436d2ab9991", - "sha256": "0872dis1zin58fljbyzvvyd5z6c27cw8ikxgd8s57addbi4s6ffh" + "commit": "c9175aedfaf3daeca6b2414f74ef703f2f6cbc1f", + "sha256": "18jps4rn9nmjxlkg2849rh7bp7pg5zfx7yhhmq078jkvnygv3m2l" }, "stable": { "version": [ @@ -24165,8 +24217,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20200329, - 1830 + 20200510, + 1559 ], "deps": [ "company", @@ -24175,8 +24227,8 @@ "s", "yasnippet" ], - "commit": "816061cf16d53448d95612380855e7ccaf59a417", - "sha256": "0fjz3y0yh2hfmx0470jcyni1glc6m3bm5gh20iakvlwxf4wa8801" + "commit": "6b7db2f23a9f248fd756e0bc537fd8d53d98eb96", + "sha256": "044qm7kgdnsh4yipxklyfvkrvzgw4abn6gjawkkvgniii2pf39hj" }, "stable": { "version": [ @@ -24739,20 +24791,26 @@ "repo": "GuiltyDolphin/emaps", "unstable": { "version": [ - 20180712, - 1916 + 20200508, + 1759 ], - "commit": "823b8f72e6459c9f1a5dd62451ee4005ef71d955", - "sha256": "1g9637j8f65q3l6k4aw5p847m891irh74kg3pa2p9w0ppsa6n3jm" + "deps": [ + "dash" + ], + "commit": "7c561f3ded2015ed3774e5784059d6601082743e", + "sha256": "0x4i2c493zb7cf0cnixsxiwl409faljd5sk05flkq88wjm176dcm" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "823b8f72e6459c9f1a5dd62451ee4005ef71d955", - "sha256": "1g9637j8f65q3l6k4aw5p847m891irh74kg3pa2p9w0ppsa6n3jm" + "deps": [ + "dash" + ], + "commit": "7c561f3ded2015ed3774e5784059d6601082743e", + "sha256": "0x4i2c493zb7cf0cnixsxiwl409faljd5sk05flkq88wjm176dcm" } }, { @@ -24907,25 +24965,25 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20200212, - 1825 + 20200508, + 1955 ], "deps": [ "cl-lib" ], - "commit": "2767c660562d35f02f9b272252a697804d70dd14", - "sha256": "1jg5m9684kdxvgfqvf56x5c7fqnlqf0mmqqlrrvl5di3n79cfmsb" + "commit": "64b9ee9c86067118b2d0055f467e60bc211aa59d", + "sha256": "16h9hb6d621mfi7805p2iaw814n2pm2g659wcjqxpvm5x5hpn55v" }, "stable": { "version": [ 5, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "a8075b52fa75c5b53892214e6ca89fe0b42a04bf", - "sha256": "0jp96s0pglmrcgcyn9cp4rn2qlk9rf0dq6avrr5wiigjjkl33fip" + "commit": "f4924c2e77bdc5806495a74832fba60b2c30aca1", + "sha256": "01d8akv046igc13d5ki9wz36v51dlijab892ki5s5c4ysgj42wkr" } }, { @@ -25236,15 +25294,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20200309, - 553 + 20200503, + 836 ], "deps": [ "ht", "seq" ], - "commit": "e05217ee668db3ffb537528408ce8004fadb75c0", - "sha256": "1blhvzrvjabh81si1h9iznldfp6mkchd31ig68byqfjvi6d34nxq" + "commit": "20d4fc0ea45a53f7edbe99c83317a3e048e398ef", + "sha256": "1snlx70dy8kjknrydbpf3vkrdrzwsy0mb5vlj273vhm3nmjbs2mg" }, "stable": { "version": [ @@ -25580,15 +25638,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20200309, - 546 + 20200503, + 1214 ], "deps": [ - "closql", - "dash" + "closql" ], - "commit": "37f06fd2daca6a7afa163ceb0ccccd450af85e68", - "sha256": "18prjspaz4wlfrk2zzzzpxs4z8dkxxx68sbq2b4bdgg34fgnj02z" + "commit": "d987af46d9d763946fbf2930cacc9d6906df4382", + "sha256": "1jyb9m6nx91dn4isai36v1yc7shrpgnk76kpkamavrvwqdzvw6nv" }, "stable": { "version": [ @@ -25722,15 +25779,15 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20200214, - 1651 + 20200429, + 209 ], "deps": [ "dash", "tco" ], - "commit": "2039faac5f649f586d86d5ace10204d5a510fe0e", - "sha256": "1zg1bxwpqgzak5nvcwlcv9k8lkpa071kpnh11yv7s74ykvxa49l0" + "commit": "7e8ef8627151748156e7a4a384b6e8c6c344261b", + "sha256": "1ds89jk4d7j89mgfkqqc92lizh6fwwr338imzvby1lb8i17nww40" } }, { @@ -25756,25 +25813,25 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200424, - 2024 + 20200510, + 429 ], "deps": [ "cl-lib" ], - "commit": "ba36632666ea0a631d23b6fc54c16ada55673b02", - "sha256": "1q7bia9l672dfa0q4mrhv2cnxk2c8vhpl7n649zw7zwfpkqnzh70" + "commit": "8165a5f1e0190a45029d610dc442c9eaa6e82c11", + "sha256": "0icrrps06j27v69pqglv3j7h4nc5mpcqqwziasv403lpm4bb8hcz" }, "stable": { "version": [ - 1, - 9 + 2, + 0 ], "deps": [ "cl-lib" ], - "commit": "2a597b39a929f6dff2b7da6439fcee6d2b25d3e6", - "sha256": "0jgkhwfgvy8lw6mws1m44vzh16514xxv34fivghc8kzn5w5ghwv7" + "commit": "0a820043490c47c60d2fc968a5120308eea3d7e7", + "sha256": "1427hlavz6j232clrh4vbgwjahm328kvj7hls3s6hziicf2kdczx" } }, { @@ -26178,8 +26235,8 @@ 20200313, 1030 ], - "commit": "7ec0ad6ed076b76de8cd52e28445f324a5f2853a", - "sha256": "0r0sn8vfmgamf3mnjjkkv9y0r8a6xkn5f5axw1av0liiv95kgrm8" + "commit": "9639877ea11d6a32ca6e46410b8a48db245b72d8", + "sha256": "19sdribjxzn13drqv0jcjwbmddkjvnm1iyx1njdlfaaq0625q8w3" }, "stable": { "version": [ @@ -26979,14 +27036,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200419, - 1920 + 20200503, + 1654 ], "deps": [ "julia-mode" ], - "commit": "007fa4b5192154db3d90e6e861f96193c1b145f5", - "sha256": "12kj006yxl84fav2ryxx6ajk284rskgy6imi9wjpfl8qqfcykcm0" + "commit": "2e7d36dc9b500ce21c5cb8534ea573669f93ee0b", + "sha256": "1kjpgspjpipirc48acb3d6bfsrmd8yrz35ck1sx0id7y8nni1d8k" }, "stable": { "version": [ @@ -27638,16 +27695,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200426, - 848 + 20200509, + 853 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "695e941d8ac59dc7534524e5cd27ced9490259a1", - "sha256": "0fdqxgkp0fl5862b15qxnl2njs97vznsydw5jm6hw8fq94a1crhn" + "commit": "d062cc206d671fb5aefb1e0e679a9cb1d6c73e33", + "sha256": "1zizfqmfrxx3shgggwa74rg2qqbrs8704wf94ajx0k11dbm1dbrp" }, "stable": { "version": [ @@ -28234,14 +28291,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20191023, - 2322 + 20200502, + 1140 ], "deps": [ "evil" ], - "commit": "076ace3ee22a61890f375ae492c634f71ce84301", - "sha256": "0d4xdrqa8ylh67wgyywxsh0crm06y31babc8sksrpwxlr12xyaww" + "commit": "943bf5fb2b04e077a797cf192fd7650b41e3c3e4", + "sha256": "0iryzs12nn20pj5zcyhdk4mpgyrlah0pzbjawmj0l91clmhwbvhb" }, "stable": { "version": [ @@ -28469,8 +28526,8 @@ "deps": [ "evil" ], - "commit": "9d4be14118bf27094a30dbff349b815f098aacbf", - "sha256": "1fxxfkinb0gq4p5b686r7z4jrkv98zfgh5z889zkjacncv8ibswn" + "commit": "2d70c981587187f4fb7d72b9c5b368e6f7c1460f", + "sha256": "1v20iba2b6dwr01zm69ix23xrlkm1ig8n9zn13nkna9iawafqrq9" }, "stable": { "version": [ @@ -29539,8 +29596,8 @@ 20191229, 112 ], - "commit": "d17c4e0b73fc5ffeb2bc28156785c6bdda058654", - "sha256": "0nxrdfr9y37ws647qbb0c25l2vwapkqp3qhxwds20jwkskpqa7vm" + "commit": "2d152d17814c6d551d525d83201da72c4047c1de", + "sha256": "129iccdddpz0hhb25v63a8pk76ayx67jn47rwd3x6wzsnhsg3pp6" }, "stable": { "version": [ @@ -29943,20 +30000,20 @@ }, { "ename": "eyebrowse", - "commit": "90d052bfc0b94cf177e33b2ffc01a45d254fc1b1", - "sha256": "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861", - "fetcher": "github", - "repo": "wasamasa/eyebrowse", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "18wkfih7i6swg0wadkrs3bq7bmy54v0lph2p14dqpgmxcyh2zzgg", + "fetcher": "git", + "url": "https://depp.brause.cc/eyebrowse.git", "unstable": { "version": [ - 20190928, - 1458 + 20200506, + 1303 ], "deps": [ "dash" ], - "commit": "e483d35e905c2e26fac63f33c77b9e764729a364", - "sha256": "1y3v2cplvnnhw4ga2pw2agwdbffdjrfhjz73cfv6vaa5q8hp32vy" + "commit": "bde0eb8f56ec7e2501dc33154c273e43cafb1e5d", + "sha256": "19x3wfnbcmrrywxbigr3lv0yp6dxmr0iy10ykqg3pajpxbvarcn2" }, "stable": { "version": [ @@ -30566,11 +30623,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20180731, - 1049 + 20200428, + 332 ], - "commit": "fd4c3f490b0b6727592b85f1635e57638dec8f91", - "sha256": "0vgwbdrs2f4lwpciwv4j544nqfqwdgli9fsr3ldr01wd4ghjib9m" + "commit": "001cc95effdd5c4d9974b3f2c40b2ddf1f0e3de2", + "sha256": "1ab03jn1kg4bq97d7dzinpxlyg3wcx4cha0a7ibqdbqrci3znigc" }, "stable": { "version": [ @@ -31149,17 +31206,17 @@ }, { "ename": "firestarter", - "commit": "5b046eb3b63220b937e1b70f633cb5424dc782a1", - "sha256": "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp", - "fetcher": "github", - "repo": "wasamasa/firestarter", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "1kaw710za76178ak35nlgr2pj1303z7fcas6474rr3nd82l8sypf", + "fetcher": "git", + "url": "https://depp.brause.cc/firestarter.git", "unstable": { "version": [ - 20200116, - 2023 + 20200506, + 1311 ], - "commit": "eecd8f97a09bbfbc03113b71fa3c8b92766e3956", - "sha256": "1a7cp4rfa9r707pg7g9xhhs7nj79gva8fnmbq6ck0hxyllcabwa7" + "commit": "5b117bf8d290af5c104d88c413f40e84da0c4ce8", + "sha256": "13axz8c4v4x43x2ami78kwaj6cpmyqykapj94mqrr3b5qzms502b" }, "stable": { "version": [ @@ -31445,8 +31502,8 @@ 20200419, 1033 ], - "commit": "42f93b2ffb651901d6bad7eb5587790298dda371", - "sha256": "035zm6dh416jk1ipg35qnkr8cbfsjkb92dhc4ryay4p30rp1yljz" + "commit": "f81bb130be69e9f321e2085b627387074d23a253", + "sha256": "17z5bmcd2c4k26w9xd8npaqwk9wwr2nf0d6vikzj0mxg0pdlbaz2" } }, { @@ -31541,15 +31598,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20191019, - 18 + 20200506, + 1309 ], "deps": [ "buffer-manage", "dash" ], - "commit": "df113f0b25ef73c5a246330ef9fa69ab936df174", - "sha256": "11hdabn2ayg2nrp7mg8vp9ywb1yl6nw4z7y7rxv70n0h4blnwn9n" + "commit": "dc6d920b477fe96a71bc37d593beef5ae8b2ae7e", + "sha256": "1vcpb0bnklq89vgynnpfs4dmjacaajrzkasgwzix7q4qfzcbid9n" }, "stable": { "version": [ @@ -31754,11 +31811,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200416, - 1225 + 20200508, + 1252 ], - "commit": "293b7225b9bacbad4bf14d43d20a765f4862c563", - "sha256": "0acn2bdqcvj1m6plm304adgw6ndycv04qh6asgbgdwlz1admzjga" + "commit": "8818bc07727fe748edf4aea629b510b7ada680b3", + "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6" } }, { @@ -31776,8 +31833,8 @@ "flutter", "flycheck" ], - "commit": "293b7225b9bacbad4bf14d43d20a765f4862c563", - "sha256": "0acn2bdqcvj1m6plm304adgw6ndycv04qh6asgbgdwlz1admzjga" + "commit": "8818bc07727fe748edf4aea629b510b7ada680b3", + "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6" } }, { @@ -31887,8 +31944,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200425, - 1426 + 20200509, + 2127 ], "deps": [ "dash", @@ -31896,8 +31953,8 @@ "pkg-info", "seq" ], - "commit": "c8218044c849f21cc628b6c077e41c690f046bc0", - "sha256": "11n3h7x9nszqljd0awi6jzrhrkac7sdyrwvb94bikrj1d7yin25g" + "commit": "33db306f3b8733592c170a5f7d7445465f47c10d", + "sha256": "0pl0ywg2aaifhj5gzj3ka5pklbbag2aa28gn7faaqwjhkknbka8n" }, "stable": { "version": [ @@ -32106,14 +32163,14 @@ "repo": "alexmurray/flycheck-clang-analyzer", "unstable": { "version": [ - 20200320, - 428 + 20200429, + 238 ], "deps": [ "flycheck" ], - "commit": "7e1bf9853a34828c7f81d824dc4785f1620f2006", - "sha256": "1iw3vjdnskbk8zlbyvxiwlisj72d7q8nz8n55ffwz3v44ymzhya6" + "commit": "0c9b6e4626cd5376037464f8d6b8c64aa32768ee", + "sha256": "0nr3wipmcalxfp48hi23vmrj2rwbwk6gipdqmic8ay4z9x2csi8v" } }, { @@ -32764,25 +32821,25 @@ "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20200416, - 1620 + 20200510, + 1334 ], "deps": [ "flycheck" ], - "commit": "d99833992eb874cbbd25e991e3037642e125bb59", - "sha256": "07ph5kk9zb375nkdqryzpfzqn9rr89minf2jgyzlnv58fzqiwpjp" + "commit": "1743f1dd935a7949cb81b543b98b8dfca7c58fd8", + "sha256": "0v6f15s5gr9ddxk2ya30gf8vk47m2zk0d1l102v87ll5d67f40ly" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "flycheck" ], - "commit": "ca4b87d22474d3337db72e19f88105f557f44867", - "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj" + "commit": "1743f1dd935a7949cb81b543b98b8dfca7c58fd8", + "sha256": "0v6f15s5gr9ddxk2ya30gf8vk47m2zk0d1l102v87ll5d67f40ly" } }, { @@ -33708,14 +33765,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20200414, - 1901 + 20200428, + 40 ], "deps": [ "flycheck" ], - "commit": "467f9b94d9eecc8a8027cf204d304e258f72edaa", - "sha256": "03yiva5lmbfawdjjfsmqlqgvrdgfni1gh1qbdpma5gqhckz5j0d7" + "commit": "dcf5b097b7c1206f6325547f5cf37b867a6a5ffb", + "sha256": "16fwk1prq7gyhs0yk4bmr9j3wxnznjj9ppbxwidnmpbhdis2f0sv" }, "stable": { "version": [ @@ -33812,8 +33869,8 @@ "flycheck", "rtags" ], - "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", - "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -34032,15 +34089,15 @@ "repo": "nhojb/flycheck-swiftx", "unstable": { "version": [ - 20191129, - 2207 + 20200504, + 1345 ], "deps": [ "flycheck", "xcode-project" ], - "commit": "94ead32e879c055902e3edb78af1193f21339e5f", - "sha256": "1r49cyhpqw469j832nqdywjh1zc37q9innxwj2hnvvw9hz69g2wm" + "commit": "1b9174fb37498dc3a3cf8bbbfbb4f0470e8ef139", + "sha256": "1qiddgrrf2d0sjmikd9yy53v5vxfh13j1m9qq40ap9vz7x4661va" } }, { @@ -35795,8 +35852,8 @@ 20191004, 1850 ], - "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", - "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" + "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3", + "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z" } }, { @@ -35912,17 +35969,17 @@ }, { "ename": "form-feed", - "commit": "468503d8103766e8196e977325e3bcb696219f6b", - "sha256": "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh", - "fetcher": "github", - "repo": "wasamasa/form-feed", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "0nh50lwr9jyi45sd4722nm2rmmc9zm9l8l55w4pjq61cfwldqq7p", + "fetcher": "git", + "url": "https://depp.brause.cc/form-feed.git", "unstable": { "version": [ - 20160102, - 2253 + 20200506, + 1300 ], - "commit": "15bbcb2d2df21910af3b9686b671e0c7d1c93b26", - "sha256": "1vfnpm6kp4xf3qc73i41rg73bhbym1sd4z6jam4k1f44iny0zqxz" + "commit": "b5dbfd8b90e72de84ae7b6667947264fe655c163", + "sha256": "0n2k0ki6k1pgni907fvz09z3hbfbchnv1q80j42w23qam2hp7a3f" }, "stable": { "version": [ @@ -36389,6 +36446,108 @@ "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn" } }, + { + "ename": "friendly-remote-shell", + "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", + "sha256": "0ja0xgxs26sk2mx57wqb3schmw8ms01sdla260c96ilmy1qj6fvq", + "fetcher": "github", + "repo": "p3r7/friendly-shell", + "unstable": { + "version": [ + 20200510, + 1438 + ], + "deps": [ + "cl-lib", + "friendly-shell", + "friendly-tramp-path", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "deps": [ + "cl-lib", + "friendly-shell", + "friendly-tramp-path", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + } + }, + { + "ename": "friendly-shell", + "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", + "sha256": "1xpfykkfrm6gg6p0rjp1hfnjf4k4n6k3v5kxifgbxld4hjl9223d", + "fetcher": "github", + "repo": "p3r7/friendly-shell", + "unstable": { + "version": [ + 20200510, + 1438 + ], + "deps": [ + "cl-lib", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "deps": [ + "cl-lib", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + } + }, + { + "ename": "friendly-shell-command", + "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", + "sha256": "0hsnn18zxwqvk5zpp5kf8mlfya6if0npnfm0crvwqqsipx9nj8v4", + "fetcher": "github", + "repo": "p3r7/friendly-shell", + "unstable": { + "version": [ + 20200510, + 1438 + ], + "deps": [ + "cl-lib", + "dash", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "deps": [ + "cl-lib", + "dash", + "with-shell-interpreter" + ], + "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", + "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + } + }, { "ename": "friendly-tramp-path", "commit": "cb18ad238792570e5ef825a101059bfdc293949f", @@ -36397,14 +36556,14 @@ "repo": "p3r7/friendly-tramp-path", "unstable": { "version": [ - 20200419, - 851 + 20200502, + 1032 ], "deps": [ "cl-lib" ], - "commit": "ce7d15dd96300d376d483d685aa4a34357da8d6a", - "sha256": "01v311c8w86s954adl1ncmbhmk07acm8pnak70gn93dpz77vl9g4" + "commit": "be572b8953b9e5a3a35c30bb64c2936d3e9802ba", + "sha256": "0w99py469ylkg9jg9fdxalv3axd57ld9rgwhgfy1r8rpp7xch7pn" }, "stable": { "version": [ @@ -36584,8 +36743,8 @@ "deps": [ "cl-lib" ], - "commit": "298bbddeb1dcc135c075d484f283f409f0d0d055", - "sha256": "199a1gs7ja9l3bc2sw9cwv9jv0zvqqaa2pp6hibbyl00rsk2xs58" + "commit": "484d564b5d2a5e6dd9c3f522b35cfeef2164c437", + "sha256": "105x7mrip5xbyhimgqx1nb0lkyi68j5fpfhc6y0dzm4c4bf77jfm" }, "stable": { "version": [ @@ -36783,8 +36942,8 @@ 20150730, 337 ], - "commit": "534d723ad2e06322ff8d9bd0ba4863d243f698e7", - "sha256": "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv" + "commit": "a36bde2f6e94d6b2bfaae68d73bbd39734e5b907", + "sha256": "1aj7r16bnx2jr2gpzwsmr3yqmfza5qbdcn78chcsfqxv5c8bgswa" }, "stable": { "version": [ @@ -37029,11 +37188,11 @@ "repo": "GDQuest/emacs-gdscript-mode", "unstable": { "version": [ - 20200404, - 112 + 20200427, + 1514 ], - "commit": "9a74dd3b6cfe73dd7510faf26ee7bc14e3c7dbc6", - "sha256": "1rrwhb6ak0gajcci4kk7fdyfm0c5wfhj6zys9f4m5xjya9pb3wb4" + "commit": "0718ca9b090780bd28d02ef5c79cd0e7c5a84d5e", + "sha256": "0wdsfakx50x60lxb6d46h9rhb1vrisch71fmdl1c8jiwf57q5kpn" }, "stable": { "version": [ @@ -37130,11 +37289,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200419, - 2111 + 20200510, + 1813 ], - "commit": "07912e512a7bf1507d0dd5ba3774b684c5ac3287", - "sha256": "0w2rhk04x4wqcx6brfacqx3r7whyzdnbgwzfgmba0xsrpb2x7rpz" + "commit": "95950e3bfb8407f8925dd8717053bf688bb4df7d", + "sha256": "03jhqzd22swyvg1ry4b4ssvyjqqq5sqh0xa9q3zs7cgm9jjhxbkg" }, "stable": { "version": [ @@ -37146,6 +37305,24 @@ "sha256": "1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv" } }, + { + "ename": "geiser-kawa", + "commit": "68690d6b011c95197af6b5a87cc21c4dbe97ff00", + "sha256": "0gzzab0v93vd9n14s1bya0frf3dagh0gbwg1an4mapg7gjz9ffdg", + "fetcher": "gitlab", + "repo": "spellcard199/geiser-kawa", + "unstable": { + "version": [ + 20200507, + 1305 + ], + "deps": [ + "geiser" + ], + "commit": "b96c008e9c3b8dc210d8b536ee7b76b8690c8af6", + "sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs" + } + }, { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", @@ -37584,8 +37761,8 @@ "let-alist", "treepy" ], - "commit": "03d2546614619f42ac2983e79d0069ca4cbcfbfc", - "sha256": "0j0j86cbv87i2wfcvcyjb53wdzd003770krlnpx0gjkq036vvkwk" + "commit": "206f2b5b2ab622efda8da85feaa3bc2a1e0f3da3", + "sha256": "132y2yi9c91p25cwnvb9w6jj7la6fdc0xlvnxmbnfnxaic4jyhs3" }, "stable": { "version": [ @@ -37936,8 +38113,8 @@ "transient", "with-editor" ], - "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", - "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" + "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", + "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" }, "stable": { "version": [ @@ -38886,6 +39063,38 @@ "sha256": "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798" } }, + { + "ename": "gitlab-snip-helm", + "commit": "d73cc8f3490f5e56bc0fda1b7e680d21839f4c98", + "sha256": "0hv0m9lh105f18d4jhc5i68nhv5hxlv4264mkza4cwq07amxlhw2", + "fetcher": "gitlab", + "repo": "sasanidas/gitlab-snip-helm", + "unstable": { + "version": [ + 20200427, + 2014 + ], + "deps": [ + "dash", + "helm" + ], + "commit": "a0ba22ae7098b1a57af626fe5b6e9d663e8e2fc3", + "sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "deps": [ + "dash", + "helm" + ], + "commit": "5fe0a66642da6f4e7ba9e1e3a96572c7f1876e37", + "sha256": "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga" + } + }, { "ename": "gitolite-clone", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -38989,11 +39198,11 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20191104, - 1328 + 20200427, + 1637 ], - "commit": "8ac8790790d833e2979103f7f5a14b37382ff323", - "sha256": "05swwpslvy3c7yv7v5g6q4s82ff623lpbdkasmq3q8jhmbjsx92k" + "commit": "8a273c9bfa57776b00095a648c2aa053cc418e91", + "sha256": "0msd5ffvhd44m129i03f04v7x6x0l667nxi435c4kp6m8h0za603" } }, { @@ -39004,11 +39213,11 @@ "repo": "jimhourihan/glsl-mode", "unstable": { "version": [ - 20200420, - 1839 + 20200501, + 2304 ], - "commit": "9bf168017eb3af7a396165a79a7b870572d59666", - "sha256": "13k4am1bk20b6pncg145g4p9abw42ksgaj0zq2bz7b4b8pnfdzp0" + "commit": "b07112016436d9634cd4ef747f9af6b01366d136", + "sha256": "0bav9ipfm0vy26n74ngsmjzc7fsyqz6xmriadzx55s44h8p5dn1s" } }, { @@ -39297,6 +39506,39 @@ "sha256": "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw" } }, + { + "ename": "gnus-notes", + "commit": "971db65c22e975ef52ca964e7d468d2f65ad81ea", + "sha256": "0xvkkmgqhib1fx8dbzv1iz03y67z504b312n2k1rfwl7rgggjc8k", + "fetcher": "github", + "repo": "deusmax/gnus-notes", + "unstable": { + "version": [ + 20200509, + 1942 + ], + "deps": [ + "async", + "bbdb", + "helm", + "hydra", + "lv", + "org", + "s" + ], + "commit": "053a4303b8e9d3b8a67fe58e6f87ba6c76c90a97", + "sha256": "1lygfkgmzvy7iwc8d55j6ypfhf5wfybch1ksqcndyjklhd2n0v5j" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "commit": "8373615b1b5945db485ab18205fdd1077ee0a506", + "sha256": "10ddsw1idyn1w2w92gs6i7a14hq347qib521vk7yqb9s4qyxg1fg" + } + }, { "ename": "gnus-recent", "commit": "0b80d94cf1a8b8e2d4da5d45f65231aa4884a3a0", @@ -39819,6 +40061,21 @@ "sha256": "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf" } }, + { + "ename": "go-noisegate", + "commit": "1a033cf87c7d53ed8e3af1ac3a5b9b1bac035559", + "sha256": "0hpslf7q4jqbfkr17kb6phc0dbdvqcm9wynzj4fsji7c1cq0z5xh", + "fetcher": "github", + "repo": "go-noisegate/go-noisegate.el", + "unstable": { + "version": [ + 20200502, + 703 + ], + "commit": "e3fc198c234131c94f7d307b7f7c6ef623fb93b7", + "sha256": "12b4l3sl1pykz7v73vsjsicbqpmylsmwhlyprpiimc0r1is5km3m" + } + }, { "ename": "go-playground", "commit": "900aabb7bc2350698f8740d72a5fad69c9219c33", @@ -40231,8 +40488,8 @@ 20180130, 1736 ], - "commit": "43f20c361143beba2e0f3f737597f2f1f8725160", - "sha256": "0md3y2vr113sdgyf5q692fzif10bl0is96ly2hfgh6z27awb76l6" + "commit": "95d408ee1120e7b7a32d9e79dbdceb77e5787b7f", + "sha256": "05c7si8hp1n2jhcknab4qkdv9wkzpzb7355vr4cvh6l5aqi4qryr" } }, { @@ -40441,17 +40698,17 @@ }, { "ename": "gotham-theme", - "commit": "4b388de872be397864a1217a330ba80437c287c0", - "sha256": "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl", - "fetcher": "github", - "repo": "wasamasa/gotham-theme", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "17nkg3ac8ckk5sa722nqinzhln8nb96yppjyp0567cc8p9a3bp59", + "fetcher": "git", + "url": "https://depp.brause.cc/gotham-theme.git", "unstable": { "version": [ - 20191022, - 1809 + 20200506, + 1250 ], - "commit": "02a7c7cd280747737792f4620b0df2e0b826e2c7", - "sha256": "017ibhznkyla2c3qymv3mlcd25svx8c55vavsb4apwzw061n8m79" + "commit": "0e5965f897c8c976d6b2ca2471dec0dec9b29bbb", + "sha256": "0cvrb23p1m83kd6p5ah04pgzc5gic7q88gnnad9p8d0a7ajh2vbi" }, "stable": { "version": [ @@ -40594,8 +40851,8 @@ "magit-popup", "s" ], - "commit": "3decde69e9aa0bcc8a831e3f87acae26c2151c4a", - "sha256": "1zvnhcbqqiv8671x3zizrpm789ci8z74xb6qr2ik6h4z79agmri8" + "commit": "d3d5c59428e3f27a166d29641651b68690ba41d3", + "sha256": "1ixzjcca432xsi3f8pd7hs7js63xh84h3472xnd0qjk97bxhn995" }, "stable": { "version": [ @@ -41408,14 +41665,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200307, - 1522 + 20200505, + 852 ], "deps": [ "autothemer" ], - "commit": "647796a42951a807ee1694a648442b3d83057e43", - "sha256": "0j0w6g0pr1p90wjyrwl21y0hlvjms8ba4yw90sd89lnzn7ncscm8" + "commit": "6e2fcbdb0608e6381ab86287ef84451d672bd3ef", + "sha256": "1z3dl9d6v1bl6b7mai8b6i8i2ywxjzbmfqjdhanb926mrkn5h22k" }, "stable": { "version": [ @@ -41632,8 +41889,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20200219, - 1821 + 20200510, + 1613 ], "deps": [ "bui", @@ -41642,8 +41899,8 @@ "geiser", "magit-popup" ], - "commit": "3b5990618e70494aa89ff18c58ff24f369005323", - "sha256": "1w5dhacl451cbi8s6y49dcgzkxyai9ggrkpkf16kpmgwf7j0rapk" + "commit": "0b8f75124372266bfab32e8d1fa114f33ea24e6f", + "sha256": "17i0rivgixkg18qiqw5a47ahli9vpc9p5yhd9s9j3jmf1jlzq4bf" }, "stable": { "version": [ @@ -42594,16 +42851,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200426, - 534 + 20200510, + 1345 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "3fddd8c425c918074a4bda9982ce90c29e45adbd", - "sha256": "1vhdiwvv2s9gw6mh4dr1blqlyy1k0cvm4wx833cwzgdg5iakan1f" + "commit": "16403ddf8a172aca72421f199cf6058bb7a53ad4", + "sha256": "1xp1cjs36w5ahjaf565bjdr2y5f1fk6y6yimpvb4jqj6w9lajh6g" }, "stable": { "version": [ @@ -42717,14 +42974,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200426, - 1427 + 20200510, + 223 ], "deps": [ "helm" ], - "commit": "6387437acf687a64af66138649f8604d65eb6789", - "sha256": "177grx9flqg6d9vcl2ln7gflvh3r2in8va39sgd7a4vl6qn2w1lh" + "commit": "429d3d9d8d90d3b7e8d35032c42206e930f9e481", + "sha256": "0kl6x6igbynzl1x36nqz5wyrqq4wchw2qpvp3lm80av6bncx6i2s" }, "stable": { "version": [ @@ -42861,16 +43118,16 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200415, - 1311 + 20200429, + 1606 ], "deps": [ "bibtex-completion", "cl-lib", "helm" ], - "commit": "1e5b50652d1f5189cfeb6b5ce3c4437e0239d4f5", - "sha256": "05xl3x98w4cr81zp04dcqy5xnims8x3k77qxzddcqcrvi9zjlfc7" + "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", + "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" }, "stable": { "version": [ @@ -43476,14 +43733,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200424, - 607 + 20200504, + 544 ], "deps": [ "async" ], - "commit": "3fddd8c425c918074a4bda9982ce90c29e45adbd", - "sha256": "1vhdiwvv2s9gw6mh4dr1blqlyy1k0cvm4wx833cwzgdg5iakan1f" + "commit": "16403ddf8a172aca72421f199cf6058bb7a53ad4", + "sha256": "1xp1cjs36w5ahjaf565bjdr2y5f1fk6y6yimpvb4jqj6w9lajh6g" }, "stable": { "version": [ @@ -43910,15 +44167,15 @@ "repo": "xueeinstein/helm-evil-markers", "unstable": { "version": [ - 20190719, - 539 + 20200506, + 715 ], "deps": [ "evil", "helm" ], - "commit": "bb04e3a25920c2fd676132703970c6879dade802", - "sha256": "1g944dv3ak064kxkbl30q1kaap0nzyh2v3klhyxmj8f6jc9x2wh8" + "commit": "0245f0c268e0eaec85df51ab2deba7ac961f6770", + "sha256": "0b1db6x2hz9rixchn9qfp2ak27a2vbz2l4g0fd7mys5c0llbwj1r" }, "stable": { "version": [ @@ -44133,27 +44390,27 @@ "repo": "emacs-helm/helm-fish-completion", "unstable": { "version": [ - 20191230, - 1717 + 20200509, + 1056 ], "deps": [ "fish-completion", "helm" ], - "commit": "b579193c9eca37e45ac54b66114032e9fb78aa69", - "sha256": "1aydd2f0xmyrkl9hhxcrgzgrpl2qna1krzgaprw0y7gcvg0p09b4" + "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09", + "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "fish-completion", "helm" ], - "commit": "dff0fdfdbf70ad41fa2da031197836a84384e635", - "sha256": "089gp2k22xwn33z8brpyb7r18vpyralq2cwxj1xsc8b2sj9s4896" + "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09", + "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq" } }, { @@ -45193,16 +45450,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20200420, - 1546 + 20200429, + 1457 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "db243993ea70be6343949759b4f2c556d9130751", - "sha256": "0yaik74g61iyrg9inarl7s9r6vnj75q5vxzxc5bkl224w49hf5bh" + "commit": "6b5ce182d7c94c62b55b8f7d0c7e643b2c30e560", + "sha256": "0f6a26h1n6h0x3dal40180w3vb7gz3h8qwxvr3b0zq4f7byikisb" } }, { @@ -45533,8 +45790,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20200419, - 1833 + 20200505, + 1053 ], "deps": [ "dash", @@ -45543,8 +45800,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "aef5975ac18d7cb101c0fb688333cc241782a8a0", - "sha256": "1m3p839wkrvf7n2467czj03rljv43bk32p7vlzdp5zby22bn7nag" + "commit": "8b056103d6f5320563e9fd794a008fd4e0719702", + "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17" }, "stable": { "version": [ @@ -46280,8 +46537,8 @@ "helm", "rtags" ], - "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", - "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -46679,15 +46936,15 @@ "repo": "emacs-helm/helm-system-packages", "unstable": { "version": [ - 20190809, - 1508 + 20200502, + 751 ], "deps": [ "helm", "seq" ], - "commit": "427c40d18ae1b5593df6bef72aa1d62ce89fc652", - "sha256": "0msil7niva1fy1lw5h7jwzfn398c5msml4vshplz13ry1ip33vih" + "commit": "4e257fc84472d3d85ee2b413ca8a45aa0fd0118c", + "sha256": "1p89zggsqhif6dadajapq8vr9ffxbzq7v8sv8iaxyn0cg2sn6fdl" }, "stable": { "version": [ @@ -47080,8 +47337,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20200111, - 2324 + 20200506, + 816 ], "deps": [ "dash", @@ -47090,8 +47347,8 @@ "f", "s" ], - "commit": "c54e9ddbd6a77858048c1a4c4b549de98af8f88e", - "sha256": "0x339wxhwma1i27j52wnbhc541633dxqmx1wyxg3yp78aciyrfhv" + "commit": "c0662aa07266fe204f4e6d72ccaa6af089400556", + "sha256": "1k61k7hhrfi8rzsniy15almvnvdsv85l7bmlaqs695pvanr5zlgh" }, "stable": { "version": [ @@ -48362,8 +48619,8 @@ 20200129, 1957 ], - "commit": "5bed6dd5bb9faf7d113b19f61cbca98da6262a3e", - "sha256": "0nhx0j3ffd24v9hvwfwwrp3bhx1105g9vwz543hn6yagx63y4vxz" + "commit": "040d19abd397d2132508a50e1266e86d324f7c69", + "sha256": "04impsvfmna1vyssjs2id9hsk9cq7wx317z4h16wr1jvng6m1jig" } }, { @@ -48468,8 +48725,8 @@ "promise", "request" ], - "commit": "ef7f42c14f0f4aec475b74d56931daa36aded6c8", - "sha256": "1a1wr86z5368zwvlgyp979x1ypz38m2w2qnp5607vjjplcrcmay2" + "commit": "23407fb7a950f08498b5586062ba69962a20ea24", + "sha256": "1hcwac7fjsshnjapb1hdh9x0liap4n1i5q6bsar5zanmz1h9i94q" } }, { @@ -48874,16 +49131,16 @@ "repo": "hylang/hy-mode", "unstable": { "version": [ - 20191003, - 1902 + 20200508, + 502 ], "deps": [ "dash", "dash-functional", "s" ], - "commit": "e2d5fecdaec602788aa7123ed13651c888b8d94b", - "sha256": "0gihxlmfminadaqdr8d2zccd7wwygl3m0gfzxsk5izi7f8hl4w7f" + "commit": "a18b0b8bfcd79a30bfe9ef960244ec6748a9430d", + "sha256": "0vvwilfj1sv7r1xsv7m6w0qc3077jfaflwxmq54dmrbw6qypqx1f" }, "stable": { "version": [ @@ -48985,15 +49242,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20200306, - 913 + 20200504, + 1747 ], "deps": [ "cl-lib", "lv" ], - "commit": "16fa8d109ec5799931a793b2e866ea9d593bee84", - "sha256": "1l6pi5ldmdcgv5qyg3kk1x8sxb639brzbfj0iddy5752hmg08g3h" + "commit": "87873d788891029d9e44fa5458321d6a05849b94", + "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g" }, "stable": { "version": [ @@ -49261,6 +49518,24 @@ "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5" } }, + { + "ename": "iceberg-theme", + "commit": "dec6f24b215de80a4c12856bd1ad4dc26c33f47e", + "sha256": "021v5rpmmk2bym46w9hs5ckyajqv41qf2l2183ybqfc679mkbym8", + "fetcher": "github", + "repo": "conao3/iceberg-theme.el", + "unstable": { + "version": [ + 20200510, + 552 + ], + "deps": [ + "solarized-theme" + ], + "commit": "50dc87567d450e32f91436badf25b45708126edf", + "sha256": "0r2v3x6gsqvvky66qcdzc7z1b4nj8wdz9nzhag2qv683sh1g82mg" + } + }, { "ename": "icomplete-vertical", "commit": "1a952162da476b4a0f496d9dc15d2d7a8d0964f6", @@ -49269,8 +49544,16 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20200417, - 1755 + 20200504, + 1916 + ], + "commit": "fe835acce91b0f088c8d27801bf42e24bb2dbab5", + "sha256": "1az3m6zwrggj4w2lh5qhnbh09dvxpyj5m2a85yhcha2p7g1hpym1" + }, + "stable": { + "version": [ + 0, + 1 ], "commit": "a2ee9254085431ec9e5c88d522e2c700355003ef", "sha256": "1bqnlvv1gvrjriazvzd3bq98r8ii6fqax0zznhvkl1ij5pf55a90" @@ -50886,6 +51169,59 @@ "sha256": "07ylrbl9i2d09nspj481hkgcq9vs4ikvl86sfj7594zzdyy6b8qx" } }, + { + "ename": "inform", + "commit": "fb678165f97deeebfab624a3bd74ce28836607fd", + "sha256": "1smgmzg8nf4lh2ywlzrzzqpmh66rxwbn7vrsvby8v6rx6bmyhfa1", + "fetcher": "github", + "repo": "dieter-wilhelm/inform", + "unstable": { + "version": [ + 20200510, + 1325 + ], + "commit": "9f9b98ead8aea4a50faf2bb4d60b28cab521c70e", + "sha256": "1i7ki31acn3y1mvsyn0rcnipmbj72n6s4n2fp8zy6228ss8kan18" + }, + "stable": { + "version": [ + 1, + 2 + ], + "commit": "3f0c6e05964ba65e6f452bf043feb1f0b9fd3eee", + "sha256": "0gmj64zskb7misz1l7ymjlh984l8ykp7g93vrjm5bq7xmg2726bx" + } + }, + { + "ename": "inform7", + "commit": "5d62f9e9e513103dbebc84bfcb0d18dcf7563211", + "sha256": "1h8bba0npnsjcyvmd40lbm54ib1rsa5c5df6lc7m53zg2h9fzcbd", + "fetcher": "github", + "repo": "GuiltyDolphin/inform7-mode", + "unstable": { + "version": [ + 20200430, + 1539 + ], + "deps": [ + "s" + ], + "commit": "a409bbc6f04264f7f00616a995fa6ecf59d33d0d", + "sha256": "1sai118i5ry58jjc3777kn2ca2nhaxszhl0va6gyy7j2cdpg8gpy" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "s" + ], + "commit": "a409bbc6f04264f7f00616a995fa6ecf59d33d0d", + "sha256": "1sai118i5ry58jjc3777kn2ca2nhaxszhl0va6gyy7j2cdpg8gpy" + } + }, { "ename": "inherit-local", "commit": "08b978724ff26b3ea7a134d307d888c80e2a92a9", @@ -51098,8 +51434,8 @@ 20200325, 2248 ], - "commit": "b943fe73327acc08dcd431eb8168a01609b9ab76", - "sha256": "13fk3b80gmgmr0d5296csvjfyjdq1jdxy3iahaj5mbhb9m3ganpc" + "commit": "d18423f78cc02ba866b1a1dfb0617476cd941c54", + "sha256": "0n6fjndwcp2qg8164420dlc3xsdzm6m0zwbvvwn5w03khbk788hr" }, "stable": { "version": [ @@ -51796,20 +52132,20 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20190113, - 1424 + 20200510, + 1355 ], - "commit": "698ffb93954817be0064ca6739f295d846707439", - "sha256": "10v6il7811w2907d8w2c28lnn29nlhdinlwwb7wy7rzl2vfinbm9" + "commit": "e2d8622343cb4bbbd6211533007eff2f417034eb", + "sha256": "1808dsc2zyzsbqm7zkz0zkpidgkw0vz8klmy2354ggjhb1klmxwj" }, "stable": { "version": [ 0, 9, - 10 + 11 ], - "commit": "fc1fcea5379bc7728a25dd81546886213e3db6fa", - "sha256": "1gvm5gfgmcw4mibi8899x9ry1zqm3ij6yl0dnmdqmv9dbv1zlqp2" + "commit": "a6e228eefed8dd6a405c235c15e7a4ea726cae02", + "sha256": "1n65202ap7qf44mv8f3ly5msp9fn12ap3cckhqb62ib3yw46ilwk" } }, { @@ -51875,11 +52211,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200425, - 1938 + 20200504, + 1931 ], - "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", - "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" + "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", + "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" }, "stable": { "version": [ @@ -51899,16 +52235,16 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200415, - 1311 + 20200429, + 1606 ], "deps": [ "bibtex-completion", "cl-lib", "swiper" ], - "commit": "1e5b50652d1f5189cfeb6b5ce3c4437e0239d4f5", - "sha256": "05xl3x98w4cr81zp04dcqy5xnims8x3k77qxzddcqcrvi9zjlfc7" + "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", + "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" }, "stable": { "version": [ @@ -52189,8 +52525,8 @@ "hydra", "ivy" ], - "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", - "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" + "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", + "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" }, "stable": { "version": [ @@ -52380,8 +52716,8 @@ "ivy", "prescient" ], - "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", - "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" + "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", + "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" }, "stable": { "version": [ @@ -52435,14 +52771,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20200322, - 1326 + 20200428, + 110 ], "deps": [ "ivy" ], - "commit": "596874d1469667f896b83731914d7d4456025553", - "sha256": "0yym3l24zzn1yjg3fjkq7lpvpp9w7wi2vl161v53pmg1v94xig6s" + "commit": "3f818b201769bc13cc75aa73645217e374136aca", + "sha256": "19w1mmqg15xy963f2h50i0cz0gmii75yarkmv2ssfh164pkyvhdk" }, "stable": { "version": [ @@ -52472,8 +52808,8 @@ "ivy", "rtags" ], - "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", - "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -52772,17 +53108,17 @@ }, { "ename": "jammer", - "commit": "cb82a6e936e2d5d1dd5930b600ede52dac3ceb33", - "sha256": "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z", - "fetcher": "github", - "repo": "wasamasa/jammer", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "19qvl428daa1xzkj3dldj5yvylq3w313bg42m4lqrmzhx3dgj8dd", + "fetcher": "git", + "url": "https://depp.brause.cc/jammer.git", "unstable": { "version": [ - 20160310, - 859 + 20200506, + 1247 ], - "commit": "48aa795df6df7ae6484518bcd0398293ca49d7c6", - "sha256": "1gnj8vmpxds2wdkz49swiby5vq2hvbf64q5hhvwymfdvwlk54v55" + "commit": "76e006dddd491aecccfcb06939db56f9f7daa56d", + "sha256": "18mz9yiz94xbvjlrpfxgfvv87s3rv3pv4b8y9c5yywr12zp6jbag" }, "stable": { "version": [ @@ -52802,11 +53138,11 @@ "repo": "ALSchwalm/janet-mode", "unstable": { "version": [ - 20191201, - 2353 + 20200509, + 1651 ], - "commit": "62a1ca33ac443e23869bc83dd2149cc014bb5132", - "sha256": "02chr2dcyf3946pg2wysybca559n2vm9lyb65zx6h6pvqhmg4kwp" + "commit": "2f5bcabcb6953e1ed1926ba6a2328c453e8b4ac7", + "sha256": "0qj0gpycv2f3z1dgz1a27bjn983hrr3ppvrp7csl34lagnmp89rz" } }, { @@ -53556,20 +53892,20 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200317, - 852 + 20200510, + 1041 ], - "commit": "bc904840f27fe7b0e6dbdaeb912a7175a3837110", - "sha256": "0w5cgys1yfhirhsvj4n5k6km2xwyqvlnbv0m0sim1vavizzfmda4" + "commit": "8525416b6d166ea022192e6f694c8405edc94160", + "sha256": "180rlz6fzb947kxwpp37v244py5fapxfiag4ipxmf3ld8g55g3mn" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 0 ], - "commit": "d6bbd83baf0746f22564f7ae92db44e06da6e08c", - "sha256": "1sk603258gvnfrvl641xfmgapg67z44wnlx6qba73wn3f2055765" + "commit": "3bda2d1085d5ac28fc6e7e8093ca7e74d3719f56", + "sha256": "0xk0if5i9cz4w06lx8v1vdm112pn1ybqgfw048sx15yyvfzgril1" } }, { @@ -53808,14 +54144,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20200211, - 2057 + 20200427, + 33 ], "deps": [ "cl-lib" ], - "commit": "fe53814dc2a0db2e95ac06083362e43923bf83fc", - "sha256": "0b30c5valf58md5h5zm45nkx9xdszwi4kz12qfzh27fyn46gdwjq" + "commit": "515d876c6ae45a61cf67a7bd5723fe4c9e518756", + "sha256": "05pgyisb2szbrfbv6wjhfi8c00gakv51jxb8j73pji30v2a9rapn" }, "stable": { "version": [ @@ -54058,6 +54394,18 @@ ], "commit": "81a5a520072e20d18aeab2aac4d66c046b031e56", "sha256": "13s18mjh6dpdxvva9yx4841rxvayxsvaj3vblxril6zm2wcqw2lm" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "cl-lib" + ], + "commit": "81a5a520072e20d18aeab2aac4d66c046b031e56", + "sha256": "13s18mjh6dpdxvva9yx4841rxvayxsvaj3vblxril6zm2wcqw2lm" } }, { @@ -54210,11 +54558,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20200331, - 1658 + 20200504, + 1726 ], - "commit": "88d7d875ef32eb9fb76917c97150654bb91ac96a", - "sha256": "1zsqj31avcil6ml2clfxk7hnmg5fx014xqbbvhm17ii7ggky4qdn" + "commit": "839726af374991223ffe56f7e7d10bef81033d09", + "sha256": "0lspmp519py7adippfmz70zcd9dpz46x8a3wlda71a5pdjs5szfq" }, "stable": { "version": [ @@ -54278,8 +54626,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200423, - 2236 + 20200505, + 1504 ], "deps": [ "cl-lib", @@ -54290,8 +54638,8 @@ "spinner", "vterm" ], - "commit": "e14c5590a79ee5529f574f6d4b0701d608e3e47b", - "sha256": "1xckmrdg41ai9qbpy9lxva4b1yq5jji9xff4fz9d4v72nqz7qn0w" + "commit": "e2f1e60098b1a2b3e166130e989489f7b845f8e1", + "sha256": "1l9w8404jwj6dsr9q4zx5ij6mbyp9qyj8116hs83s6jxgidi6fp6" }, "stable": { "version": [ @@ -54773,15 +55121,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20200324, - 1349 + 20200508, + 1621 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "9877c12ad412e79b3d88423f911be1ff59a72e0e", - "sha256": "079si7dhl45rx2vf8kf8srflk6nd6yxqz44xbsrh0s39gpp9v5dh" + "commit": "15e2612eba2eeb223f6b4e5ac4a55dc5da09b14a", + "sha256": "0qay924qz5ab7a4d7cnancfnb7ivra33dr6knwqmy3wf089jl6kk" }, "stable": { "version": [ @@ -55193,6 +55541,21 @@ "sha256": "1ybbayxfix63rwc8p5kl4wxxlk6vg53abw40fqrlkbc6qrr7nm5c" } }, + { + "ename": "keypression", + "commit": "056a8881cd868634a1833172436528ea2503af12", + "sha256": "1ysfpxfhgy14v0jy02c4qyz28cx682cf2haxlnrpw2gxjh0a0702", + "fetcher": "github", + "repo": "chuntaro/emacs-keypression", + "unstable": { + "version": [ + 20200114, + 750 + ], + "commit": "9ce977dabd8355ebe35d9d06821e4edb09060d2b", + "sha256": "0wrm5k1a9j90qqfx2w844nc9xd9a70x9krp1x3qm4zhal6mf0kzn" + } + }, { "ename": "keyset", "commit": "7bad8a1f1b94fbfbde5d8035f7e22431e64a9eec", @@ -55479,8 +55842,8 @@ 20180702, 2029 ], - "commit": "108a9151eb55b00f246613c511d88b7d58334595", - "sha256": "16wsaz29avmv9p3lfy0wjgxfwpszq8g3v9vl05azqkvjahf0lxib" + "commit": "db44e647c5e51251f0318b9b14e2c194163b4929", + "sha256": "19y8y66x4r4xmi3l1w79rp31pw17mmrxc8vcv6c49hd3js9jrx06" }, "stable": { "version": [ @@ -55488,10 +55851,10 @@ 0, 0, -1, - 1 + 2 ], - "commit": "ae0fa0cab3025e517452f44b91dd7d95182f39b2", - "sha256": "1ca9ggkbhfbr9d938nmg5klgmf5ayji0i201hcragjqj7hak18ia" + "commit": "78fb93b88f9941c22be02d36a786db8ca7639c59", + "sha256": "1z59fi9q32xql1w7pjh4w1jzfz1n63a0lr5x38kwjj79dpz3ccal" } }, { @@ -55502,15 +55865,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200426, - 637 + 20200503, + 2312 ], "deps": [ "cl-lib", "request" ], - "commit": "6c6c44386e00d352d96064cb25b50e960cd1ba22", - "sha256": "16k93w5xylx3v5q1hlzmlmg1ydg88bklgi2idd3h6k3sbi4linvs" + "commit": "7fda4115d5f762f9a2c1db10406ab2562119050e", + "sha256": "0pz2gzf7czh0jfwal1bzpx3vi1iqycbv9s3nmb2z8i497zg42gw7" }, "stable": { "version": [ @@ -55672,8 +56035,8 @@ 20191102, 1510 ], - "commit": "ab610996820b5cbdb032edbf8747661131603ab8", - "sha256": "1dcaiwxymrch1vfzssjizv6l9isc68xcf8987c0l71zmzmrq1s7s" + "commit": "8e6dd578f2b3d77ac33b6384d2bfe1b1f6799a1a", + "sha256": "12gwy76kz4qjw1qxma4q9pk9s2arzr5p95ni5vzizm2p4x4c5a8x" } }, { @@ -55767,16 +56130,16 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200406, - 2112 + 20200429, + 1454 ], "deps": [ "dash", "s", "transient" ], - "commit": "74db5b2e8418d0baeb8d3d0c274dfba3b9f32018", - "sha256": "1v8d8cvbqr12pglnd0lwijklfry5nz2j7nbv447bdkp5cp7y5f01" + "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883", + "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg" }, "stable": { "version": [ @@ -55802,8 +56165,8 @@ "evil", "kubel" ], - "commit": "74db5b2e8418d0baeb8d3d0c274dfba3b9f32018", - "sha256": "1v8d8cvbqr12pglnd0lwijklfry5nz2j7nbv447bdkp5cp7y5f01" + "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883", + "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg" }, "stable": { "version": [ @@ -56042,15 +56405,15 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20200423, - 1441 + 20200508, + 437 ], "deps": [ "eglot", "math-symbol-lists" ], - "commit": "e205bd95602e120186a1e18ca825e6bbc3b6c4d1", - "sha256": "12y297h0hln7smy26nixqbjzy9nk1pwc2a7sab8dlzjkyz37zbfg" + "commit": "f54599fe7656515320bec1e5e5fc16f7ee9c7a64", + "sha256": "01wvq0lpmsqffp1vxra4mj2g75k4lyblsb5mn0acwhhni369pa28" } }, { @@ -56179,6 +56542,30 @@ "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" } }, + { + "ename": "languagetool", + "commit": "ce91d4013963eacf1525809684e64ca52239fb73", + "sha256": "1cbhamz8yhfnyhzbn4j0kp9sbsycq1hi0j2kr3yhbf66fgi6x9f6", + "fetcher": "github", + "repo": "PillFall/Emacs-LanguageTool.el", + "unstable": { + "version": [ + 20200507, + 610 + ], + "commit": "e7faecf8a7eec8086aafc48a5c4f1908bb5c4300", + "sha256": "1nb5l1xpgz9z6xplb64a3nx8vis70r9dl0xxly5hddy67i49si54" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "e7faecf8a7eec8086aafc48a5c4f1908bb5c4300", + "sha256": "1nb5l1xpgz9z6xplb64a3nx8vis70r9dl0xxly5hddy67i49si54" + } + }, { "ename": "lastfm", "commit": "0b87a3465eece39cb2f73a90dedf97dd0dd970c2", @@ -56509,11 +56896,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20200422, - 644 + 20200511, + 821 ], - "commit": "27f21ed46a907a911222a72a31b41e414c956cfb", - "sha256": "041qgyskq39f91wjwr3d4ic5f1q7rvigannyyr9q4a2nbrn2dzhy" + "commit": "59c85a53385a3c55ce6b3b0e62a4fca1556389eb", + "sha256": "0scmdb99i20xk8rvlv2xjg54lqqvfp9gv8q9kpqa8jpcq21nbav0" }, "stable": { "version": [ @@ -56553,14 +56940,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20200415, - 419 + 20200428, + 1803 ], "deps": [ "leaf" ], - "commit": "8c956f9e39cb589544a90861ac05b9b2ee4d320b", - "sha256": "0qy1hmg7ycbx898cx5cckmk5l8bysyvvdc5y2gl3bsxjwlv1wlrg" + "commit": "bdf225b2b2cc76b87f5bf55dfa09c3a020ac1e7d", + "sha256": "0wdxxwh64l013vpkb7xpjqzyy4c0qy7h9l6l5cr4pncp7nx3bcns" }, "stable": { "version": [ @@ -56737,11 +57124,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200425, - 1517 + 20200509, + 1136 ], - "commit": "021eff5f88bf6392d7b3e511593e07471eb7833d", - "sha256": "0g4fgy39jp072b4ib0yxaxd3ndzxd1gx8inqqn9z9d7lxgc12l1g" + "commit": "5a517cee3dfedfd1b90c2f01d6d8e01198a198d1", + "sha256": "1gldvp2gp8vh97skrkxbcxh1qvjpndankjckm1q1h7jpkznjvc2v" }, "stable": { "version": [ @@ -56975,11 +57362,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200425, - 756 + 20200505, + 1811 ], - "commit": "444d36526382466e6bcf11c58066bcef759e4c1f", - "sha256": "1768r5gb8cpz8a03rgswf5mny539w96hjw1rpvfqvj4zbv7bvd7n" + "commit": "f25e4011fc30a35983ab08041f4e972daad4b106", + "sha256": "1vvqlmwmpzhqkhawabhvl6ns5083fk9g5ya7zzzrgqm7fxljnp16" } }, { @@ -57095,6 +57482,30 @@ "sha256": "0rpipbcfvi8ysx8aykj9sd23gkzq3knn656g84lb9h1zdjvc4zf1" } }, + { + "ename": "liberime", + "commit": "0ccac33c02762314d997156df4627c0c4a0279c6", + "sha256": "0i95vjn4rw7n4f83nrxjkmilzalgmjlmyhsvwfm4n1rqfqdwkl5h", + "fetcher": "github", + "repo": "merrickluo/liberime", + "unstable": { + "version": [ + 20200511, + 46 + ], + "commit": "a631d3d575b5ffa2dc9a3a950c53f425c21380c1", + "sha256": "1gx3nxxcw5xz2n85xqgnghw04gaakhcnqcs9bnxx2fh4qpwkqggp" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "f13a98ddd7be658e742b0f42988b02db9d779e85", + "sha256": "09d9dx4jk8bgbdcn6dh9ar5rs33s2cwz08w211b3kgj41i115gl7" + } + }, { "ename": "libgit", "commit": "993a5abe3a9e8b160f0d68283eeca6af033abc79", @@ -57526,8 +57937,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200425, - 1041 + 20200510, + 1533 ], "deps": [ "ace-window", @@ -57536,8 +57947,8 @@ "iedit", "zoutline" ], - "commit": "3c3f092824113278c57e93be1a2565f987ca0a4a", - "sha256": "1g0gmdq1n8l33ls4x06594hl8ayw8365ixgxp096d7qv7n5mxzn6" + "commit": "3660a8a6acf9a7faee4af4bf5249ceb85a5d8bbb", + "sha256": "0s20wrdqf51mxfnnpll38nzp5ira59l83yz9dg0svz0vj5mrrwr5" }, "stable": { "version": [ @@ -57683,20 +58094,20 @@ "repo": "rolandwalker/list-utils", "unstable": { "version": [ - 20160414, - 1402 + 20200502, + 1309 ], - "commit": "acf18aca1131a90f8d673974673e3c5d8fdc6a86", - "sha256": "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz" + "commit": "9bb2487c83ec46a0b6e6c4158af69334ac797b82", + "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" }, "stable": { "version": [ 0, 4, - 4 + 6 ], - "commit": "acf18aca1131a90f8d673974673e3c5d8fdc6a86", - "sha256": "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz" + "commit": "9bb2487c83ec46a0b6e6c4158af69334ac797b82", + "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" } }, { @@ -57956,11 +58367,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200401, - 420 + 20200510, + 1939 ], - "commit": "ab15012313217114d3f3940a6578df31ad223010", - "sha256": "1layngy8whcxgrpwhjdy41g194lkzq9z1wgv5rc4cg9smsbd6abi" + "commit": "38a3cf447fd7d9c4e6014b71134e178b0d8a01de", + "sha256": "0yah03sblz9i510cq6q2bj0mkz6sqdifpwhzxhs4kn8zdircr0f4" }, "stable": { "version": [ @@ -58521,6 +58932,24 @@ "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh" } }, + { + "ename": "lpy", + "commit": "e0e7941d9efc303b8cd5d3e7b29606316307fd8b", + "sha256": "1wna38yc3sxylg2qjwl424g8qcnaj0h6g0rnnmhzf1kfd8hkd7zx", + "fetcher": "github", + "repo": "abo-abo/lpy", + "unstable": { + "version": [ + 20200504, + 1918 + ], + "deps": [ + "lispy" + ], + "commit": "39d05463939398168dd8c8dca22d76af93aa87ae", + "sha256": "03wa94wn9a1lzdmi5fj5r446cvpqk7km9r9h8sq1hmwpr6qwymw7" + } + }, { "ename": "lsp-dart", "commit": "acbba6bc6f1bb6e1153f1f75ca1dc025bb5a8993", @@ -58529,8 +58958,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20200423, - 2120 + 20200509, + 1700 ], "deps": [ "dap-mode", @@ -58542,14 +58971,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "a27d12209570fe10c60e55e0718123fc2e7f7e8f", - "sha256": "192nmx00s4hxylp4lqfycbi2g8aq7bbzmy70c1qxh7k5m24yigxj" + "commit": "16d7568f1a7993d32319002a3880af8dba97cc8d", + "sha256": "0yqdzkw6nd97x0llsbf1aay50xz8k955kqjd8850vmd5x8kza117" }, "stable": { "version": [ 1, - 6, - 10 + 8, + 9 ], "deps": [ "dap-mode", @@ -58561,8 +58990,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "a27d12209570fe10c60e55e0718123fc2e7f7e8f", - "sha256": "192nmx00s4hxylp4lqfycbi2g8aq7bbzmy70c1qxh7k5m24yigxj" + "commit": "922389a2cc849852246c9f7e8bd7da1a907172d4", + "sha256": "01zqwqzkf6ib6b2wb306kyc6vm9xdjbxd65aa23n13a6kzk6c9m9" } }, { @@ -58580,8 +59009,8 @@ "dash", "lsp-mode" ], - "commit": "f46e56e554c9207d5ab5b9aebf994df8b41955f3", - "sha256": "1281qrskwwjz3x3mi99a6sp9694wbd08myhy0nlba6493ip8wbhz" + "commit": "af56404c383102344f9b99e2e168e69b7d8d50d0", + "sha256": "16fsyr77bwa7gipsafsacqy1ad51kgm5im0js5yinkg2ipwi75xk" } }, { @@ -58610,15 +59039,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20200407, - 2216 + 20200510, + 941 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "f7d1f190ebacc96ddbc722e76730ca2db3c4ce38", - "sha256": "0wadna7y1ydx7d88rj15ylvy7gy2y30pr8wds6z10ds321qihs47" + "commit": "1a541e2459b918012cd655407920600ad35736ef", + "sha256": "0bmyjgydyr0mppx8c4kv4vrfivyz1lpxxg966danh7rv9c90ps3b" } }, { @@ -58667,8 +59096,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20200425, - 1842 + 20200430, + 1659 ], "deps": [ "dash", @@ -58680,13 +59109,13 @@ "request", "treemacs" ], - "commit": "4f66649c2f02978145bd2e51ff8e6444b8631964", - "sha256": "08y81krxrfy9jm0qwmrszp1cainj37339503fqcnddaxgihvgnx1" + "commit": "bbbe4297fd470d0eb9492d011b0b4daf628763f5", + "sha256": "0qm9hwl88qwm19xwpsnv1rp9ny664440di0rd2lh3h7w1bczf76s" }, "stable": { "version": [ 2, - 2 + 4 ], "deps": [ "dash", @@ -58695,10 +59124,11 @@ "ht", "lsp-mode", "markdown-mode", - "request" + "request", + "treemacs" ], - "commit": "527e7b7abc11b51516b9bb52051201c2cdcd4a39", - "sha256": "0hcnvbyaqyypgby1bfj4zbrbq97amk8hfx0sj4w73rl46yf4jk3j" + "commit": "004516ed2f0803e068f50e00d5bc3bad76af45e1", + "sha256": "1n7prbj3fppl5d2qvjfyfsw280grr3yywvazrhygjrr5920jxarh" } }, { @@ -58766,8 +59196,8 @@ "deps": [ "lsp-mode" ], - "commit": "6c5b0d926857b16c7cf6eae3111709393845f523", - "sha256": "1qgryycjbvdk2i11qsdzrrlmhsvrpwfn3kw4g73zri4vfwz9cr44" + "commit": "5cd7b6bb35bc54f3e9341d6a64605a3bb50db0a0", + "sha256": "0lc3hidi1s993fz432090ab31r5pgb62ivw6y755332bgr359i4p" }, "stable": { "version": [ @@ -58790,8 +59220,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200426, - 440 + 20200511, + 424 ], "deps": [ "dash", @@ -58802,13 +59232,13 @@ "markdown-mode", "spinner" ], - "commit": "9c1ab8adf1a7674e15b643a4dd3781c4bed6537f", - "sha256": "127b2j0gfrkzb4g5p7hfv505afllhspni4w91kwgccf4b1a9di99" + "commit": "232dd55a9790691a1598150c2396e8d4256a59cc", + "sha256": "1h19fda1p9cqkdqsjkvmnjf9wmj1xmq6c897fwi150qkknic2zjj" }, "stable": { "version": [ 6, - 2, + 3, 1 ], "deps": [ @@ -58820,8 +59250,8 @@ "markdown-mode", "spinner" ], - "commit": "5c8addac9d57dff268d2f6e825522fd5353e5e3e", - "sha256": "0f9d0zhblcjzrpggqclww2g7fyjky5rzpp7zj424005ahv0zd3xf" + "commit": "bdbd2d0ccfe02f6721ea942e82e5178f4b216228", + "sha256": "125rpmhlyd6wmq7p71j54x3rzmk07vn1hdcvvdjjip5481raxcwx" } }, { @@ -58842,8 +59272,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "e16e91d6a2a6cdb406ee9b98cfb47f7a32e41d61", - "sha256": "1fyghfl1acrghf8lisg760cgxw4rnz29ym4mzlznc0lb80d43cg3" + "commit": "b462cfa9b8071c624b905baf37a255d808ac6376", + "sha256": "1wig6hr5g0q0lg7zkqw1bfgagpx1ndpga75lnxaqpm0f0rgwdc33" } }, { @@ -58938,15 +59368,15 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20200425, - 555 + 20200501, + 1408 ], "deps": [ "cl-lib", "lsp-mode" ], - "commit": "19feb4aaaa03382e5d9841f237dd1685d8fe2994", - "sha256": "040qahn9h30n44ik0yrcdysx9lhvdnjxh1wj5nzylmzblxz9s2ga" + "commit": "324a0bf50be2ebbdafcfb532c573ac22d5170d10", + "sha256": "08ysclhww0jc9fbxqn59qy05m4nsfgdgjzdb7pwfxp27p5c282a4" }, "stable": { "version": [ @@ -58995,8 +59425,8 @@ "deps": [ "lsp-mode" ], - "commit": "04d75b6a0be5894fea4a55fec0b2ccedf5b3be58", - "sha256": "09vvjb215qz4l31bs2pvwdnnahmyhh34zhf1ghymcr2d34zqiqn0" + "commit": "130f7a8f7a37869515953aa7715b3b969c3d7a0b", + "sha256": "0mz1wdxn31qngk98k924mwf4f5pb8v1y9jjl2sf4mrjw1wz2xsnb" } }, { @@ -59007,8 +59437,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20200414, - 407 + 20200503, + 1640 ], "deps": [ "dash", @@ -59018,8 +59448,8 @@ "lsp-mode", "treemacs" ], - "commit": "9d1a42b7d7abb112035f05f50ffde9834da034ae", - "sha256": "1kbr2ndbg0lqjcnsyvmpv513kzj3gy0kd0wa18ixh96i92a2znar" + "commit": "bd2c3727dd1e46e972477f11ba84999697ed842c", + "sha256": "03jlwbzkkpqn0a68m991b6zhbnpna1rvjsdjmqqvyng209lgcgph" } }, { @@ -59030,8 +59460,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20200402, - 839 + 20200503, + 1650 ], "deps": [ "dash", @@ -59039,8 +59469,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "242dfe859c3497c456eaacfd84942e12419529fe", - "sha256": "1sx4nn6mkqhxp67jvh8pp0i4g26rzyvlq2b59r7ipmxh91c2a4fh" + "commit": "ab55e306af9dd9eb62fe7463e4e05d948ad3dfc6", + "sha256": "0z0pgp25hac6m2c58im05cqdyj3383672b3hnirxl5ky45c4rvhn" }, "stable": { "version": [ @@ -59065,11 +59495,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20200405, - 1305 + 20200508, + 1316 ], - "commit": "658bf8f6c2bdcfe41cd14f5fb651563b41d0fbaa", - "sha256": "1qaqp2s5fnb2zz3bzc1yx79ilqxrf04lmd5gkk56nka4flyslp80" + "commit": "a3a71b155ab63a64c077a48d1f83596b388bd564", + "sha256": "1k7i7vwn7nnia9dlgh7d3gqyzmvf1i3ipjlbfw8lwcdlzsly940y" }, "stable": { "version": [ @@ -59147,11 +59577,11 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20200227, - 1301 + 20200507, + 1518 ], - "commit": "16fa8d109ec5799931a793b2e866ea9d593bee84", - "sha256": "1l6pi5ldmdcgv5qyg3kk1x8sxb639brzbfj0iddy5752hmg08g3h" + "commit": "87873d788891029d9e44fa5458321d6a05849b94", + "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g" }, "stable": { "version": [ @@ -59486,8 +59916,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200425, - 2117 + 20200503, + 1905 ], "deps": [ "async", @@ -59496,8 +59926,8 @@ "transient", "with-editor" ], - "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", - "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" + "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", + "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" }, "stable": { "version": [ @@ -59525,15 +59955,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20200224, - 1 + 20200428, + 9 ], "deps": [ "cl-lib", "magit" ], - "commit": "0bc96737634e78ac7c7f8a3f73190531c0890914", - "sha256": "1lm8412n2046fz8n7rfbadyww2074lsxq0w4gm1x1alraz5im5h4" + "commit": "ef5dce6267e9118a5eca82a22bcad0b67826c23a", + "sha256": "0vzkydgl889cq173zjl89g2vrddb9abc4a8gljiz3b4a7n5b1nrd" }, "stable": { "version": [ @@ -59824,8 +60254,8 @@ "libgit", "magit" ], - "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", - "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" + "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", + "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" } }, { @@ -59911,8 +60341,8 @@ "deps": [ "dash" ], - "commit": "f316a085b9f66804692554df46c0f4f536a45b78", - "sha256": "1d650wny0201vh4hmkmx290rq0b2fnlwlb8ivys7mai9d380vlwi" + "commit": "b8e886c4f2242d6c58f84d4549af712e86360db1", + "sha256": "14l989m5pxzxk6164z8lgvshy45aq0ab78mjz5f6zw58h5rvnbdg" }, "stable": { "version": [ @@ -59979,8 +60409,8 @@ "deps": [ "dash" ], - "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", - "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" + "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", + "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" }, "stable": { "version": [ @@ -60764,14 +61194,26 @@ "repo": "plandes/mark-thing-at", "unstable": { "version": [ - 20190817, - 1623 + 20200427, + 1453 ], "deps": [ "choice-program" ], - "commit": "0d2220fdc81c33a36ab5f136856f9f2f79cd01a7", - "sha256": "0xxip63gkq76lhlafpgklpnj3n345fw95pdwhn5blzsjrx77ig6h" + "commit": "a69696635616c10184a3289d459d8eb532f04f47", + "sha256": "0iiwa5cv43177irm4kj9jzfr1jzkw0gw0rmy9vnnbggfgmklzxrq" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "deps": [ + "choice-program" + ], + "commit": "a69696635616c10184a3289d459d8eb532f04f47", + "sha256": "0iiwa5cv43177irm4kj9jzfr1jzkw0gw0rmy9vnnbggfgmklzxrq" } }, { @@ -60835,11 +61277,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20200421, - 2222 + 20200509, + 1525 ], - "commit": "365697302345f8b9dc10bc975477452a282f7ae0", - "sha256": "1afjp0j5498zzbl8ycrz37cqdssfjlxcx5g4addzv0xaicfghgk6" + "commit": "f47a2e9796dfdde6fae7920af23647fe027dc34e", + "sha256": "0rz7gk7hwvi9ialkhbvh7lmxvjks1yp9ihrdx2kf4k3jyf1sb9s9" }, "stable": { "version": [ @@ -60941,30 +61383,30 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20170711, - 1949 + 20200502, + 742 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "7038f4f6d5c2bc7e4aea89699a607ac2b7dd16a8", - "sha256": "1kvf30ib1kxp29k1xwixkq6l4jjr3q3g1wpvh9yfzk5ld97zmry1" + "commit": "a9f13eecd0c7d8be960055dbc2d6f5d3fe6f40ca", + "sha256": "01xls8jd6l8c8xiyx8l15j5ca96gsln1m32prnhw4sfmrlw996h6" }, "stable": { "version": [ 0, 1, - 2 + 4 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "15587c76bec43dd778a2034035f98a79ad29e96a", - "sha256": "00rvpbfcdy1npddxa7yynqpzwrx1h2bm69x9yh42dv6ss3vk1sjs" + "commit": "e6de0f5c4c6dfdb8da37b34a16fe7e8edc88765c", + "sha256": "1xqrrf4gwcr64xgbyvgplmcrcl7knfsm0v8yzrhscq65pb7zf3zj" } }, { @@ -61554,30 +61996,30 @@ "repo": "mopemope/meghanada-emacs", "unstable": { "version": [ - 20191215, - 1353 + 20200506, + 743 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "70bfbf553c7b7fb1928672e9a95b7137e02c2d4b", - "sha256": "07rl9lr4dyb9ld2cgvkxkfirls03jznggaa1j776nppk00fhz3bg" + "commit": "e119c7b3271281d60892b80a0cc6488503baf38f", + "sha256": "11nvhvxm39pcxjknzik6n07l309x9r5maf24pnlgk2wxkr28xmzs" }, "stable": { "version": [ 1, - 2, - 1 + 3, + 0 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "70bfbf553c7b7fb1928672e9a95b7137e02c2d4b", - "sha256": "07rl9lr4dyb9ld2cgvkxkfirls03jznggaa1j776nppk00fhz3bg" + "commit": "83ee6c6520a8cf063742e1b16fef3efebbcf8b73", + "sha256": "1hk4953dk93pa7srlgnjh9pskpl67f90gm9g0iv9zffwsxw4kwaw" } }, { @@ -61744,15 +62186,15 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20200425, - 1327 + 20200510, + 154 ], "deps": [ "cl-lib", "dash" ], - "commit": "f9e4296ed96ca31c8197ba8a5576fc94ee433755", - "sha256": "0dgdf6xlylnnsm7954xa8vf50x4mfcr8gvajrcii2shbcb23b8c8" + "commit": "56e7ba100eb0ae92a37bcd0fcce77affa26d2fb8", + "sha256": "1jz0jpdr4imzs7rr21q19j59y04kw518qpisrrsmyw6fywi8k22g" } }, { @@ -61766,8 +62208,8 @@ 20191025, 851 ], - "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e", - "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va" + "commit": "db957668fa2be7b9d076f0c066178a65c48dd085", + "sha256": "0abg2c0lcdiwmf1jlybrjw0n17hwqfmj29r7gbvrsm16snf27rag" }, "stable": { "version": [ @@ -61849,6 +62291,21 @@ "sha256": "1720b3hpfqd989zrgcns51jbjrv4vzl9di9mccl55vkmkbqzfin0" } }, + { + "ename": "message-attachment-reminder", + "commit": "7412f7428d16955968cd78de3bb3abcbbcd5c508", + "sha256": "0hwah27sw3myka86gywjjncp0i8lnqiagklxdh6z6z4hl9jk105r", + "fetcher": "github", + "repo": "alexmurray/message-attachment-reminder", + "unstable": { + "version": [ + 20200428, + 124 + ], + "commit": "a8b761d665c17694a04eccf1c2bc135d35bdf482", + "sha256": "0rg34w1nsvmwxn9z3aipj32fk26fykzqxkr0x7am7icigg02dsbn" + } + }, { "ename": "messages-are-flowing", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -61965,14 +62422,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20200419, - 1758 + 20200503, + 1425 ], "deps": [ "seq" ], - "commit": "287ced1bd51080897b2d6084f72f4a697e9b7e94", - "sha256": "190jpvd1li2185d1m9k2md5x0fz156a7lwwl57n4ir54j4h0s8ri" + "commit": "6d68118eee409a2b671537129eae1154421ba82c", + "sha256": "1i7fzla9i3s4439ckkny09fq3r2q0q2153qzyhxsfbcxb47vbx26" } }, { @@ -61983,11 +62440,11 @@ "repo": "jagrg/metronome", "unstable": { "version": [ - 20200309, - 1918 + 20200502, + 1748 ], - "commit": "ab9478da0da3aadba26c65beba938c3928c823c3", - "sha256": "0qrjyn2qc5k5a6gz1m1izx315sy7dd0cdzgiyrwp8za39gkhgbl7" + "commit": "18257ecdd7b3d816104e83a5f0f96e676cc9fbfc", + "sha256": "14qzb1i9l149nw4zhx8jlrrz7nvflc974zr5lbv7vv2zky0pya6w" } }, { @@ -62258,11 +62715,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20200424, - 852 + 20200430, + 721 ], - "commit": "3aa8de59d170d7bdc16e5f829d952d82abd7739c", - "sha256": "02j2w4c4wvqr1csmr94rzhbrwhqfb5wmjngxa9wl58z1plwy4d8m" + "commit": "78d9bbb272acc5f2927648cc706321f95e2955c9", + "sha256": "1d4zgrpy21j35dzcspbv4szbprxxv9mygwqfx0x2bs53z4abk1kg" } }, { @@ -62472,26 +62929,26 @@ "repo": "arthurnn/minitest-emacs", "unstable": { "version": [ - 20200224, - 1823 + 20200506, + 308 + ], + "deps": [ + "dash" + ], + "commit": "ddd152c990a528ad09a696bfad23afa4330ea4d7", + "sha256": "0mdbn8v6m4902krnagsp74r4501d4yfxc33i55l4l14gvjgx1239" + }, + "stable": { + "version": [ + 0, + 9, + 2 ], "deps": [ "dash" ], "commit": "97d7d1760b24e117ffd163531b0f57fd4321677b", "sha256": "0d8kg68yy5x1y3ivj43vzcakb3gii6bh8jm40g4sah5f53bbrs16" - }, - "stable": { - "version": [ - 0, - 8, - 0 - ], - "deps": [ - "dash" - ], - "commit": "2bed01262b0d888473468b5c7bd7d73694d31320", - "sha256": "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh" } }, { @@ -63038,20 +63495,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200425, - 1503 + 20200510, + 1103 ], - "commit": "0344a1b534468bdf072040d467ac853215d4fa63", - "sha256": "1bpryv6i8vm3g7avhns7nr65d82zq5kahh9kap7zg4w2a4gx1hl7" + "commit": "a99bec324b712d9444fa1c2abd4ef083e6cba64d", + "sha256": "078vvx87mymgqj4n6dszw1f15k235cz522zpvxyavh5rhsf123fh" }, "stable": { "version": [ 0, - 7, - 0 + 8, + 1 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "89a31f6242dac52071ee6be18feadcb604b548d7", + "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il" } }, { @@ -63062,20 +63519,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200425, - 1503 + 20200507, + 1718 ], - "commit": "0344a1b534468bdf072040d467ac853215d4fa63", - "sha256": "1bpryv6i8vm3g7avhns7nr65d82zq5kahh9kap7zg4w2a4gx1hl7" + "commit": "a99bec324b712d9444fa1c2abd4ef083e6cba64d", + "sha256": "078vvx87mymgqj4n6dszw1f15k235cz522zpvxyavh5rhsf123fh" }, "stable": { "version": [ 0, - 7, - 0 + 8, + 1 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "89a31f6242dac52071ee6be18feadcb604b548d7", + "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il" } }, { @@ -63238,11 +63695,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20200318, - 830 + 20200504, + 237 ], - "commit": "90f34d48baad78a86f60eb3fae902c545bb82505", - "sha256": "0sjxyvv16jm2xss6kxiankn9n92z52l20p2mkv95p2bd47mxn5iw" + "commit": "06f907e4a954688ec2096420fea1c9935d819e07", + "sha256": "1k73bnwyjnmgvx4664pqrk1ig0rr0rwxzlf165dh5fspzqkmrjqh" } }, { @@ -63316,20 +63773,20 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20191101, - 1955 + 20200429, + 309 ], - "commit": "0b07bdc7e77e19d7c722c2db803be0d3b47aa692", - "sha256": "0i40rbc0m4sya4f2lcfc6v6kn4kc6rny3j14b5rma66jyx08fcwg" + "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8", + "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk" }, "stable": { "version": [ 1, 2, - 1 + 2 ], - "commit": "43682f713eb1b95b98c1ec18e4f51daebd9ad43f", - "sha256": "03ms3yfp05b7c65pgjncm00r45fqgzal9xsp5gj58cm0yhclkcsd" + "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8", + "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk" } }, { @@ -63572,11 +64029,11 @@ "repo": "wyuenho/move-dup", "unstable": { "version": [ - 20200311, - 1424 + 20200506, + 2305 ], - "commit": "7a384e0e0889e07a9a81d007d8ccc654c7c89bd2", - "sha256": "040xg9bbficz300zqrnvk68b76ljnif9sdiag03hp61xqpzxmacm" + "commit": "fa9be365fcd6a2b89388b4d27dec93928d506678", + "sha256": "0pb5xfzk5lfdz613hqsr9x1f0i5ls61xc0np43kqaxnr4xjz2fld" }, "stable": { "version": [ @@ -64047,11 +64504,11 @@ "repo": "cdominik/mu2tex", "unstable": { "version": [ - 20200329, - 758 + 20200506, + 754 ], - "commit": "536a7a0db4ddbdb30a16fdd56c79b78c9b50d865", - "sha256": "18s4mks7yxbxlhdkn9s2bgxyl14rv7ds7n6c7g3pzjd94j404b64" + "commit": "fef2f2390c002e21811375ce4d7a1c7a308248b1", + "sha256": "1119l71z00syg0zcp330z1757hjf0p06cwc8a4id6alkmbk70jba" } }, { @@ -64128,14 +64585,14 @@ "repo": "agpchil/mu4e-maildirs-extension", "unstable": { "version": [ - 20200410, - 820 + 20200508, + 712 ], "deps": [ "dash" ], - "commit": "36b1f3a561af173eccc7bebf10ee060af44ed6e7", - "sha256": "1k8xar4yal5nc4ixx78gvs4fvlxpa2c4fzkq3xzh6jwfbrc7g013" + "commit": "4d2ece2226fa69a0e0bb23517a418145b92bd573", + "sha256": "1gyyj1fzc34qrlfbk86lrrrib46r7lrw7pdxwzrx8jz42rd38jma" }, "stable": { "version": [ @@ -64447,6 +64904,25 @@ "sha256": "1ijgvzv5r44xqvz751fd5drbvrspapw6xwv47582w255j363r6ss" } }, + { + "ename": "multistate", + "commit": "c844d8250242ce3f6d9955bb236042bd31c9b360", + "sha256": "0gidbdr0hlyxvkq1r15w5xp5ssqv061cyk9sdqdry4942dy0zgvg", + "fetcher": "gitlab", + "repo": "matsievskiysv/multistate", + "unstable": { + "version": [ + 20200506, + 1536 + ], + "deps": [ + "cl-lib", + "ht" + ], + "commit": "e1175bae0cac6c16e3533c7e82347f0f15796afa", + "sha256": "1qv3n2bhw2jxc9bg0q4c3mpj19k97bkp4zp78r1k3b6r1is7bjgb" + } + }, { "ename": "multitran", "commit": "d665759fa6491b77103920a75c18a561f6800c1c", @@ -64762,14 +65238,14 @@ "repo": "mallt/mysql-to-org-mode", "unstable": { "version": [ - 20181012, - 2034 + 20200503, + 1239 ], "deps": [ "s" ], - "commit": "7c986065adcbe13a525e1da5db8aa4c80b0ef7a3", - "sha256": "15zalc1rciawf5v2nkhf0qnn16c6fdaxs3m8aard3yhyag05ic3d" + "commit": "7dcd6486f374814908bdb3c6d4c88cd6cece1e2f", + "sha256": "1jpz68pf8j7f4jin5qk4lrkxfzjwyqs16fn3j9ll21z4lc2mj2a8" }, "stable": { "version": [ @@ -65164,8 +65640,8 @@ 20200424, 1635 ], - "commit": "ccb5b52940a9374fbfe92947f0101e7254ba445d", - "sha256": "0p3qrl59qhczwysydsak66j7ixpykr3397xdvjj3hkmmcrsachic" + "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41", + "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5" } }, { @@ -65558,16 +66034,16 @@ "repo": "felko/neuron-mode", "unstable": { "version": [ - 20200426, - 1310 + 20200503, + 930 ], "deps": [ "counsel", "f", "markdown-mode" ], - "commit": "aa97a6fbb5c3b33ad73a1ba31c7e50c8842091a1", - "sha256": "18nr1ayw9j3zfwj79qsqvf5nw36fqpyr2bq3cl93kck1adv949d8" + "commit": "4329de608ca14dc67448ad576645eabb084009ef", + "sha256": "0wk4cjcj98yym1cca2k1wgail9rvxaqs7n9fkccnxv9bddjmymv9" } }, { @@ -65816,8 +66292,8 @@ 20181024, 1439 ], - "commit": "112217185e0351f9ad7fa17542862ac3c0922653", - "sha256": "0shby25dqy9hkb3chgshr2c3hqq6k35261sv3lw7zj5lxv9jrrkp" + "commit": "9a77d919525a6f844a5c18a1bcf2c2eeb9393ad7", + "sha256": "1x5qwp8f12szfvw0x0qxlfz4ds0z9nc7fmsaaqqhsj9p2yzvkcd4" }, "stable": { "version": [ @@ -65915,11 +66391,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20190904, - 1440 + 20200510, + 212 ], - "commit": "5b5961780f3b1c1b62453d2087f775298980f10d", - "sha256": "0lyf9vp6sivy321z8l8a2yf99kj5g15p6ly3f8gkyaf6dcq3jgnc" + "commit": "32b013cd622a37cd553c8899332064397c90105b", + "sha256": "0cg4kj8g08kiid6w5n55kc7kffl8rhccpa4xgs68d13isd70fdv2" }, "stable": { "version": [ @@ -66194,14 +66670,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20200413, - 2118 + 20200426, + 2105 ], "deps": [ "cl-lib" ], - "commit": "ea8d8654365eeeea366a3ee0f51689987f2803a8", - "sha256": "02mgcz04xz9wkid3gkykbpjw3vriai7anyq3b61iv3pk9kcdp6x3" + "commit": "e67d7edac513892c5997468899f177a6e7956906", + "sha256": "0b1f1lxzp2i2liysl8fs1lqcyrz220m232pzk8h6l7iq8y5fp15q" }, "stable": { "version": [ @@ -66507,6 +66983,21 @@ "sha256": "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm" } }, + { + "ename": "nothing-theme", + "commit": "8f69a676e9adfb45f8fbd4467e86a4cb0fbf6ae8", + "sha256": "0w93f50sb9swgn1lwnk8pdwwa5kpizmaaz13lvbk1qhq2xipr7yp", + "fetcher": "github", + "repo": "jaredgorski/nothing.el", + "unstable": { + "version": [ + 20200504, + 402 + ], + "commit": "d2514bb9707f66dda0d60f40f465e79914c50946", + "sha256": "1gy3zis9swkriynaq4xc8mc3xiihak0hi718pckbkxwjmnrfyvc0" + } + }, { "ename": "notmuch", "commit": "d05fbde3aabfec4efdd19a33fd2b1297905acb5a", @@ -66515,11 +67006,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20200416, - 1058 + 20200427, + 1036 ], - "commit": "7b756d1e3885b70e81647a85432e0f2d043167c9", - "sha256": "0n0f6wsm6j980vxli6j6slixws45vgdbmw2xvwrs1j1h91vd0pc6" + "commit": "627460d7bbbb6b95a07084c2b6fc7f647a5547e1", + "sha256": "07fm4ndg42c0fw2dhj2rl32yrdnyprhidgkrwyckghwj02gjfwrj" }, "stable": { "version": [ @@ -66592,34 +67083,34 @@ }, { "ename": "nov", - "commit": "cf543955ba2d5d0074fa2a5ba176f9415f6e006d", - "sha256": "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq", - "fetcher": "github", - "repo": "wasamasa/nov.el", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "1w4il2jbn0x6v11y3rnz5w5vs0d0hhlqqzzxdpkpmrq9ycbq58hw", + "fetcher": "git", + "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20200220, - 939 + 20200506, + 1245 ], "deps": [ "dash", "esxml" ], - "commit": "cd1b264b3f978a9285fa9297e40ad29d1434adf5", - "sha256": "02apbr5x9vdrx05mfs8qyp4ami1y30n8mmy4kpd4xw04nza9wxki" + "commit": "55a3b41aa71740826a1cd410fa8d24a313f27b7c", + "sha256": "0zw6iq2iwv06jixb5cv73b832y576v0vs51l0j80d8w5d09zpfz3" }, "stable": { "version": [ 0, - 2, - 9 + 3, + 0 ], "deps": [ "dash", "esxml" ], - "commit": "5184fbb1f3b3540be58a28f6dd469ff212ccc9bd", - "sha256": "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3" + "commit": "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596", + "sha256": "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz" } }, { @@ -66960,8 +67451,8 @@ "repo": "rejeep/nvm.el", "unstable": { "version": [ - 20190912, - 626 + 20200501, + 1414 ], "deps": [ "dash", @@ -66969,8 +67460,8 @@ "f", "s" ], - "commit": "e93e5216e311c665c593ac68c5456d624120ea42", - "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" + "commit": "fc925b9afe738264cb15d5135c7426f999aeda47", + "sha256": "1mb3i7d470ggky6g9ib1jf04yfkfn9m8jd70mb18rac2ik3sy03q" }, "stable": { "version": [ @@ -68242,26 +68733,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200413, - 1503 + 20200503, + 853 ], "deps": [ "org-re-reveal" ], - "commit": "6db38600d651f4aea77e0d411466be7fb6314f39", - "sha256": "11akmygscph5pq1zc889pmlp8ab91qk29lwrrp3gxmgy2s5x9mgf" + "commit": "b5ac03800294272d2deba115bcd08c9176580691", + "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5" }, "stable": { "version": [ 2, - 9, + 12, 0 ], "deps": [ "org-re-reveal" ], - "commit": "eec26a088d19cd202417f662bb487b550230d11f", - "sha256": "1vj99sj71qf622gc9fy6kafp4ki7arqljj1dwkl4k2fnf4hv3af7" + "commit": "b5ac03800294272d2deba115bcd08c9176580691", + "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5" } }, { @@ -68324,20 +68815,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20200417, - 607 + 20200430, + 519 ], - "commit": "fa9757fbaa392be622ddf66c2535dfe4b5cca898", - "sha256": "196g4n2cr1w77k2a6582rc3c8fnnfps83f1kh76k8k3lvkjg8pjb" + "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42", + "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp" }, "stable": { "version": [ 1, 9, - 4 + 5 ], - "commit": "9005661e18d9eaaf1105018d084916e4927cc66b", - "sha256": "0ca80z6drsw9jkwijn6f05y1n7rmcypvh0yvsb77wnqrzd7y4p68" + "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42", + "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp" } }, { @@ -68889,8 +69380,16 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20200425, - 855 + 20200504, + 706 + ], + "commit": "5b292ac136b891d574f0d9827904e6ad527a9c35", + "sha256": "0973fksap71cya30g3a58jqdd4hxkv4ia603dgl06qgirjvpl820" + }, + "stable": { + "version": [ + 0, + 3 ], "commit": "b69b52289fdb0023a3123b1ddec5b490125345a3", "sha256": "0vxpaqsad3x1lqga1ky7sipm8lk8ps66wpcvz52jdqasxmxzvrjm" @@ -69186,6 +69685,44 @@ "sha256": "0j765rb2yfwnc0ri53jb8d6lxj6knpmy495bk3sd63492kdrxf93" } }, + { + "ename": "org-books", + "commit": "2362892068bffb99a37e77201924ec12676a5017", + "sha256": "1mp0n1x5ka2x2rc6pd4nn54cr8b3qxl7fq8dsyng7bm300gizpf2", + "fetcher": "github", + "repo": "lepisma/org-books", + "unstable": { + "version": [ + 20200510, + 844 + ], + "deps": [ + "dash", + "enlive", + "helm", + "helm-org", + "s" + ], + "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1", + "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90" + }, + "stable": { + "version": [ + 0, + 2, + 18 + ], + "deps": [ + "dash", + "enlive", + "helm", + "helm-org", + "s" + ], + "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1", + "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90" + } + }, { "ename": "org-brain", "commit": "47480fbae06e4110d50bc89db7df05fa80afc7d3", @@ -69194,14 +69731,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200426, - 1410 + 20200510, + 1834 ], "deps": [ "org" ], - "commit": "ae7fe0f628bd093526786ece6917f7a4310e5e4d", - "sha256": "0szav8idqq2gmckaxqnjgcah978as2nhv43nl9vvvfkc9dc2l5x4" + "commit": "ed99f7e38dd687800fb898f8934a0da0541ebcd9", + "sha256": "1pb9l4gxjm8bfw2xny06iwbd7yfvdjxsvdj4lydpa0z0kgdwd8cs" } }, { @@ -69236,14 +69773,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20191024, - 724 + 20200510, + 2030 ], "deps": [ "org" ], - "commit": "f530b94b6f8d8d1f8a207e48986da75227bd78a0", - "sha256": "0b5gw1m646fq7xlq8966rlmqs63p5dgrq71cjc943s45mli0vvcs" + "commit": "8569941a0a5a9393ba51afc8923fd7b77b73fa7a", + "sha256": "05lgxqaffnqaqnzl24frafdkskran88hl2ml05qvyjhs4jjbgw9g" } }, { @@ -69299,14 +69836,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200408, - 1328 + 20200427, + 1413 ], "deps": [ "org" ], - "commit": "67f50aa2a2839ffdb1c1a5e2f135e69f868e4b26", - "sha256": "041z6f5fyzc46grwqllz81hixkdqdic3a6zird7i0yy7cr2hqhcf" + "commit": "e8b4ba8a10b8f356a712a75a87f1fe38dac32d9f", + "sha256": "0q505lxzakbv524ychswhlp650fym86l9j0sjsh7idasnz01sc2q" } }, { @@ -69525,11 +70062,11 @@ "repo": "rudolfolah/org-doing", "unstable": { "version": [ - 20161017, - 1620 + 20200510, + 1732 ], - "commit": "07ddbfc238cba31e4990c9b52e9a2757b39111da", - "sha256": "1d9gf6wf3jp07bn2h6bbc75iy0wwdvzdlj9n4nwbc46nf3k154pa" + "commit": "df916bb13577f4de9d58332453cb8bf51eac37ba", + "sha256": "014xz7yjw97i1dzyg487r2v9rf3jk9jwc5acgg1fj5kc2n1m299m" }, "stable": { "version": [ @@ -69567,14 +70104,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200410, - 1444 + 20200506, + 1829 ], "deps": [ "async" ], - "commit": "46417e2bd30c9bcd1e8a1f4c554ad44543e869e6", - "sha256": "1jzmyr6v33x7012ljbc45w2ww3lb96i4nh1ydxzdjwnbvpj2j17s" + "commit": "d248fcb8f2592a40507682e91eed9a31ead4e4a6", + "sha256": "1m8683hkxs70754kqxxw6sb0wfvjkb9ghf9ny7zsyzvz0yj02gkm" }, "stable": { "version": [ @@ -69878,8 +70415,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20200424, - 1929 + 20200501, + 24 ], "deps": [ "alert", @@ -69887,8 +70424,8 @@ "request", "request-deferred" ], - "commit": "1667aba7c0a33e3c23c3a47fc04e89670684eddc", - "sha256": "1zzibnvsdq3iv874x6g6zrjb17mb036dln68mn4a1xlcwvv1king" + "commit": "2ee2b31547e6f4e33db70fb812d552e55d612fd6", + "sha256": "1gwz1avfbvn5pf72qfg3q6v8qhjihs89avzgx4v7mx6x34fgnpby" }, "stable": { "version": [ @@ -69956,6 +70493,38 @@ "sha256": "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c" } }, + { + "ename": "org-id-cleanup", + "commit": "2d59dfe413397ba07a74b7d344e9f9a73c0e3db0", + "sha256": "1jv4ffjd61p3p8qkki798yzky96k53hbnph4xfz77xkc8i2d6rxf", + "fetcher": "github", + "repo": "marcIhm/org-id-cleanup", + "unstable": { + "version": [ + 20200509, + 1615 + ], + "deps": [ + "dash", + "org" + ], + "commit": "dc0cc6b056aa9d820670e3c668f3bc2c6b3c1809", + "sha256": "0fikyhz08msn4zq1fb3a09s3lkrpv73669kvd72g1pqmy4fzgrjc" + }, + "stable": { + "version": [ + 1, + 3, + 7 + ], + "deps": [ + "dash", + "org" + ], + "commit": "dc0cc6b056aa9d820670e3c668f3bc2c6b3c1809", + "sha256": "0fikyhz08msn4zq1fb3a09s3lkrpv73669kvd72g1pqmy4fzgrjc" + } + }, { "ename": "org-if", "commit": "09df84b60c46678ad40d8dabc08fcfe518f5ad79", @@ -70032,16 +70601,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20190930, - 1406 + 20200505, + 137 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "5123c29867e5da54d80e92f9a5a4259144451404", - "sha256": "1j45whlsclwq9v0c98ni4y5p04slmlwgwsbbr7saaxgv9xmv4yfc" + "commit": "c3c69aaeff743da4be415579444732c2904e9d3b", + "sha256": "02bl3qgplfn45wqj5gi43cz54j0i3c2nd2yn1ay2wjmdscm6akb0" }, "stable": { "version": [ @@ -70262,26 +70831,26 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20200416, - 1048 + 20200502, + 1133 ], "deps": [ "cl-lib" ], - "commit": "9f8444603806e6baa94b2b67a23aab0ea52fef97", - "sha256": "143qj0llargjm375q39lchxz1ws4vsh50f3ar66cclrjvxrfaqdg" + "commit": "484bf3b0b8af461805b9e30d175510c031bcfbc3", + "sha256": "1shp3xfjifvwcj67mvfiv0dwpwyz846s6xa5zs269fwbvdvmx65q" }, "stable": { "version": [ 0, - 1, - 7 + 2, + 0 ], "deps": [ "cl-lib" ], - "commit": "9f8444603806e6baa94b2b67a23aab0ea52fef97", - "sha256": "143qj0llargjm375q39lchxz1ws4vsh50f3ar66cclrjvxrfaqdg" + "commit": "484bf3b0b8af461805b9e30d175510c031bcfbc3", + "sha256": "1shp3xfjifvwcj67mvfiv0dwpwyz846s6xa5zs269fwbvdvmx65q" } }, { @@ -70353,14 +70922,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200422, - 1615 + 20200507, + 2043 ], "deps": [ "htmlize" ], - "commit": "d41426854e6804d752b25346cf6ae79b0612784c", - "sha256": "0f3lvcgx60j2m97mxgzbxaw9ki37g3yxr6arv54b87572a7wdj8m" + "commit": "2d0540cbd659e6aaf1899f1e0b51f3850c83d5a6", + "sha256": "1slcg8mgdkn7cndmv5pkwqni0wm26jg3j0mds0rxf04w44ifvlql" } }, { @@ -70380,8 +70949,8 @@ "org-ql", "s" ], - "commit": "aef5975ac18d7cb101c0fb688333cc241782a8a0", - "sha256": "1m3p839wkrvf7n2467czj03rljv43bk32p7vlzdp5zby22bn7nag" + "commit": "8b056103d6f5320563e9fd794a008fd4e0719702", + "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17" }, "stable": { "version": [ @@ -70678,8 +71247,8 @@ }, { "ename": "org-pdftools", - "commit": "62cf59d93b7b6700c4f7711e5fd22ece04896e6a", - "sha256": "0fqkq8hpcxzpj3irczkad78m3chadqk2895bdbj7xpdlr0803n32", + "commit": "d52346a042a72b76729d259c7f12f45d38ac27cd", + "sha256": "1pgfx0zgdp9kg8mxqxm5qac7vnd0j1ghfwq04rvqi9r1d51zpynl", "fetcher": "github", "repo": "fuxialexander/org-pdftools", "unstable": { @@ -70696,37 +71265,6 @@ "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08" } }, - { - "ename": "org-pdfview", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah", - "fetcher": "github", - "repo": "markus1189/org-pdfview", - "unstable": { - "version": [ - 20180225, - 1006 - ], - "deps": [ - "org", - "pdf-tools" - ], - "commit": "8b71f313634b95a1fac42fc701934fd796565f3b", - "sha256": "1gd4ari970vb4631f9a4czvql8gafaqh7iir75n4wxqdcnglnymw" - }, - "stable": { - "version": [ - 0, - 4 - ], - "deps": [ - "org", - "pdf-tools" - ], - "commit": "3a96bfb57cb158ac02cfb4225512699c66f5221d", - "sha256": "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq" - } - }, { "ename": "org-picklink", "commit": "c6c44a3e5a1c5e4acdf76c4d6f2f4b695aa6938e", @@ -70976,8 +71514,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200407, - 1706 + 20200501, + 1131 ], "deps": [ "dash", @@ -70992,14 +71530,14 @@ "transient", "ts" ], - "commit": "f4d7399e677904cdc7e220440610704e4bd668bc", - "sha256": "0vfnxmk6k9f4zqbcg4gsg2ga4xr2gqx81sq2hcimx49wvyxh2bwn" + "commit": "c847afe0b538a1a44c73e40b067831cbea132ba7", + "sha256": "0x1dymh7brhfznr6xkgc2vib4p1s5aqxq9kfjlcvi8q0cfasg9b4" }, "stable": { "version": [ 0, 4, - 4 + 5 ], "deps": [ "dash", @@ -71012,8 +71550,8 @@ "s", "ts" ], - "commit": "4fef5b089f8f77b0dc25dac5f096406156e90858", - "sha256": "065wkxd269v19r5s8g2haapwhwr3s6c5amwzshfl2hq5z0bldvqi" + "commit": "5a031bf5c19d274934f80d616d6fde62a6db5786", + "sha256": "133x49kr7nf7jhi5r7ww5pydgq8wq3g31klirwgkc29698sd6n78" } }, { @@ -71224,8 +71762,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20200421, - 1354 + 20200509, + 1756 ], "deps": [ "dash", @@ -71239,8 +71777,8 @@ "pdf-tools", "s" ], - "commit": "1eb4ddda003b04b49a9a00828347a46f2863ac9e", - "sha256": "19vvcipfhir39qd3qwirrrr6221k8kjviifva0qm6aqxv7hlfaqm" + "commit": "4ce80644377f2369efb475bd58a57cf6950d8c41", + "sha256": "1j15agy19n0qc4a1750qpyz6wbkwlzasq0cnk16isyq60bszgxx4" }, "stable": { "version": [ @@ -71358,14 +71896,14 @@ }, { "ename": "org-roam", - "commit": "278f993cf094b39b5d049f05e0cbba61e52a6f0c", - "sha256": "1m4nw1r8kdxigdvws5arqglamrx4g62v4p482flikk7w52gcs7is", + "commit": "6358b4fe160432cee80e6c15eac26764a92aac8a", + "sha256": "16xab5rz98bavk3vjmb5bxl4r5kpynnw40m0ahy1kl6cax51kx0y", "fetcher": "github", - "repo": "jethrokuan/org-roam", + "repo": "org-roam/org-roam", "unstable": { "version": [ - 20200426, - 1107 + 20200510, + 2117 ], "deps": [ "dash", @@ -71375,8 +71913,8 @@ "org", "s" ], - "commit": "41423005010f2f78c3e9301b97f1b0db83fd29b5", - "sha256": "1w8xv4wiskibwla7ga5bcjqpvzgmcxm52zazqpjp210vp22v545z" + "commit": "ad5fca5440e5c8a6b8078013684df43b3e43d773", + "sha256": "118dhbxf71cmx345hpi0lq7ycb75qg7bdvyqqqdkhl4v9fl9nxyy" }, "stable": { "version": [ @@ -71398,14 +71936,14 @@ }, { "ename": "org-roam-bibtex", - "commit": "cc4e4ea60d2363eb691cb87ca3105bd25fc405ed", - "sha256": "1q9l49q478zlmcz0wi239qsz2pvmqxyb9qac2k42p19zqnfgkmsg", + "commit": "2931aad53fbe448c20ec1aec49ab64e4b50a8f43", + "sha256": "1s3v0r86x2azmhmvmkk3hc726lcx81igchqyjqry8aibmy79pfnn", "fetcher": "github", - "repo": "zaeph/org-roam-bibtex", + "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20200425, - 1114 + 20200510, + 1742 ], "deps": [ "bibtex-completion", @@ -71414,14 +71952,14 @@ "org-roam", "s" ], - "commit": "6bbdebb39d7edf9b369c16311afa18cf00cecffc", - "sha256": "0fp9cmgn9g4hnqsj9bn5885him0wxbs3qwvnw9anrwyybg6sv2i6" + "commit": "4f82a8de96ea1f31c24a3cc2acf3bf26e85269ff", + "sha256": "0pqamdc03l5zzdc7dcqwylhw45mzijfgd9070wv93qys9qs1b1ph" }, "stable": { "version": [ 0, - 1, - 0 + 2, + 3 ], "deps": [ "bibtex-completion", @@ -71430,8 +71968,8 @@ "org-roam", "s" ], - "commit": "9c224890ef9b8fb38b48d48d6f029be00f1c2166", - "sha256": "14f3d1yiidglwbygb5swk44fvky7cla3r11i4zx56hrf8lxjzhp6" + "commit": "02803c85cb312608172343c2d33bf9684d4bcefe", + "sha256": "0403ic5zc2sbrg3ryxk55n52ii4qzg1373h4j8bibfal2jv5i3ir" } }, { @@ -71460,8 +71998,8 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20200412, - 403 + 20200504, + 648 ], "deps": [ "dash", @@ -71471,8 +72009,8 @@ "s", "seq" ], - "commit": "8bec754c3007238d4e1c7296454815bf7000b31d", - "sha256": "10bfc8pr576ia16w5mwkksg9yn0jhcsbrkzw9yrjkvq2yzqsgpc0" + "commit": "fb4026df05b8e05c6aefd9483bec0e8f43d87d7e", + "sha256": "1qf0hpcscplpxd8xzf0yzkh87chbv3fgsfrr7bxh81g0akjiw03j" }, "stable": { "version": [ @@ -71553,8 +72091,8 @@ "repo": "alphapapa/org-sidebar", "unstable": { "version": [ - 20200313, - 1551 + 20200501, + 1215 ], "deps": [ "dash", @@ -71564,13 +72102,14 @@ "org-super-agenda", "s" ], - "commit": "d6ddec21fd6f356dc7b77c0a61a633606965a0bf", - "sha256": "137a462cl66jldsw877jgn0jph4zsv036mhvd9rpp6pw6jsw50sy" + "commit": "6dfa3a2312e8dacc942980e4ab10f1faea922a49", + "sha256": "0byr4h9dcgv667sn110011lkcnrr327qg7wv7f87hm1gyl613cgp" }, "stable": { "version": [ 0, - 3 + 3, + 1 ], "deps": [ "dash", @@ -71580,8 +72119,8 @@ "org-super-agenda", "s" ], - "commit": "41b914c7bdc5a12c9289b134822bdfea0889ac9e", - "sha256": "1mggpxbzprmmbkiv3xklw1saafsi153n4spr4l0m59lgm4gpymgj" + "commit": "4d8f6fce5ffce8c9b495742998d0ae64bdc5959d", + "sha256": "0i7dib49yfx48df371rqq16y0yxnc6n331wka532w10ava11g5s3" } }, { @@ -71608,6 +72147,40 @@ "sha256": "0qxk6gldgcc0fbraa0l85nk4rpvn5b5nbgzkh1p8d2bkjcxjcm4g" } }, + { + "ename": "org-special-block-extras", + "commit": "c6cb3b3bf575f125f892b10fc3518f3ad1663d03", + "sha256": "041l129iabm078p9bfdcwx5aax9fa3kbn852h1qbq8jgsks36jv8", + "fetcher": "github", + "repo": "alhassy/org-special-block-extras", + "unstable": { + "version": [ + 20200502, + 2057 + ], + "deps": [ + "dash", + "dash-functional", + "org", + "s" + ], + "commit": "38c3a0a2c2f9b99e0426334c7c6a9320cc6e39a5", + "sha256": "1rp9hyn9bshp4wjqgr8rpgjabyp86f3905ghpf5nnc4w4dfgq9vk" + }, + "stable": { + "version": [ + 1 + ], + "deps": [ + "dash", + "dash-functional", + "org", + "s" + ], + "commit": "d1054754d0701296bc0cde1fb022619b1f38dfde", + "sha256": "1fy1sgj3jg7l6fjl00dxb7npf7x8ldcbs81cs8w4b4ciklp30mzr" + } + }, { "ename": "org-sql", "commit": "012573a35a302e9bb6f127cf28ac04f93796400e", @@ -71698,11 +72271,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20200415, - 623 + 20200508, + 654 ], - "commit": "ce92384b364de6421ab67e6399ae56b8ea51df49", - "sha256": "09i23m9knhr8px1f71wx4csddmrzgy9k4s9a2mq4la1wmj1jy627" + "commit": "38a74456af863e07ab0b838c10830ce796886302", + "sha256": "1zmmv4izv5na0y29a55df1fa309xj25jdvhpwir879pfa15807bl" }, "stable": { "version": [ @@ -72177,16 +72750,16 @@ "repo": "mtekman/org-treescope.el", "unstable": { "version": [ - 20200324, - 1959 + 20200503, + 1609 ], "deps": [ "dash", "org", "org-ql" ], - "commit": "cad2aa82e5ca73bd7afc31b7a5e764da5ab716c3", - "sha256": "1jsc39xmli54mcqcdddzyaphmhlamwq167vfr2g133c3p0wx8swh" + "commit": "905029a9e2ce6ed325bb8e10f59dc589c181d148", + "sha256": "11xbm6161rd5kv2bffqw678a7bymclvhpmm1qjxsvmi8bhfk1ls0" } }, { @@ -72216,8 +72789,8 @@ "repo": "org-trello/org-trello", "unstable": { "version": [ - 20200130, - 1748 + 20200508, + 1705 ], "deps": [ "dash", @@ -72226,14 +72799,14 @@ "request-deferred", "s" ], - "commit": "cd7bf366d40bb4af4a1a9801446dc98f713eac8a", - "sha256": "08pgn3llbk0sz5v50jqa7mvdv6dw507kgkrkk0ciii1jalg4786a" + "commit": "56c519a00c6e3c8f6923cd0460342089d58c41c9", + "sha256": "09028167pi9pzgcb8fpvqgvzviq1fxvgby5lb99wvyy94vjxwnk2" }, "stable": { "version": [ 0, 8, - 1 + 2 ], "deps": [ "dash", @@ -72242,8 +72815,8 @@ "request-deferred", "s" ], - "commit": "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c", - "sha256": "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc" + "commit": "4ddc257fe24e97c01e12b247568581ff255f0e8d", + "sha256": "18y5zdjc7zh4jlwz6k1nl13i721rknqm0vp4mxfnmq0sc5a0qva0" } }, { @@ -72257,8 +72830,8 @@ 20191207, 2022 ], - "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", - "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" + "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3", + "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z" } }, { @@ -72382,11 +72955,11 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200416, - 813 + 20200501, + 1447 ], - "commit": "344d92ee5c117077317616e33d5945703059ac00", - "sha256": "1hzvv23bx4mscl3sw6nr8gggch8rdlyg33fhdv89xpgr700dx1nx" + "commit": "9f180f037d632906a3043c4e14fafc8e6ed007a8", + "sha256": "0yczj42hl29snbh6g6r0w3ldr3vjg3i7448j55k3crm8b61rmwwv" }, "stable": { "version": [ @@ -72518,8 +73091,8 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20170225, - 915 + 20200510, + 1951 ], "deps": [ "dash-functional", @@ -72527,22 +73100,23 @@ "kv", "s" ], - "commit": "52a19a5d372116262b9d613f4ec8490a3b49e329", - "sha256": "14ld8ip487282if2sil96lfg5wx7632kg71sxhafygphbdl9vxd4" + "commit": "cdec8aa327096c63e0342d36a707165e518b5d18", + "sha256": "0jji70c38cssnmgsd9pmkz2mwfs413baxzr13f2mf98z52j6izf5" }, "stable": { "version": [ 0, - 1, - 9 + 2, + 0 ], "deps": [ "dash-functional", "deferred", + "kv", "s" ], - "commit": "35e11ffa24b140d2e247df195489fca344bd0c08", - "sha256": "089nqbda5mg1ippqnsl5wcx9n1gpnaqhl6kz54n47kivb400bidh" + "commit": "24878ed965287d446af1289c33d50f639608d61b", + "sha256": "11f0nkyv3k6wra2753v6wa9jn38wrdkf0h0filliy40hqm7qqkfc" } }, { @@ -72597,11 +73171,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20200418, - 2058 + 20200510, + 1645 ], - "commit": "5218473fb500e58ccad3f73cfc4245f161869f89", - "sha256": "07l10mjgz0il5z7qpn2bw7621m5frgcmsb2pl9pyhfrjykvf8mih" + "commit": "2a88a70a5c2a57150c80d306f2475e351a59039c", + "sha256": "1y3g180q96vx7l8qs0l2jwjv2wbmk6aqzfm2p1h130h05lhgv31w" } }, { @@ -72782,11 +73356,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20200423, - 2123 + 20200511, + 618 ], - "commit": "b4d8ee2b8e0062eaa15eac6805374c02b776bb88", - "sha256": "1p187hfll4jz44g7xxdhnnm0qjcf4gdxbrywdqxpdqvqs74pa18l" + "commit": "5847b4af6205de31bfd29c5fb11c49e2fec63063", + "sha256": "088xqmk5fwdf12pvfarp9b69km605a52iqmb3042kn0ci5h0ibjk" } }, { @@ -72812,14 +73386,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20200423, - 2129 + 20200511, + 636 ], "deps": [ "cl-lib" ], - "commit": "9a197de6c3036fbdb6309cbfd35ec31a69b3ebe7", - "sha256": "0fhq36g5k4nib5ykb92j12l3fnqj09xh2jai92l8c5nslgm00slr" + "commit": "f88f8c09929b1780b8e4b3bbeb27c68389130209", + "sha256": "01z5vvcl3pmd3agcbi9bkc0g9ah1vi7qwlprss64vffh08l5cw8j" } }, { @@ -73147,11 +73721,11 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20200416, - 2211 + 20200429, + 2055 ], - "commit": "d431b13e3d47cf2564a04a096d2162ca38593050", - "sha256": "05szncxfm7595ah63k1z3zmivk2z1lv28jcwb1fylx0s93f51z0c" + "commit": "b616b0d90a7c3d7b87bd164f2d213a5e009c39eb", + "sha256": "1b2mjzym8x42rz3qvmr0va21naw3aycvc2blfxx91i7pwpp8n3qg" }, "stable": { "version": [ @@ -73375,14 +73949,14 @@ "repo": "anticomputer/ovpn-mode", "unstable": { "version": [ - 20191214, - 310 + 20200509, + 236 ], "deps": [ "cl-lib" ], - "commit": "8457f72de59929d6c176883e92d1a706163d3170", - "sha256": "0qcinx4gpfzngirwfis7byrdbgbwk3pak7f8mx5fsbcdnybkk8sj" + "commit": "3fb9b09506f06cfc7678a93b5401f49d2bf538bc", + "sha256": "099pa85v3jqrfk3frkj03xbxcli8gfimaz17dn3a8p6wjcrn3w6v" } }, { @@ -73393,11 +73967,11 @@ "repo": "fishyfriend/owcmd", "unstable": { "version": [ - 20200424, - 2314 + 20200427, + 633 ], - "commit": "af0f79c16f573f4dbaafe77a430d7621857e706b", - "sha256": "0mjg5563bka3cc6rysw7fhhh51w4fpysa9ni9v5iv89d8i7mz0yd" + "commit": "cdd2280f34328f65fe470046c928b0018914584a", + "sha256": "15601vbng2vn45zcdp51vkgycfpcfkaw0xidrq13rg5544x9h7lz" } }, { @@ -73593,14 +74167,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20200420, - 324 + 20200501, + 1317 ], "deps": [ "org" ], - "commit": "5106b430a139bb9e37beda177a082dfe36b407f5", - "sha256": "1x5hmvxy9dl88ix4ir1jshjavc99l8884if8c0v9gkjqb31ka9n7" + "commit": "8f36181977377383cb54803651d93b24e370122d", + "sha256": "1rxkbkgvylwnh5n6zc6hiqa9zhxwc8j1if7mxribw44xrg3150a1" }, "stable": { "version": [ @@ -73907,14 +74481,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20200327, - 1636 + 20200429, + 1533 ], "deps": [ "org" ], - "commit": "ea8b5021702d8f12aa5285fb2a8561ceaeb1332e", - "sha256": "1fppdz2r8zig6r1v1n82bxmxyn2f6i1rjv9qll4n866gahkknlkr" + "commit": "e8b2801ab2210187ab1cfacad09bb07e4b61ca56", + "sha256": "0xa34y0v6z78gpida59jc3gzng68n0has5dnkccv4vdxi4yb6ii9" } }, { @@ -74295,14 +74869,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20200313, - 2359 + 20200426, + 2253 ], "deps": [ "cl-lib" ], - "commit": "90e514432661f750f2a0c9fe17f09cdcc8e4e82b", - "sha256": "0p2vzsad8biczhj80y5bif5p0agcg8id4qngvi0lmxvx8i8wvky0" + "commit": "5fe5156491145c667286cb92be4191a348eaa31e", + "sha256": "1r9ir8jqfi2sqjjx9yxs4phxrpfw8x35nm58xfrqsjw158dspzai" }, "stable": { "version": [ @@ -74346,8 +74920,8 @@ "cl-lib", "let-alist" ], - "commit": "fb4662a755572c5add43869cdb6dcc577ca83a7f", - "sha256": "1flapr3aq38212m7w9ib56vqmaixz7ggmqd6hjhzphf6q1r5cv3l" + "commit": "495da67557d35acb146ec1f38f7576126aec6bfc", + "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq" }, "stable": { "version": [ @@ -74376,8 +74950,8 @@ "deps": [ "package-lint" ], - "commit": "fb4662a755572c5add43869cdb6dcc577ca83a7f", - "sha256": "1flapr3aq38212m7w9ib56vqmaixz7ggmqd6hjhzphf6q1r5cv3l" + "commit": "495da67557d35acb146ec1f38f7576126aec6bfc", + "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq" }, "stable": { "version": [ @@ -74787,11 +75361,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20190124, - 1828 + 20200510, + 5 ], - "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", - "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" + "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3", + "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z" } }, { @@ -75882,15 +76456,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20200214, - 536 + 20200427, + 2136 ], "deps": [ "let-alist", "tablist" ], - "commit": "0159cb1ab36f75879151e5ea24a6918ef58e50a3", - "sha256": "1ai8g6n3d40mcr2zx4h8ih3b1fxx6xzwbr0h3m8yh32vjj5qlwrp" + "commit": "d9712989fc4715443f674459199bdffa987054ac", + "sha256": "0lrh1c37vfgjafsp3j73rjqlz0mbginwbw25vak1l6vycb3s6122" }, "stable": { "version": [ @@ -76540,10 +77114,10 @@ "repo": "zk-phi/phi-search", "unstable": { "version": [ - 20191106, - 233 + 20200510, + 905 ], - "commit": "2a8fe73aa9ef014e27e202964c5a4f4e94ef24b2", + "commit": "f567f048b3892062c5528b42d4f6af4b313721a3", "sha256": "15yc5nlfx2z48n8p7pb6qzgbzfpnapb83w5xx6z8lq0mywf3k5jj" }, "stable": { @@ -76771,20 +77345,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20200415, - 1405 + 20200507, + 1755 ], - "commit": "4d0b4a04401a2b9f9ff834f6ed58bc7cc5b878c0", - "sha256": "0lgw1lghib0vv4byrhjimldxyqyav4qypprk9ppvwjbad1j0hfkn" + "commit": "a7687e454adc2e6c1e13d90beac122af32169eb8", + "sha256": "1nlikgyflksdzbd8k2l3f0nmv3gisj145fi45kw971ianihq476x" }, "stable": { "version": [ 1, - 22, - 2 + 23, + 0 ], - "commit": "433864b0755d99ec6b496ed45476c1e2eca0228c", - "sha256": "1r4bpyavlndd4c78cv5cc97bc0gkd4cggiyz4kd2vg6zlyc1nld3" + "commit": "08c6e0f6719fafa60cf76f741d83524fd84163d6", + "sha256": "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c" } }, { @@ -77494,14 +78068,14 @@ "repo": "abo-abo/plain-org-wiki", "unstable": { "version": [ - 20191013, - 1833 + 20200507, + 2135 ], "deps": [ "ivy" ], - "commit": "887717c184fb22dd219c78851303a8e5b917f877", - "sha256": "0wqxp46zvwswda644mnr92qxyyvakvl2l8w61sg6hy37pwfznx73" + "commit": "99cd7f90e5c741cf3327f464852203baee7c488c", + "sha256": "1s4ida511fi6mbrckn9kvssr4vmiy4w5qkkby7s1jlqvlydnsa8m" } }, { @@ -77781,11 +78355,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20200403, - 613 + 20200427, + 405 ], - "commit": "03dcd523295a0dec76356d23043428d850b03b70", - "sha256": "0g9bwd137z543pbdq4j74j0ql8j2657yxh4kb809jps9kxq8dc0k" + "commit": "59e682d77569b04e9fc80af9c4b05e4a997dbcec", + "sha256": "10v9j7sv5q9ywq8bdj2g1j262ggsy3hwqybn6rnrcim5v1f7a51r" } }, { @@ -78164,11 +78738,11 @@ "repo": "dgutov/point-stack", "unstable": { "version": [ - 20170808, - 1658 + 20200427, + 107 ], - "commit": "76e17311e3a810314c7d31ac46dc55450ff30fa2", - "sha256": "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z" + "commit": "cddcea2c91038710c245819b3cda2dd739726134", + "sha256": "1qjf13zmh0gf90knd73b6fyn3bhwjzn4k1w1xpa1ngnh6v233da9" } }, { @@ -78540,14 +79114,11 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20190523, - 1414 + 20200506, + 1041 ], - "deps": [ - "alert" - ], - "commit": "590e64d316d9210bd00cb4eb39d2f07ddc16809a", - "sha256": "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi" + "commit": "f93b09ee8e5420e728cb8be199ec06504d2df97e", + "sha256": "1b63w9fvgvmw8hr6s8ckhg62psd68rxgsii71kgis1j4v0s6l0sn" }, "stable": { "version": [ @@ -78629,26 +79200,26 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20180804, - 1521 + 20200510, + 200 ], "deps": [ "dash" ], - "commit": "ea98ba541b4a439accc126f17120c5425f741b67", - "sha256": "0pl7hpsc3az2zd80r77qgxajbvwcmq7b5dcyphv7bfvlimgby7i3" + "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf", + "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59" }, "stable": { "version": [ 0, 0, - 11 + 12 ], "deps": [ "dash" ], - "commit": "963abdcdb398b71fb13a4f7d2ffde23eb20e2a23", - "sha256": "1h0y6x4h7higwdq569h2lk0iddd23c3csqjk7y5phvc0lq812xs0" + "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf", + "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59" } }, { @@ -78712,8 +79283,8 @@ "deps": [ "cl-lib" ], - "commit": "80829dd46381754639fb764da11c67235fe63282", - "sha256": "05j7m6mqp6hr6225blsipnp2qcncwl09f52niya5334ibqzbvvlk" + "commit": "4839797cd1db25be6f3f98bc8d401b6c2af01f9f", + "sha256": "1sxzv4zdmyra6b6nicnng0zpixlpxnczhq0qjyfzxvvhks7jyyf3" }, "stable": { "version": [ @@ -79238,8 +79809,8 @@ 20200412, 1607 ], - "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", - "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" + "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", + "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" }, "stable": { "version": [ @@ -79837,14 +80408,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20200329, - 1908 + 20200507, + 650 ], "deps": [ "pkg-info" ], - "commit": "2aa3a663fc9a9a75c3bf73699e40ecc0c3567268", - "sha256": "1cw4bgj9iglcs71zrbx8rjk19dfvnws795qbm52hm7zs95lfprxn" + "commit": "768f0570cad57b6885c4472df803906d097cbc1a", + "sha256": "15855a99as5xmqdzckway0rvlg81wq6fhi5afr7hli62mrc8sgxa" }, "stable": { "version": [ @@ -80209,11 +80780,11 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200425, - 617 + 20200429, + 440 ], - "commit": "2a8e71420e8c9d2d4ce951d4342762aeedaae654", - "sha256": "1drz8qbcw5qjh5v0vkvflni14g58nmkmyn11ksjd49ck296mfsp7" + "commit": "ed9b073ee5b0975a35ee15bc12e25e02f796d787", + "sha256": "1mqqsnwkwfg2i6rhx747hcnk725siw6qsxh5yni3l1sfizbyvw03" }, "stable": { "version": [ @@ -80289,11 +80860,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20200416, - 1351 + 20200506, + 1948 ], - "commit": "e901c0bb73e0e66c95879bbb3738ac79e91ffeaa", - "sha256": "1j6dwcpplh98wf3mncidc8gn96pv58g71igim28gkqx21g8p2i40" + "commit": "ea62543527e6c0fcca8bbb70695e25c2f5d89614", + "sha256": "0jzyj3a3b9b26b2cksrcby39gj9jg77dzj3d4zzbwf33j1vkvfd2" }, "stable": { "version": [ @@ -80396,17 +80967,19 @@ 20170526, 1650 ], - "commit": "dddeed298bf84505f4d123a068f911025b351661", - "sha256": "10a70drfyanrjpx157aip402vd56ynm85ryzripd3w0symn9k1c3" + "commit": "bf3eef94c1fc5470407c4f69bb17cbed2c75b508", + "sha256": "1fi8hvxd2nfkqg6s5yz0npbhhclpsqmyfd6jd0d7ivqqglk5h93j" }, "stable": { "version": [ 3, - 11, - 4 + 12, + 0, + -1, + 1 ], - "commit": "d0bfd5221182da1a7cc280f3337b5e41a89539cf", - "sha256": "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw" + "commit": "ef7cc8111676076d8c2b6f9929096477cc868dc3", + "sha256": "0i06nk5v3nl0xgmi6pxyqgcps8h16a6mcdg2bnjnrrmz6cnq97j2" } }, { @@ -80520,15 +81093,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20190808, - 1626 + 20200509, + 803 ], "deps": [ "async", "cl-lib" ], - "commit": "3e97267c92b164584e06a6c70ee7491714c7c12c", - "sha256": "15frl618393bc891d0yi3mdxzvbq790a86vfvp3dyd5riz4ddg95" + "commit": "ddeccf7808cf39fedc41cd33204b0ef5fe4253b5", + "sha256": "083srsvnv8ks52qsi6hv02v4j4xlm67bld9ynm8cl8fy500ghpzz" }, "stable": { "version": [ @@ -80608,8 +81181,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20200426, - 1239 + 20200502, + 2153 ], "deps": [ "deferred", @@ -80617,14 +81190,13 @@ "s", "unidecode" ], - "commit": "e619042f3c0383c7d4e1762fb46ff680e90906d6", - "sha256": "1igvmwxfpa19aws7h066hk9axwgl3swp8lmn218c1hmq2j2jkwgz" + "commit": "d781870e2f57e40110e07768289ab81d8554f122", + "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc" }, "stable": { "version": [ 0, - 4, - 3 + 5 ], "deps": [ "deferred", @@ -80632,8 +81204,8 @@ "s", "unidecode" ], - "commit": "e619042f3c0383c7d4e1762fb46ff680e90906d6", - "sha256": "1igvmwxfpa19aws7h066hk9axwgl3swp8lmn218c1hmq2j2jkwgz" + "commit": "d781870e2f57e40110e07768289ab81d8554f122", + "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc" } }, { @@ -80737,17 +81309,17 @@ }, { "ename": "punpun-theme", - "commit": "77a9edbb36dc9474adb23d356e6c596789aab2a2", - "sha256": "1l7nphh8v7w5w790cwmnp6nw5rciwhgzkvynkrvpiv9chhacx0xg", - "fetcher": "github", - "repo": "wasamasa/punpun-theme", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "10mgyrxz2habhaqyg1g4c5kn13q425j0xpkkdlg10cdfvxfl9d1s", + "fetcher": "git", + "url": "https://depp.brause.cc/punpun-theme.git", "unstable": { "version": [ - 20190928, - 1413 + 20200506, + 1241 ], - "commit": "2f78125609277b2478abdebd8f9d5ee10a823b65", - "sha256": "1sgxrj3igzq86h3whfymxf4qzv9kpvcrlhbvjmnp7fwrplys0n7d" + "commit": "c1fa9f403b100aceac4c2dcb053111b2de701f16", + "sha256": "0y52kgqrnzrsybm2cwdrarjm1y92hambcr4a8nky28bkp5v73a86" } }, { @@ -80758,14 +81330,14 @@ "repo": "voxpupuli/puppet-mode", "unstable": { "version": [ - 20200419, - 1236 + 20200505, + 344 ], "deps": [ "pkg-info" ], - "commit": "0197b405c79a5d0718979f31df760bb3bfca38de", - "sha256": "0k1r0r1cvk6z3lj5shgd8ly78sfl8bbkmld6x5cvw481ynyb7rgy" + "commit": "0e2e32a3b1644edd8010bd3d44e83def683348b3", + "sha256": "082r71wn5klihv8npc8qsvsyw4jyib5mqpnqr029kv7cvlcyfghk" }, "stable": { "version": [ @@ -81219,8 +81791,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20200426, - 505 + 20200510, + 704 ], "deps": [ "async", @@ -81228,8 +81800,8 @@ "pyim-basedict", "xr" ], - "commit": "b934273bb33d6be6aea6e20e68930bc5aaf4a48a", - "sha256": "01ykgpzkv06gxiaqj4z1qwf00pwdfm0zxzbsy4xr8ciyhhxbc9pj" + "commit": "e54153f462dd8cd8e9bb379e0483a2849ec94f42", + "sha256": "0zsw25q1nqkqc3vgi95064v9wph1ynhiqi8gvc3fqq3k8i2jgy4v" }, "stable": { "version": [ @@ -81372,11 +81944,11 @@ "repo": "PyCQA/pylint", "unstable": { "version": [ - 20170402, - 1255 + 20200503, + 1624 ], - "commit": "be5a61b13e48a129613e0c659bfd28bf9824f53c", - "sha256": "124pf14z2yc56bvn0vvg0irzl39q3bbng4zp75qjzgb7d387n4hb" + "commit": "f00144fb8faa81e1ce42516c2f58eb9fc797f7bd", + "sha256": "1hmrg1si9lf1xknfl4j4p2dg6iskaripy8k2askc8g0jjgmscq9f" } }, { @@ -81471,20 +82043,20 @@ "repo": "poppyschmo/pytest-pdb-break", "unstable": { "version": [ - 20200316, - 301 + 20200426, + 2335 ], - "commit": "007427af712df9fa2c54869388d74e97f91b2bd7", - "sha256": "14l14605lgq498j37916p4gjwkqjb8z4ky85wlk3pgyx6bp20ckz" + "commit": "22e54796b0522f812423b2fb0ec842e2984ff0f7", + "sha256": "0gsnbpk14iw4mqxk7c0409dibsb6f3j936hd781ly956mvn0afil" }, "stable": { "version": [ 0, 0, - 8 + 9 ], - "commit": "007427af712df9fa2c54869388d74e97f91b2bd7", - "sha256": "14l14605lgq498j37916p4gjwkqjb8z4ky85wlk3pgyx6bp20ckz" + "commit": "3ff296d14e7350241b22fcbe09325a16bb834d16", + "sha256": "0pipbp6i0vq3maiwf8cj8g43zk8nq3dpgbgacdk9v2bhcgwl3im3" } }, { @@ -81617,11 +82189,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20200417, - 648 + 20200508, + 1756 ], - "commit": "9c336295c830f684dbf043fbbde432c54a2b4678", - "sha256": "0h02d02wv5hkz3lnjr9zxr8dwd4b1v2r6wf808g0x6xqnm01wspm" + "commit": "a4ee6e9f60ff63f0706661e54308281ed7c900e3", + "sha256": "02gfr692xr3clrim5l6bqzn1kzcv232ylvd5k33421s21wb9vhzv" }, "stable": { "version": [ @@ -82077,11 +82649,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20200315, - 1029 + 20200427, + 337 ], - "commit": "50e07e769848b1e1780054fab2e221adc474777b", - "sha256": "15jj9w0z3yfxaikxi8qaxhr8ipi1jc85zckbri2gdbbdy928ypiq" + "commit": "2e37ce9e4b13359344dbd67fbfd7e39d46b2c6b6", + "sha256": "0w9y8b76ias2dgzjsggd7z1mhv9dsaxrf20f95rq8zanfw2vr0pq" }, "stable": { "version": [ @@ -82239,15 +82811,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200420, - 1412 + 20200509, + 1405 ], "deps": [ "faceup", "pos-tip" ], - "commit": "2827e95c5a2605cc25a549b260763922ecd68983", - "sha256": "0f6k9nlg8kz739pla0hkyp010cgdw9jd0qcii1d6dd1w3a84xk3v" + "commit": "204845665cc4ec13edc59106b102fa251458e737", + "sha256": "0n376a48yjsd1ic8l31sg76aww3j1p5lriakljklzhf5s010vkss" } }, { @@ -82418,14 +82990,14 @@ "repo": "Raku/raku-mode", "unstable": { "version": [ - 20200426, - 1156 + 20200510, + 2005 ], "deps": [ "pkg-info" ], - "commit": "e4d8b0230a503f315087443e24708a78ad8665d9", - "sha256": "1864kwd5ixghsr219jlqmgg5gpv802q8xfsk8i8yi5dcy1jn1ckr" + "commit": "43fd5628254754bee41575a55a7d1c7ad79837fa", + "sha256": "1c1l0c4pnza3bf0s1262z5r8xmbmhq3qdvgqq28k8raawdqszqfk" } }, { @@ -82865,11 +83437,11 @@ "repo": "ChillarAnand/real-auto-save", "unstable": { "version": [ - 20200418, - 405 + 20200505, + 1537 ], - "commit": "d55c63106f6000c065f9c256fc4491ea07b2745e", - "sha256": "0b4drlzc384rp43m5454g86d866hx1lj4qdi3mlaz835nl8m86ki" + "commit": "8e51241e5ba7b07b91d8188c14cf193017640292", + "sha256": "0yn0ibbda8bjqjhiqhmbvv7p8c52n65mi95v91nkfcj60hwyglnq" }, "stable": { "version": [ @@ -83449,8 +84021,8 @@ "cl-lib", "json" ], - "commit": "770ffb34b04bfa0ea8484fa1506e96c530168e13", - "sha256": "0cqln3d8yp9fdam984bwnngjl0hjnwi7yhcggdkjwribhr79cxhl" + "commit": "0062f326106ce8be3c9b7d3fa0e88ed2c7bbfa5e", + "sha256": "1y35p2q3xrvn37kligfmkjagkz4b7pl61y2c2g504kjs45v4mqd2" }, "stable": { "version": [ @@ -83554,8 +84126,8 @@ "repo": "Wilfred/refine", "unstable": { "version": [ - 20180315, - 2228 + 20200507, + 731 ], "deps": [ "dash", @@ -83563,8 +84135,8 @@ "loop", "s" ], - "commit": "0a99439a0b4ed6f79b9a240ea1270140a9e328bc", - "sha256": "1scw449mbmr70kb0r2ymhph9j0s5ym77ijp5fpwph9bri46cad3g" + "commit": "d72fa50910b86217a35bb1b7e56adea206052021", + "sha256": "02cb30ycwyqhdw54s3abb4xsdyqlpi6i8xi7rkl85avvgy2gif8y" }, "stable": { "version": [ @@ -84286,11 +84858,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20191009, - 1208 + 20200502, + 831 ], - "commit": "e8ca809ace13549a1ddffb4e4aaa5d5fce750f3d", - "sha256": "1wdi3c9wczn6vhr5l9mrbhsnw0hj1zfxh3sz53q8v1k684q5jyjk" + "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca", + "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh" } }, { @@ -84308,8 +84880,8 @@ "helm", "restclient" ], - "commit": "e8ca809ace13549a1ddffb4e4aaa5d5fce750f3d", - "sha256": "1wdi3c9wczn6vhr5l9mrbhsnw0hj1zfxh3sz53q8v1k684q5jyjk" + "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca", + "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh" } }, { @@ -84406,8 +84978,8 @@ 20200324, 1113 ], - "commit": "a2a75a929fc022e752759ed2a38accc639128dbe", - "sha256": "0s6jmxq9sqi6pm2kdrdik30nyz136kk2gqzdibb0wcvpfylhwawn" + "commit": "c42a7a585c7b85bc402f63535ae6261f68c6aa57", + "sha256": "1lx23y4dzf5ln4ahf5dnnvx3blvjf3s65n3hgfv0qi5hgi8i8f59" } }, { @@ -84501,16 +85073,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20200307, - 1623 + 20200507, + 1417 ], "deps": [ "s", "transient", "wgrep" ], - "commit": "e19c06f4c556bda6457da3d50c14b12cb97679d9", - "sha256": "0k9rz6as3867b23979lrmb0sn26rbl08n6n71pxqxr8s85nljlml" + "commit": "4774ab1517f59fce998831671ef571a7b7ccd526", + "sha256": "1nyji041p0jxhzkz88p4x13l04sprw5736f7s45w8768iw9fqivf" }, "stable": { "version": [ @@ -84660,8 +85232,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20200415, - 1454 + 20200502, + 349 ], "deps": [ "cl-lib", @@ -84669,8 +85241,8 @@ "popup", "posframe" ], - "commit": "9afeb4aa45771ef20c83d1208744d954273cbaf3", - "sha256": "00lnsxi2j1kvd28vq10ixj16qfkn22bw2m02zrs022d9jwcsza5r" + "commit": "daf956df30d4007f70a4495560d656e517ab69a9", + "sha256": "0wr1ski9j7m7mwizdgxnnj61z1nqpyjp6gc7dniaac0m6svxf1rf" } }, { @@ -85100,11 +85672,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20200221, - 36 + 20200507, + 1824 ], - "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", - "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -85129,8 +85701,8 @@ "deps": [ "rtags" ], - "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", - "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" + "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", + "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" }, "stable": { "version": [ @@ -85601,11 +86173,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200414, - 2105 + 20200509, + 954 ], - "commit": "a364b24af412659cc1074f533752356d1858b893", - "sha256": "1yj3b5li2flgxc3frmb7zjc92nhdq526jj6105zrsnj7ndxqycp4" + "commit": "eca55c068eb90aa5e1f36c6b31de589ce1df2ff1", + "sha256": "00vb53jzhnmwkw9bzcadyicplvp3x1jdcf4d0jnvfkhl4ln5d9j0" }, "stable": { "version": [ @@ -85648,8 +86220,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200304, - 2028 + 20200502, + 1247 ], "deps": [ "dash", @@ -85663,8 +86235,8 @@ "spinner", "xterm-color" ], - "commit": "61032eacf0b3b7579f627ce78bca2eddbfa31a10", - "sha256": "0mxrmgdhgjlixff1fm7fyn87yn3cakhyjk8vdhdr37k0qh339k0c" + "commit": "cb2bfde237fd941f8c512e4d4f59ab5be53a5382", + "sha256": "1hv9py1jqn2pphcpdw1j4i1q4idm2mwz3gkyvimjm9w858sn5var" } }, { @@ -86108,8 +86680,8 @@ 20190413, 1246 ], - "commit": "f13d03efece7c1f31e9c3fe2e99b71a33cc43e1c", - "sha256": "04b63yww5yz4jn18mzpv53yzs6g6kmxs61m2ycnf59cb6ax2ajbd" + "commit": "648206e2ea609e8f38599cd540368d54ff52ae8a", + "sha256": "0vsabvci7y5l1lbqmn0fw301wfnwbb7fw7vffm1gd0w7rjjhxw73" } }, { @@ -86419,14 +86991,14 @@ "repo": "zk-phi/scratch-pop", "unstable": { "version": [ - 20170510, - 1458 + 20200504, + 2004 ], "deps": [ "popwin" ], - "commit": "7f4172c792b10bd38898dd8963cf0ade91921869", - "sha256": "0mwjq7z0cpaqhqygzhfcpfqyx8376jsc1g2874np6ff49389bj4d" + "commit": "1a36cb5ab6668aa57b1b7192521a472feeec1ea2", + "sha256": "1hdbwzd52qhn2jc8ghkp0lwr2hzrs4zfnwj6vniffxd5xz3c21ck" } }, { @@ -86826,11 +87398,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20200425, - 1449 + 20200510, + 1557 ], - "commit": "dc1c8e8704f5eb73c540f2b4ca3eed213d2c3246", - "sha256": "0acifs68m6y5zfwadvvvlg7s4zhgazmrg6al7piy1nycq7dmng6b" + "commit": "fec02b6e0c10dc865e22be8f46649f7078d2b137", + "sha256": "1mk60xp66xrrkarz48cm4cjr0vzrgsqi1s04cfg1zrqchh8408v2" }, "stable": { "version": [ @@ -86856,8 +87428,8 @@ "prescient", "selectrum" ], - "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", - "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" + "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", + "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" }, "stable": { "version": [ @@ -86914,14 +87486,14 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20200413, - 839 + 20200429, + 641 ], "deps": [ "flim" ], - "commit": "1d6e21e9ee42c2c5bf1a4422d2fe7af20aa7ff1e", - "sha256": "0pkqh95i6pj7iwghapa8hld78h1q5n50f1lah2l1k2hz4lm6r8zz" + "commit": "57a948c5f07e57e78ab3c0e6fd76ffcd591bb4ac", + "sha256": "0y73l0zf2lg7kxz7kpbirpipzq007bdrgmlqfrv8najh4q03gf8g" } }, { @@ -87324,20 +87896,20 @@ }, { "ename": "shackle", - "commit": "806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21", - "sha256": "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6", - "fetcher": "github", - "repo": "wasamasa/shackle", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "0fjkp5vawxc1q1pmvzchiqwxq8rdaq463sa5ks0r7x7cxwnp8zx6", + "fetcher": "git", + "url": "https://depp.brause.cc/shackle.git", "unstable": { "version": [ - 20191020, - 1249 + 20200506, + 1231 ], "deps": [ "cl-lib" ], - "commit": "7ccbe513852a1d1700b698547efca14b8940319d", - "sha256": "0agsp8ia4irr540r898ifhjqp28n1zsq1pilv1kc272spn3qhvp9" + "commit": "4b81514191dd182a28a3e5b2fe3069264b6835fe", + "sha256": "0k3waffnd08x1vb7mj6ix21zcadn9ipx4fis26iy3dsj35cbd3fb" }, "stable": { "version": [ @@ -87944,6 +88516,35 @@ "sha256": "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba" } }, + { + "ename": "shrface", + "commit": "6a8dfd3ebe0cf52e1c02d2487891876963a4fda2", + "sha256": "00v6ll2jiadmmfq59w6nk7lkq9ka3kcqf6mw1r8wiw84qb2sz56c", + "fetcher": "github", + "repo": "chenyanming/shrface", + "unstable": { + "version": [ + 20200508, + 1711 + ], + "deps": [ + "org" + ], + "commit": "a146e7d25713c33999deff24338670a5d1308c6a", + "sha256": "17pm5ljn004wdsl2hryjla5my8a63mx3bpapkqfyvrkwswwzs3fw" + }, + "stable": { + "version": [ + 2, + 6 + ], + "deps": [ + "org" + ], + "commit": "c82447df5b7fb87fa17e53919dc2da81c7dddec6", + "sha256": "1nncamyrn5c88lq973w1a28qg15gsdad51ifl1mhqprzkpw7jsjq" + } + }, { "ename": "shrink-path", "commit": "86b0d105e8a57d5f0bcde779441dc80b85e170ea", @@ -88312,11 +88913,11 @@ "repo": "gexplorer/simple-modeline", "unstable": { "version": [ - 20200419, - 900 + 20200427, + 717 ], - "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51", - "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m" + "commit": "08197f4c37aa28c8305f0b0316619421e42a8b75", + "sha256": "1wqqaknii7nkvm8nfjr2wzwjwr4w60a2x044y1kgk6zfkfb106lh" }, "stable": { "version": [ @@ -88957,8 +89558,8 @@ }, { "ename": "sly", - "commit": "974d8812a4c5e45221ce3c32ae72c15ed29665c3", - "sha256": "000g5qpy45zqrh3g4mk70mh2lakadfq18djrq7cabagw1qmhqy41", + "commit": "4a916e44049cf8c5616c7394389ef91e2a2b3e21", + "sha256": "1pylaiy016yiyvd27m38wymw1k3bq7sfsd2d23idrgybc8miqqp6", "fetcher": "github", "repo": "joaotavora/sly", "unstable": { @@ -89139,11 +89740,11 @@ "repo": "zenitani/elisp", "unstable": { "version": [ - 20200322, - 24 + 20200508, + 249 ], - "commit": "e2a390b9b8518ad62283046400a0fb3e81eb5b79", - "sha256": "1s23r0dr10wjnk0j5gicy1dxvbhvnz3zmbssk431vccbba1jm8yg" + "commit": "f808ac53870d32c57a3cd01dd2850ee62d3af98a", + "sha256": "0dy3idfbvlrrim3rkv7lrr12gg2s4wlml6wcwgv1mazq3kdvjvvl" } }, { @@ -89232,14 +89833,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20200423, - 1529 + 20200428, + 1031 ], "deps": [ "names" ], - "commit": "048a6c729f5336fe800e97f995a387e11d386980", - "sha256": "19s8q8fb2kmmfllg50622hzp3jb19h9z9ik45k4v7aapdc7iw5yg" + "commit": "6d6db53db20712570cb99cd6a03f2be0349d87b8", + "sha256": "1h8vcdzgbg80c51cl3x6ic2d8q2sjlk5dp9j4wvmzqg6qdf34a6b" } }, { @@ -90273,11 +90874,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20200424, - 1530 + 20200505, + 851 ], - "commit": "fcc14cc99f0d26abf91af682b5fdedf5a8a37003", - "sha256": "0mrh147q9zzs9nkc714iyly5aydx3svma0ix8sgrk7rqacfd56hv" + "commit": "0f73c5a87b874e72ed286cf43e0b8dfec73769c3", + "sha256": "0pmsgvmf1ilv2jpay1mwb49rjc1y3h1hhc2kg3rzjpg10p3mak1n" }, "stable": { "version": [ @@ -90312,14 +90913,14 @@ "repo": "rudolfolah/emacs-sos", "unstable": { "version": [ - 20141215, - 403 + 20200510, + 1734 ], "deps": [ "org" ], - "commit": "1573adca912b88b5010d99a25c83a5b2313bd39c", - "sha256": "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p" + "commit": "6c25beae9f6db8fc7a037112ad5d4be9f5f36986", + "sha256": "1ia90sanqbigpag63w953kvfd1gyaakcvh65fsd79pcx4k38p4ly" }, "stable": { "version": [ @@ -90563,11 +91164,11 @@ "repo": "p3r7/space-theming", "unstable": { "version": [ - 20200415, - 810 + 20200502, + 1032 ], - "commit": "0a41a892180451d51095516e8ee2c9042be009c1", - "sha256": "02d07fs72fqg12lm7wxlmds1xyqf92ay0h9ghpkavwn6mphslpvc" + "commit": "31dca6954df643255175f7df68a86892aa3c71a7", + "sha256": "1bc6bsilsv1p3i39n14vnsrk9bz738n7fw16jv72qv74xkvqkyr0" } }, { @@ -90756,14 +91357,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20180320, - 1802 + 20200429, + 1719 ], "deps": [ "cl-lib" ], - "commit": "a00bb622c54086ac1ee96c265bf7fbef12c68089", - "sha256": "0f919alnqbp5dnc4krgmnc9acqg84xs64fmzjc78gpbmfn0kyi0m" + "commit": "62f198256453265af48bef3a0207e80143fbff1e", + "sha256": "0a49678yaq2vc04w4xp0i9lpb7bdf1fwhjkg0xnzssvnjcnk368k" }, "stable": { "version": [ @@ -91452,14 +92053,14 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200422, - 1730 + 20200504, + 2101 ], "deps": [ "cl-lib" ], - "commit": "d55b4047fcfd3528fa9487d206773f45c7c2d038", - "sha256": "0c83wachsrrz0mnsb2lci6mr62ma40w05lxz7y8vrfyqppkcfa6a" + "commit": "778bacc31773749dd76878e070051d49b7e6c450", + "sha256": "1sasnm0s3i1pj7r6bssgznfxiwlvvjgc0ijyk7xkv4n4588zcbcy" }, "stable": { "version": [ @@ -91572,11 +92173,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20191221, - 1051 + 20200503, + 2042 ], - "commit": "e9f009c064f63ca488c89c30ab0d3857a0155f86", - "sha256": "1f6bj718jkdsbj38f75kwvg54kk4fisv7s9dcgh3gjf0n7xalkgc" + "commit": "8fda737131fef2e55c4965a938cf907acbf03372", + "sha256": "1cjcav28a6bw8h8axx5ms2cacdqcjv6imb4pj4r4zx08jd4nljdk" } }, { @@ -91851,8 +92452,8 @@ 20171130, 1559 ], - "commit": "209d2233843778ebee12d103c41b226fa27ff266", - "sha256": "19rm3zznj0j8q5gsqpk6hy5l3gii4pmp5s2npl1zsiy6bb7p59c4" + "commit": "d185495d1ef2f8f1e343dc5a0d37e1fdbfd143a2", + "sha256": "0g39jyzrq451mh0k1ahs2svpddm5611lvj4gxcaz9iq02ich0jhc" }, "stable": { "version": [ @@ -92853,14 +93454,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200319, - 1334 + 20200503, + 1102 ], "deps": [ "ivy" ], - "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", - "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" + "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", + "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" }, "stable": { "version": [ @@ -92939,11 +93540,11 @@ "repo": "dimitri/switch-window", "unstable": { "version": [ - 20181104, - 340 + 20200502, + 511 ], - "commit": "204f9fc1a39868a2d16ab9370a142c8c9c7a0943", - "sha256": "0rci96asgamr6qp6nkyr5vwrnslswjxcjd96yccy4aivh0g66yfg" + "commit": "8710f6304d843365fb59b6efe7e1f729d14e557c", + "sha256": "1v8qx519dwhpwg9ba08nl3kp329n3p1dbjj7iiiwmn22580nrkqh" }, "stable": { "version": [ @@ -93055,26 +93656,26 @@ "repo": "contrapunctus/sxiv.el", "unstable": { "version": [ - 20200326, - 1433 + 20200508, + 1620 ], "deps": [ "dash" ], - "commit": "dae46e6f5890f3d97d45eaadf0194b7ff01f6baf", - "sha256": "094kvg0cznddzn5q1clgj9r26h3ygab96rpbr00qn2wnmdb79bhq" + "commit": "f1a030c538af6d47d32eef04ab6536eeef948268", + "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "dash" ], - "commit": "dae46e6f5890f3d97d45eaadf0194b7ff01f6baf", - "sha256": "094kvg0cznddzn5q1clgj9r26h3ygab96rpbr00qn2wnmdb79bhq" + "commit": "f1a030c538af6d47d32eef04ab6536eeef948268", + "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz" } }, { @@ -93425,11 +94026,11 @@ "repo": "jabranham/system-packages", "unstable": { "version": [ - 20200310, - 1510 + 20200426, + 1714 ], - "commit": "449dcdf4fe22874c9d91ee8d929ebb8a41b1bac6", - "sha256": "105s1kr8xapp93za9z9kq7s0rqccqissavacjfg6cvfx6gqrr8gy" + "commit": "92c58d98bc7282df9fd6f24436a105f5f518cde9", + "sha256": "01hj46zgs7a1as0r0x451ag2fb40pp3gyzycvj0gm328grn6vpmk" }, "stable": { "version": [ @@ -93627,11 +94228,11 @@ "repo": "politza/tablist", "unstable": { "version": [ - 20200227, - 1918 + 20200427, + 2205 ], - "commit": "10a573dc0e66981110507ee8b8b6408be48ce891", - "sha256": "0yzzkn6k8jjjkq5awiyi0li6j4bhynv8ayqa7sp1cqbgg4hd8rd4" + "commit": "faab7a035ef2258cc4ea2182f67e3aedab7e2af9", + "sha256": "1nqp7v5jd6zibpnx0w720xj2if71z1sgly9mmlnbcryg15p7c4gz" }, "stable": { "version": [ @@ -94857,8 +95458,8 @@ "deps": [ "cl-lib" ], - "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b", - "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g" + "commit": "eece1cef4483c02402f845d6158b35f6578447c3", + "sha256": "17slczwsd0av87fq44q9y1w6nvzvjfr2qn1majz5nqxfn55i6x9x" }, "stable": { "version": [ @@ -94994,18 +95595,18 @@ 20200212, 1903 ], - "commit": "598704d0259d992af190a4388140b8aec07f40ef", - "sha256": "168sl4jbcyqms1cvg8x91kclim27v9zbfrw3cn2fmwmd2g29c31j" + "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", + "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" }, "stable": { "version": [ 2020, + 5, 4, - 20, 0 ], - "commit": "23496d2d53ecc70a2353c1a84699ac579e21e0a1", - "sha256": "0yvpnyzklsjppfhd9spgrf9gh3f36zvs3rz7fyc7bl3n68s3z7wq" + "commit": "0580a039d7fe51d1c8f160985057e770c2cc7ae1", + "sha256": "1a4gdmcwn7msr2j98y4drlal2sk3fbs5jsy56b3j2njdyp7b5b98" } }, { @@ -95061,8 +95662,8 @@ "deps": [ "haskell-mode" ], - "commit": "3735a13c9bbe4fbb788d9dbc363701081253bafa", - "sha256": "0nm02pzhvg6lb3j4m8g4jfgkirv8pb6881bk2r74hijxvjamma0b" + "commit": "4a63723555fbbd427dba0606e6ba9e48afbc93da", + "sha256": "1hmdrx0wnv15gks432xa0ic971m39kj3fbhvjx14k1xh3zp010zp" }, "stable": { "version": [ @@ -95085,8 +95686,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20200327, - 1218 + 20200504, + 832 ], "deps": [ "cl-lib", @@ -95095,8 +95696,8 @@ "s", "typescript-mode" ], - "commit": "3b45610faaab33bc53ae2d44e1e573f19f35a74a", - "sha256": "1507xp8ndhyqvzd5j2qx3y4lpxq52j40srh5mp9784bf1hm9gg2s" + "commit": "8a7c1fc5dcc9b3321c10c71f21d1436b0a62ac07", + "sha256": "14i618dbhi66z19szyjznfnb56k9w64m00732g20r8izbhjsg4nm" }, "stable": { "version": [ @@ -95541,8 +96142,8 @@ "deps": [ "cl-lib" ], - "commit": "052881b101d8c2d11c89ae4f1befe7a999de987e", - "sha256": "0k9sjjsqxnrh0cq6m3cd9rk44n0rjbjgqcbfv6fg33a0gpybvryf" + "commit": "b3b85a1a4589430e9255a4ea28c4e94787c6b0fe", + "sha256": "148m78rlymxx5sr17xbvi5v864ki66jkg2hkszhyk9za4f0mgdx0" } }, { @@ -95975,11 +96576,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20200226, - 1612 + 20200508, + 1911 ], - "commit": "afa0c2f98453b9ffd9d8160831debc7e36cdb87b", - "sha256": "0jkyrwxmfarbjqidvgxh0x4al9xh1wyd6r1rwvkbwxscz5111h3z" + "commit": "d49f85a8c1172b9f21d2fd4a54d1f802b53948fc", + "sha256": "01rnd67mc9avm4d39vqr074shfmqjsilynivb3s32dqyk13fsz8r" }, "stable": { "version": [ @@ -95999,14 +96600,14 @@ "repo": "conao3/transient-dwim.el", "unstable": { "version": [ - 20200411, - 2015 + 20200508, + 617 ], "deps": [ "transient" ], - "commit": "00d111e41e433736422e388e593b5c0df7d21bf9", - "sha256": "1gx3v5axvwah1yb0wba2l60dy72lcw7jw86cfjlg3m9a8xd090v7" + "commit": "e075bda369bbd0df2ac5e5d5626664f4a0062676", + "sha256": "052pj4b4jgr9vk0nrap57kpy0fsplssc7b9w7lkdmpxrbdld7n6h" } }, { @@ -96017,14 +96618,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20200321, - 216 + 20200506, + 2144 ], "deps": [ "let-alist" ], - "commit": "05a80e7a90303cd80f67681df2ec8e1bac88c394", - "sha256": "02chl6k9r0mki7iy5rs9xwgd74ypf0c79q9d3p7fw1rc1wqxk9ji" + "commit": "b2c35b6f4c503976581573a4512c50e8081f9038", + "sha256": "1b0d2xq22121f64hls28gb44m284g1b6xiw3mi7x6g1fil8b3wb2" }, "stable": { "version": [ @@ -96086,20 +96687,20 @@ "repo": "shingo256/trashed", "unstable": { "version": [ - 20191124, - 1351 + 20200508, + 734 ], - "commit": "cc0243c9a4f01dc889f5c5ced3e311f918fe0750", - "sha256": "0nyipnrjwbmh4mvfv1nwz6ypg8c1j0g9y9kc4cym49q9vy3wy56c" + "commit": "075749debcaf867bf151d83a59d7845dea71a4b9", + "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci" }, "stable": { "version": [ + 2, 1, - 9, - 0 + 1 ], - "commit": "f3e970c139e44fc7d36ad781566fd6b288d691a9", - "sha256": "13grdi12iwlw4fiphdfmvclfpbr6ajlgfbfyi7v41z8k3rxz4ypz" + "commit": "075749debcaf867bf151d83a59d7845dea71a4b9", + "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci" } }, { @@ -96197,8 +96798,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200426, - 1031 + 20200506, + 1600 ], "deps": [ "ace-window", @@ -96210,8 +96811,8 @@ "pfuture", "s" ], - "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", - "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" + "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", + "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" }, "stable": { "version": [ @@ -96247,8 +96848,8 @@ "evil", "treemacs" ], - "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", - "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" + "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", + "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" }, "stable": { "version": [ @@ -96271,15 +96872,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200421, - 1426 + 20200510, + 2001 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", - "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" + "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", + "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" }, "stable": { "version": [ @@ -96310,8 +96911,8 @@ "pfuture", "treemacs" ], - "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", - "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" + "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", + "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" }, "stable": { "version": [ @@ -96343,8 +96944,8 @@ "persp-mode", "treemacs" ], - "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", - "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" + "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", + "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" }, "stable": { "version": [ @@ -96375,8 +96976,8 @@ "projectile", "treemacs" ], - "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", - "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" + "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", + "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" }, "stable": { "version": [ @@ -96902,11 +97503,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20200312, - 2235 + 20200430, + 1232 ], - "commit": "102587e458d48ece6335cd708300647f22ec8b8d", - "sha256": "0i3zpg21l5id0sfpxyn496wy83mpr66afx71lrnipsy1fqwd2j5x" + "commit": "0fc729787007b5111f3584034af0f3ef2389098f", + "sha256": "0h4k5gxjx55bg7dx8ixl87qdbxrmdzym6bvg2apasjs3kz9ggan5" }, "stable": { "version": [ @@ -97243,11 +97844,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200413, - 159 + 20200510, + 425 ], - "commit": "0ce9ac36144e80316fff50bfe1bc5dd7e5e7ded6", - "sha256": "1mqm2z8bp5dx9f9xq6bpgvk8xmzmh71bgxbff6kcliv0jy3jlakb" + "commit": "ea41b40601e44409a0e1ee138fab628952cdae4c", + "sha256": "1wcqfrdy1iz6vb6m9qadd7x75iclrrry7il2w49a04dpqb7hcx99" } }, { @@ -97258,11 +97859,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20200408, - 11 + 20200510, + 434 ], - "commit": "b808ef0cdcdd2eef221c67eda567eed7fcb3d4af", - "sha256": "107dgdw1jh8mipgwal1g86nfckrpz2l53a1sqcg90nb0n8fkvy2q" + "commit": "0400f15f2a0cfcedb69c06c3ff62f3f8814b62fb", + "sha256": "0f3f4svgsl5338bbglxscvk6mrscjbpcxqc2f84w2np7iyap4ls9" } }, { @@ -98043,8 +98644,8 @@ 20190715, 1836 ], - "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9", - "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9" + "commit": "aa832e280cce7c5a7cb92e65609285932650bf49", + "sha256": "149a0h6mbgvkqcnkdz3npmkhr6qgnr1vjbyidajvi1agkxpfz7cl" }, "stable": { "version": [ @@ -98319,20 +98920,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20191223, - 1331 + 20200507, + 2139 ], - "commit": "8fc2e2c33334c9ff6d4c4d20a99d258e6cfdc567", - "sha256": "1bf9swaj49yx59c1yj96q5rj839535wz2d1ihj98an2chd5czjh4" + "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7", + "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds" }, "stable": { "version": [ 1, - 9, - 4 + 11 ], - "commit": "8fc2e2c33334c9ff6d4c4d20a99d258e6cfdc567", - "sha256": "1bf9swaj49yx59c1yj96q5rj839535wz2d1ihj98an2chd5czjh4" + "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7", + "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds" } }, { @@ -98656,6 +99256,25 @@ "sha256": "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk" } }, + { + "ename": "vega-view", + "commit": "3b97f1a40c63c1d819eb235e9c36e5dfe20015c1", + "sha256": "1j4hwd2amhmbqhx3kmc8y8c7hmrzvvnjklyxp9c6mgxg08qsy2qk", + "fetcher": "github", + "repo": "applied-science/emacs-vega-view", + "unstable": { + "version": [ + 20200510, + 726 + ], + "deps": [ + "cider", + "parseedn" + ], + "commit": "c869defa3c0d9931e8eb4050dbaedb781160410b", + "sha256": "1l57w79ljihhfs4n60ak3hc3hdzv24wxkxafv51llb4zv2b85b5k" + } + }, { "ename": "verb", "commit": "3802b91f39ef7800afd49589d398182cb191b756", @@ -98664,20 +99283,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200404, - 951 + 20200506, + 1850 ], - "commit": "82cf1bde07b0c96b25d1dd16268663d8931fbb60", - "sha256": "18pjsjxrf844y3aw0fvj451cz08kw2j3idmhh3l15aj3jdwzjfbq" + "commit": "825baa8c241efe8d567bf096bb60f2543738c006", + "sha256": "1dmy3rngjpah6g5qlnii6yzf2b20brfcrdadx36d4prw5fzp2vnw" }, "stable": { "version": [ 2, - 9, + 10, 0 ], - "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c", - "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2" + "commit": "ee83e62490bec3b6d99281748a2e894c2bdc9e24", + "sha256": "1zd7vkd3i3x5cr04sp3jpfd79cp0p30615c9605z1rq01jjxgm3m" } }, { @@ -98837,8 +99456,8 @@ "helm-rg", "outshine" ], - "commit": "11645a398a11cdc4b84838294521ecfb229d7856", - "sha256": "00wqvszxsfyxx7pn9w5jn5brw2lx7d577zbc7sc4jz5nlk0csxd4" + "commit": "b5d1eec90bb43ba10178219245afbddb6601e85b", + "sha256": "1qfjwsxi3w2gdl258jbk5d3z645gs6zccxx2iah54zbgql17pgj9" }, "stable": { "version": [ @@ -99127,11 +99746,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20200303, - 2318 + 20200428, + 816 ], - "commit": "a19fbe8bcfab678516ffcaa84b516527a0ce45cf", - "sha256": "157f8d302vv7ds03y21j4rz5jvqbkm4639ak25zfhshd5lyacxyj" + "commit": "982606896e018c951917b73d2af6334df554cf9d", + "sha256": "19ks9wjfjyfk4s53wvhdqjnjc6847v43nh3ir0yvr66mflqxgg54" }, "stable": { "version": [ @@ -99405,11 +100024,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200418, - 1610 + 20200510, + 1856 ], - "commit": "0b04d31e2f0daf45452da2c5e214d2b42cd46a46", - "sha256": "1bdbr1hpzipxk41wx4qyvr2rkk4q4j8qnc09gd51wak7n4w3xz48" + "commit": "3decc51156e1b022955dc1333c3e358e20d94228", + "sha256": "1wqb3ajgzcwsvcvb6g6lmx3g2x4pi8g3vzp73a02h3lm52ljh6d1" } }, { @@ -99662,11 +100281,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20200326, - 2329 + 20200430, + 2155 ], - "commit": "7564b39aaa2b38ccca0a21bc72a797f065a0b171", - "sha256": "132jwf1d54ykbvw4f9f7i27ig5hpc6wsmm1ib44m5hx1kv1kxvh6" + "commit": "d958150c053dae57445be37cda1c2b50efcbaac3", + "sha256": "0fbh10yjva3bfpl76ddsnspzlpmbxj1azr3p4n2z0az75xx24wsa" } }, { @@ -100048,18 +100667,18 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20200424, - 1153 + 20200501, + 1939 ], - "commit": "6774c596a9b3988989d3bc96b6194e6f0df1d1b6", - "sha256": "1kv06qjcjxy5jw68za5bkmj4kwzc1snlxd7nahcy29rjkiczlh9c" + "commit": "186a7c21049c50ecfd4109eb06c91196404f8bc5", + "sha256": "1si8i21ysqwnkq38wr0r4liz3j8v8sj66y46yl6bpw77116fngx9" }, "stable": { "version": [ - 16 + 17 ], - "commit": "3ff506aae50a47b277f2b95ff7b7a7c596664e6a", - "sha256": "17dw6a8d0p304f2sa4f9zwd8r48w2wbkc3fvbmxwlg4w12h7cwf0" + "commit": "d115f8dc3052e5779938d782d9cdaa4533ef20ff", + "sha256": "0jr5a1nzp8nbdng0k2fcaymiiv9ngrbknbrqaswgqn3akvx793jk" } }, { @@ -100192,28 +100811,28 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20200416, - 1007 + 20200503, + 1919 ], "deps": [ "cl-lib", "request" ], - "commit": "7a3060266459566e450c5cafc00bc90c6508eae5", - "sha256": "064lihjd6bddvlick8md1anhinkc88asvliw0z34c8bckxc3hqpr" + "commit": "5e963e8ef17e937745b8f3b64f29690290c7a5c0", + "sha256": "1i9scalpinp87wnapgpdw51p1q0y9wjf6nv4jbskzn7irvlkhhzx" }, "stable": { "version": [ 3, 1, - 0 + 1 ], "deps": [ "cl-lib", "request" ], - "commit": "7a3060266459566e450c5cafc00bc90c6508eae5", - "sha256": "064lihjd6bddvlick8md1anhinkc88asvliw0z34c8bckxc3hqpr" + "commit": "5e963e8ef17e937745b8f3b64f29690290c7a5c0", + "sha256": "1i9scalpinp87wnapgpdw51p1q0y9wjf6nv4jbskzn7irvlkhhzx" } }, { @@ -100763,7 +101382,7 @@ "makey", "s" ], - "commit": "79098cd4cdfa144807cb710af4589c13a7033842", + "commit": "1de068d49a6b5faf8754d217bdaa2cbfc903a9fc", "sha256": "04gfhjpn4q8d4y6177gdffwjbqq627083pff2ckw79pbvlj9f2mm" } }, @@ -101012,11 +101631,11 @@ "repo": "Javyre/winds.el", "unstable": { "version": [ - 20200425, - 1643 + 20200501, + 419 ], - "commit": "a998e9397836f441d51f3c8d001dd407258a0ff5", - "sha256": "1qgkm1fl21r56gbsvwmld8mdf970zwjsj68qdpsa9m0j4kbw9m9c" + "commit": "720a0cedfdc20940f4c740e74fa0e16983cb0367", + "sha256": "00s0c2ilmypygqlrfa0ajig25h5jijxwwzpcfxgwbjf71wn5g9mg" } }, { @@ -101205,8 +101824,8 @@ "deps": [ "async" ], - "commit": "4fe66d4d55c8eacebda53a13cc38e01d32bdaaa2", - "sha256": "1lyjrh1vddnf8v4i6g05bfx1kq8angbdhyh5v3j0d27gb66cshxp" + "commit": "f25a70777d9d9c90a52249791578bd72f1b7dfd7", + "sha256": "1vb6dw07vx3zqqb1h457f9957yja8wfqcjcfcf3m78dah3l2qmr1" }, "stable": { "version": [ @@ -101263,11 +101882,11 @@ "repo": "twlz0ne/with-proxy.el", "unstable": { "version": [ - 20190920, - 24 + 20200510, + 414 ], - "commit": "a7506af86ffc943f5d4cba712ec661125799c30b", - "sha256": "1nxssc8xn8i2zf9bs9rv61im3jxi38lq1ph9qr0hazwncndcsb39" + "commit": "93b1ed2f3060f305009fa71f4fb5bb10173a10e3", + "sha256": "15cwpg1s563pw44f8vr96w31hbpix9jd3736hd5546a79ymq5vz3" } }, { @@ -101278,26 +101897,26 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200419, - 850 + 20200510, + 1621 ], "deps": [ "cl-lib" ], - "commit": "ffd9c6a3a058fe072458f90e117590988042c662", - "sha256": "194k0j6mg8dh5z5ia204glicbmy2laxyny7snbvf7b6xd9ajmj3w" + "commit": "8d78bfeffa8a7bb4973395417d6fe21e4840ee16", + "sha256": "0ygbabavrhl9xmxmqaxrjkhyf7ar5lin5v1ay94hzr1v1lyiyc9h" }, "stable": { "version": [ 0, - 1, - 0 + 2, + 2 ], "deps": [ "cl-lib" ], - "commit": "92549f9f80067ce32248ad2c05649673d2084fcf", - "sha256": "1dip0d5llr6sjisww283051s21ir8d5nzjdh22k3fjnz68mqq63s" + "commit": "5ff0c8bc0b99b28d6c696e56cd7f44c7aa9ccaf1", + "sha256": "00dc0b0kj8215z14brwmzryb73w1j82r136a03n3pnczfh2l9z4n" } }, { @@ -101308,11 +101927,11 @@ "repo": "DarwinAwardWinner/with-simulated-input", "unstable": { "version": [ - 20200215, - 1807 + 20200509, + 2010 ], - "commit": "29173588751eeb33d2392d380b26648b2e213438", - "sha256": "0qmcv1ks3cnvl7l6cmbl5a03irwp38zfc98rzp9hbd3xw7rh970b" + "commit": "0d5e910f19657ab376f72e5848be50d13d3b8e50", + "sha256": "1ksm11k8gxkjn9byacy08xrz91gvzyf7fjnxv7j5ffpsccbh0wg3" }, "stable": { "version": [ @@ -101722,14 +102341,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20200409, - 1927 + 20200427, + 2319 ], "deps": [ "visual-fill-column" ], - "commit": "9b6e55fe49ab7760a826179df4f1c3b6c9a759df", - "sha256": "0kf88big78lnc2gxn00sykwi1ky4hacr7al2ihgwpznq9vbrj3p1" + "commit": "7f7acde5e8fc4ba74e511ca295e21f9ba7874730", + "sha256": "01rc7v2kg1h3cc06qa521mx9kvdxpw2b5hg12skh9gq1v5q1pbv9" }, "stable": { "version": [ @@ -101997,11 +102616,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20200424, - 2358 + 20200427, + 1357 ], - "commit": "b0d87ab312a51ab8484deb8994e4effb3112d516", - "sha256": "1ivlcxm423syd35njrpnswdra3f30fqsfr6qdffiy6vajy0ykda7" + "commit": "17319a5e5514a61564c7314cb65b7d825ca0bb0f", + "sha256": "1y5g89kl1lbwzxmgah06z6iisj55l089q25n9dbxmwnklsxpbicw" } }, { @@ -102096,17 +102715,17 @@ }, { "ename": "xbm-life", - "commit": "6cb4c55583338dafee61fd9c266d2ee7cae2b1ed", - "sha256": "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q", - "fetcher": "github", - "repo": "wasamasa/xbm-life", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "02jhcz71ldb6gar3jw13w6m6prz6hv6gccacgmp40bg6cglf3czf", + "fetcher": "git", + "url": "https://depp.brause.cc/xbm-life.git", "unstable": { "version": [ - 20160103, - 1017 + 20200506, + 1217 ], - "commit": "dd6a98ac9ea81b681e68f6318fed47158e5d469e", - "sha256": "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj" + "commit": "311ef62438c4ab057c054fcdda4dbfa5980759b5", + "sha256": "1h8s5wiib9hb9bgqr3r5abpib9m61aa2pwiy3isjs5fkacvvxi9l" }, "stable": { "version": [ @@ -102480,22 +103099,19 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200424, - 2025 + 20200510, + 1712 ], - "commit": "c389016e029c279c81fe4c0e1d757949b5ef36c0", - "sha256": "16lpjbb49f465h36x22ch84133d0ihbqpfhjh46sncpj22ddj8pl" + "commit": "137dfecedfdf6aff69b0f9b1c299aa0ae868fca0", + "sha256": "127lq50q62x06kd1xrf8lyc4rkqbfhfy86gsx1x4x169am2xk397" }, "stable": { "version": [ - 1, - 9 + 2, + 0 ], - "deps": [ - "cl-lib" - ], - "commit": "44e6df835bd4173ee4ccc7e29842e9dae76f2668", - "sha256": "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm" + "commit": "137dfecedfdf6aff69b0f9b1c299aa0ae868fca0", + "sha256": "127lq50q62x06kd1xrf8lyc4rkqbfhfy86gsx1x4x169am2xk397" } }, { @@ -102693,8 +103309,8 @@ 20171022, 1412 ], - "commit": "e844b662819344eb726f67e525f377b9ee808b24", - "sha256": "0d8c70bip8wxpnjqhqf33kq4q2lb2qdk9w2a4bp2v707fpr4pv73" + "commit": "1ae37b1a949a6afcb6521e452588bf8a058f9e81", + "sha256": "0ya3injviifhrcsdfm9hkfw8xqfaa6hqvv5z0cfvfj7rcwjnbx9p" } }, { @@ -102750,11 +103366,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20191127, - 2314 + 20200511, + 952 ], - "commit": "cecf4b106b0c4236931b14919fdf87ff3546e2c9", - "sha256": "10dz6zz5mhf09wnhqag93zvdcnh6zyizpsdj189jgza58dq2vp1v" + "commit": "41adb32b886352827c4d4b4ad15cdf18a00c8c50", + "sha256": "1sp507iphis91581f51j3kc29vn5qkwjfiv7ma06scg22fps9qis" }, "stable": { "version": [ @@ -103032,14 +103648,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20200425, - 1210 + 20200508, + 936 ], "deps": [ "yasnippet" ], - "commit": "937cb7bb1921db38ab2c0c62062e8e32a29eabed", - "sha256": "03v855gbr6ii21qw4h8whbzj88xi28sqpnz1yqd1a7ngrc149fgz" + "commit": "ab3c20483a39742d7c612bc006d09aa8ffa3186d", + "sha256": "16gzc33qlmgbp9hq5c3bbv24b136ai23h3v0b2f9rr2xy9ln3ccz" }, "stable": { "version": [ @@ -103328,8 +103944,8 @@ "repo": "xuchunyang/youdao-dictionary.el", "unstable": { "version": [ - 20191227, - 242 + 20200429, + 259 ], "deps": [ "chinese-word-at-point", @@ -103337,8 +103953,8 @@ "popup", "pos-tip" ], - "commit": "a745e3197cf3498244265efab8e1cc1f4fedcddc", - "sha256": "0b74crwlslvl4hvjai6a5cphxy9rjnlkhjdlfprqf7s1ygycy1m0" + "commit": "bd839711e3cf6d3eb9c308cea5694369a440899e", + "sha256": "12r6avj1mxjj46s2p6kwhixhkinkm9krd62sy9ji7v9np2gqf7ll" }, "stable": { "version": [ @@ -103354,6 +103970,21 @@ "sha256": "1m4zri7kiw70062w2sp4fdqmmx2vmjisamjwmjdg6669dzvnpawq" } }, + { + "ename": "ytel", + "commit": "ec52f03658dca774daf7301e81edb20aedf03c10", + "sha256": "0adxiw83rah9hln3k8gm6s7ks3xpqfknypjb9j51lxcabc7c1677", + "fetcher": "github", + "repo": "grastello/ytel", + "unstable": { + "version": [ + 20200510, + 1405 + ], + "commit": "adea3fa881baebed4fd6a4e6653c9a1d16a1ed52", + "sha256": "04xmvc7i4p7s9j3dx55vcakps50r5a95n5j6vzby9qm6rc3vss3m" + } + }, { "ename": "z3-mode", "commit": "e056fb14b46b97ff31b1db3b8bd31e395a54cd87", @@ -103614,14 +104245,14 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200415, - 1614 + 20200509, + 1040 ], "deps": [ "deft" ], - "commit": "cba7554afe740f64adcdc615b5f4ab0e1e47c6a1", - "sha256": "1b1bqz02xh19syyv9w64q9msay84kpq3kkmpdqy8i7mvhsd4cdry" + "commit": "c0d36c5d1129a600bee51e0913ae2f851cc56b7b", + "sha256": "1l8lrgy3i0h174zvfcpc4h1v5h4vpxnmh963v32dh8jnj1vs0afx" }, "stable": { "version": [ @@ -103784,20 +104415,20 @@ }, { "ename": "zone-nyan", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94", - "fetcher": "github", - "repo": "wasamasa/zone-nyan", + "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", + "sha256": "12k55m9fxkvx57n99dynpdsx391z8pzd6cjm4bqarf88bhv7f72p", + "fetcher": "git", + "url": "https://depp.brause.cc/zone-nyan.git", "unstable": { "version": [ - 20170818, - 1644 + 20200506, + 1207 ], "deps": [ "esxml" ], - "commit": "4b1f8d95f130946718d52806489ffe2762aebfdc", - "sha256": "1axq4ch7garlfrybq9kgv6x7d8y4dw5y9pqbqlqvlwf4xmdrvzmm" + "commit": "48625814f42c39521405d08009e1d44108d880ac", + "sha256": "1ii7w9y357l2467733wy7nnpikpdacjfj9bp2a54nq8h60gfr661" }, "stable": { "version": [ From f90f557fb613e3ac89e086e279a48c6f25b4fb6d Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Mon, 11 May 2020 15:51:46 +0300 Subject: [PATCH 026/310] melpa-packages: mention update-from-overlay script --- .../applications/editors/emacs-modes/elpa-packages.nix | 10 ++++++++++ .../editors/emacs-modes/melpa-packages.nix | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index a6d657199b98..57f5d7b85941 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -8,6 +8,16 @@ To update the list of packages from MELPA, 2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages`. 3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` +## Update from overlay + +Alternatively, run the following command: + +./update-from-overlay + +It will update both melpa and elpa packages using +https://github.com/nix-community/emacs-overlay. It's almost +instantenous and formats commits for you. + */ { lib, stdenv, texinfo }: diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 87da2079605f..681ade367e5d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -10,6 +10,16 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages 3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` +## Update from overlay + +Alternatively, run the following command: + +./update-from-overlay + +It will update both melpa and elpa packages using +https://github.com/nix-community/emacs-overlay. It's almost +instantenous and formats commits for you. + */ { lib, external, pkgs }: variant: self: let From ecf327d697f477f903980295a9ba0a00301f9ecc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 May 2020 23:59:38 +0200 Subject: [PATCH 027/310] nixos/sssd: add to system.nssDatabases.group too nixos/modules/config/nsswitch.nix uses `passwdArray` for both `passwd` and `group`, but when moving this into the sss module in edddc7c82a848f1b1f23344a338b5d56b38178c0, it didn't get split appropriately. --- nixos/modules/services/misc/sssd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix index 77f6ccfe64f0..fbee02b8e244 100644 --- a/nixos/modules/services/misc/sssd.nix +++ b/nixos/modules/services/misc/sssd.nix @@ -76,9 +76,10 @@ in { system.nssModules = optional cfg.enable pkgs.sssd; system.nssDatabases = { + group = [ "sss" ]; passwd = [ "sss" ]; - shadow = [ "sss" ]; services = [ "sss" ]; + shadow = [ "sss" ]; }; services.dbus.packages = [ pkgs.sssd ]; }) From 22975087831bf4bd86c7f54174796c43946ffcdb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 00:02:57 +0200 Subject: [PATCH 028/310] nixos/google-oslogin: add to system.nssDatabases.group too nixos/modules/config/nsswitch.nix uses `passwdArray` for both `passwd` and `group`, but when moving this into the google-oslogin module in 4b71b6f8fa5f7b06ea5d0dd37d44a73757c7f142, it didn't get split appropriately. --- nixos/modules/security/google_oslogin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/security/google_oslogin.nix b/nixos/modules/security/google_oslogin.nix index 78c2089baeb9..c2889a0f0d1d 100644 --- a/nixos/modules/security/google_oslogin.nix +++ b/nixos/modules/security/google_oslogin.nix @@ -50,6 +50,7 @@ in # enable the nss module, so user lookups etc. work system.nssModules = [ package ]; system.nssDatabases.passwd = [ "cache_oslogin" "oslogin" ]; + system.nssDatabases.group = [ "cache_oslogin" "oslogin" ]; # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable. # So indirect by a symlink. From 36b6e26d40ae8219302c52cac7f5ac5db9b73532 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 00:06:40 +0200 Subject: [PATCH 029/310] nixos/systemd: add to system.nssDatabases.group too nixos/modules/config/nsswitch.nix uses `passwdArray` for both `passwd` and `group`, but when moving this into the systemd module in c0995d22eed1a19ac9442c8460c18dd6a4c389b7, it didn't get split appropriately. --- nixos/modules/system/boot/systemd.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index ffc5387e8102..e05c0c8b2acd 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -848,6 +848,10 @@ in [ "mymachines" ] (mkAfter [ "systemd" ]) ]); + group = (mkMerge [ + [ "mymachines" ] + (mkAfter [ "systemd" ]) + ]); }; environment.systemPackages = [ systemd ]; From 4f9c8ef7911d5fdf125b6959244f18270e8e0a19 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 00:09:59 +0200 Subject: [PATCH 030/310] nixos/ldap: move nss database configuration into ldap module now that passwdArray and shadowArray aren't used anymore, these can be folded. --- nixos/modules/config/ldap.nix | 4 ++++ nixos/modules/config/nsswitch.nix | 17 +++-------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 4c8b527676b2..1a5dbcd4e26b 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -244,6 +244,10 @@ in if cfg.daemon.enable then nss_pam_ldapd else nss_ldap ); + system.nssDatabases.group = optional cfg.nsswitch "ldap"; + system.nssDatabases.passwd = optional cfg.nsswitch "ldap"; + system.nssDatabases.shadow = optional cfg.nsswitch "ldap"; + users = mkIf cfg.daemon.enable { groups.nslcd = { gid = config.ids.gids.nslcd; diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 22ddb3490c8e..465c910d95b6 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -11,7 +11,6 @@ let # XXX Move these to their respective modules nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; - ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); hostArray = mkMerge [ (mkBefore [ "files" ]) @@ -21,16 +20,6 @@ let (mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns ]; - passwdArray = mkMerge [ - (mkBefore [ "files" ]) - (mkIf ldap [ "ldap" ]) - ]; - - shadowArray = mkMerge [ - (mkBefore [ "files" ]) - (mkIf ldap [ "ldap" ]) - ]; - in { options = { @@ -145,9 +134,9 @@ in { ''; system.nssDatabases = { - passwd = passwdArray; - group = passwdArray; - shadow = shadowArray; + passwd = mkBefore [ "files" ]; + group = mkBefore [ "files" ]; + shadow = mkBefore [ "files" ]; hosts = hostArray; services = mkBefore [ "files" ]; }; From fd21793de61bacf8893d7c5f6e7fdd3c76855dfe Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 00:17:05 +0200 Subject: [PATCH 031/310] nixos/avahi: move nss database configuration into avahi module --- nixos/modules/config/nsswitch.nix | 3 --- nixos/modules/services/networking/avahi-daemon.nix | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 465c910d95b6..556ae3951f74 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -9,15 +9,12 @@ let # only with nscd up and running we can load NSS modules that are not integrated in NSS canLoadExternalModules = config.services.nscd.enable; # XXX Move these to their respective modules - nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; hostArray = mkMerge [ (mkBefore [ "files" ]) - (mkIf nssmdns [ "mdns_minimal [NOTFOUND=return]" ]) (mkIf nsswins [ "wins" ]) (mkAfter [ "dns" ]) - (mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns ]; in { diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index ddcfe3d77e2f..c876b252e8cd 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -238,6 +238,10 @@ in users.groups.avahi = {}; system.nssModules = optional cfg.nssmdns pkgs.nssmdns; + system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [ + [ "mdns_minimal [NOTFOUND=return]" ] + (mkOrder 1501 [ "mdns" ]) # 1501 to ensure it's after dns + ]); environment.systemPackages = [ pkgs.avahi ]; From 1fb6c37597d12e209798ded07f8c122839b8db67 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 00:20:30 +0200 Subject: [PATCH 032/310] nixos/samba: move nss database configuration into samba module --- nixos/modules/config/nsswitch.nix | 22 +++++-------------- .../services/network-filesystems/samba.nix | 1 + 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 556ae3951f74..fd8425bfa2ee 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -4,20 +4,7 @@ with lib; -let - - # only with nscd up and running we can load NSS modules that are not integrated in NSS - canLoadExternalModules = config.services.nscd.enable; - # XXX Move these to their respective modules - nsswins = canLoadExternalModules && config.services.samba.nsswins; - - hostArray = mkMerge [ - (mkBefore [ "files" ]) - (mkIf nsswins [ "wins" ]) - (mkAfter [ "dns" ]) - ]; - -in { +{ options = { # NSS modules. Hacky! @@ -109,7 +96,7 @@ in { assertions = [ { # generic catch if the NixOS module adding to nssModules does not prevent it with specific message. - assertion = config.system.nssModules.path != "" -> canLoadExternalModules; + assertion = config.system.nssModules.path != "" -> config.services.nscd.enable; message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled."; } ]; @@ -134,7 +121,10 @@ in { passwd = mkBefore [ "files" ]; group = mkBefore [ "files" ]; shadow = mkBefore [ "files" ]; - hosts = hostArray; + hosts = mkMerge [ + (mkBefore [ "files" ]) + (mkAfter [ "dns" ]) + ]; services = mkBefore [ "files" ]; }; }; diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index a115590ccaa0..08c912e0fcd4 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -224,6 +224,7 @@ in (mkIf cfg.enable { system.nssModules = optional cfg.nsswins samba; + system.nssDatabases.hosts = optional cfg.nsswins "wins"; systemd = { targets.samba = { From 0f6f544aafae42f4dcba7284a8dc4b61bb8fbb22 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 00:22:47 +0200 Subject: [PATCH 033/310] nixos/sssd: drop assertion This is now already triggered by the nsswitch module, as we set system.nssModules. --- nixos/modules/services/misc/sssd.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix index fbee02b8e244..b9b1b13d7f94 100644 --- a/nixos/modules/services/misc/sssd.nix +++ b/nixos/modules/services/misc/sssd.nix @@ -42,11 +42,6 @@ in { }; config = mkMerge [ (mkIf cfg.enable { - assertions = singleton { - assertion = nscd.enable; - message = "nscd must be enabled through `services.nscd.enable` for SSSD to work."; - }; - systemd.services.sssd = { description = "System Security Services Daemon"; wantedBy = [ "multi-user.target" ]; From 1df38e2a1d747f6e519c5aec02118e9672640cc8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 00:29:35 +0200 Subject: [PATCH 034/310] nixos/nsswitch: update comment next to assertion --- nixos/modules/config/nsswitch.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index fd8425bfa2ee..9d1b67d3bbf3 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -95,7 +95,9 @@ with lib; config = { assertions = [ { - # generic catch if the NixOS module adding to nssModules does not prevent it with specific message. + # Prevent users from disabling nscd, with nssModules being set. + # If disabling nscd is really necessary, it's still possible to opt out + # by forcing config.system.nssModules to []. assertion = config.system.nssModules.path != "" -> config.services.nscd.enable; message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled."; } From 4a69bf2a1e8ed79a237c0476556fb72f6de90f98 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 00:24:38 +0200 Subject: [PATCH 035/310] nixos/systemd: enable systemd-provided nss modules unconditionally A disabled nscd breaks nss module loading on NixOS, and systemd without its nss modules doesn't really work either - instead of silently disabling its nss modules if nscd is disabled, let the assertion in nsswitch handle this. --- nixos/modules/system/boot/systemd.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index e05c0c8b2acd..96b9815aa2b3 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -829,16 +829,8 @@ in system.build.units = cfg.units; - # Systemd provides various NSS modules to look up dynamic users, locally - # configured IP adresses and local container hostnames. - # On NixOS, these can only be passed to the NSS system via nscd (and its - # LD_LIBRARY_PATH), which is why it's usually a very good idea to have nscd - # enabled (also see the config.nscd.enable description). - # While there is already an assertion in place complaining loudly about - # having nssModules configured and nscd disabled, for some reason we still - # check for nscd being enabled before adding to nssModules. - system.nssModules = optional config.services.nscd.enable systemd.out; - system.nssDatabases = mkIf config.services.nscd.enable { + system.nssModules = [ systemd.out ]; + system.nssDatabases = { hosts = (mkMerge [ [ "mymachines" ] (mkOrder 1600 [ "myhostname" ] # 1600 to ensure it's always the last From 90bc3ec9b97ef3fb0ea6f34916bea1db780f110f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 9 May 2020 16:38:08 +0200 Subject: [PATCH 036/310] nixos/sssd remove redundant condition This is all inside a global cfg.enable conditional, so we don't need to check here again. --- nixos/modules/services/misc/sssd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix index b9b1b13d7f94..3da99a3b38c1 100644 --- a/nixos/modules/services/misc/sssd.nix +++ b/nixos/modules/services/misc/sssd.nix @@ -69,7 +69,7 @@ in { mode = "0400"; }; - system.nssModules = optional cfg.enable pkgs.sssd; + system.nssModules = pkgs.sssd; system.nssDatabases = { group = [ "sss" ]; passwd = [ "sss" ]; From 23ba50611321035e02f5bfc2f5f809600ccc2f7b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 9 May 2020 16:39:58 +0200 Subject: [PATCH 037/310] nixos/nsswitch: improve error message Show the config option triggering the assertion, so people don't necessary lookup the nixpkgs source code. --- nixos/modules/config/nsswitch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 9d1b67d3bbf3..d19d35a48906 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -99,7 +99,7 @@ with lib; # If disabling nscd is really necessary, it's still possible to opt out # by forcing config.system.nssModules to []. assertion = config.system.nssModules.path != "" -> config.services.nscd.enable; - message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled."; + message = "Loading NSS modules from system.nssModules (${config.system.nssModules.path}), requires services.nscd.enable being set to true."; } ]; From d8fa222ca2e4a6322233da8013290a29b6e5f971 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 12 May 2020 18:31:02 +0900 Subject: [PATCH 038/310] flashplayer: 32.0.0.363 -> 32.0.0.371 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 1dd9baa628ab..d45a3c9f864a 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.363"; + version = "32.0.0.371"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460"; + sha256 = "1nks2wx74b21hv0l7bnrzkxn7c6p6r8zgwbqvy3cqpi8famyr5v9"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 6672a75d574d..a9f05ba1da9a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.363"; + version = "32.0.0.371"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "06711k4vbn6mqfd8gvx2snsxyalhw15hn5b64sja8726z5rxvzy7" + "1zrl7cxcl9hkafji15br8wp5vf9a5lb88xcpz6vi9q73j45mhzjd" else - "0v584aqhy4xk08afi3ypkq4mqjq57y136z82i5ixyim88dqbaf4f" + "0cgnsn9zanadbacb660mj4k103cdyb2cak7ixnp1varqklss83n6" else if arch == "x86_64" then - "1g1ijxypm8a8mfc1x58gksmaakqpp7xmf277wiir8zqjn3vd6c64" + "1zc90gjixfhjng7pbx8vci1l69wf5m40149178zwzs6kz4ma5hb2" else - "13nbxmqmbxqvdhdwdqimim2f9fz3y2vrsx6b3pck6352m4i4wzh8"; + "0fqgas1g52a0zir2cxz3anizk3lkmwl68nbcn5rihgvjfqykbhn8"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 3661f6edb530..3015d506427d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.363"; + version = "32.0.0.371"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "03zhza8lvc1nvz3racwfsajfd6rnbw3g56dp5wvr1qmaps8xaaqg" + "0n3bk2y1djaqrdygnr81n8lsnj2k60kaziffl41zpdvzi1jc7wgn" else - "0bhp7jv2l2agfzr8m564k749a5g75dw1390phlwvf49n1h8ldap2"; + "18ll9rnfhbnz54q4d7q9fb13lix4i62zr6z6n574qvwngrvbrr8a"; }; nativeBuildInputs = [ unzip ]; From fd004aac76692dfcf043c41d07e316978bb69f5f Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Tue, 12 May 2020 17:20:53 +0200 Subject: [PATCH 039/310] trilium: 0.42.1 -> 0.42.2 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index fb7f88829f6b..17af0b0591b9 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.42.1"; + version = "0.42.2"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0xcbkm6z1a0jh3qywlwcjk6l302cxgdfcq8sw30vbnz99cyarpvz"; + sha256 = "14vb5a2kad1h8kd1vipgaxpv6rch2fl6j0s2ja0y16xypga82wrx"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "012l36z0n3fcdajj3v4w2bcb1619sdhg6cvy3y89b6rxl0h2wdiw"; + sha256 = "16dz2i4g0vgwz4fi69lmg261aqb8hs6ipfy004wv73vg46wf1pnv"; }; in { From 89448e98a0e99ec87964b62eb57393bce912ed5d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 13 May 2020 10:18:00 +0800 Subject: [PATCH 040/310] jdupes: build with additional hardening --- pkgs/tools/misc/jdupes/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 109a84de6310..2898cfb67982 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -15,8 +15,11 @@ stdenv.mkDerivation rec { extraPostFetch = "rm -r $out/testdir"; }; + dontConfigure = true; + makeFlags = [ "PREFIX=${placeholder "out"}" + "HARDEN=1" ] ++ stdenv.lib.optionals stdenv.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" @@ -27,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = false; # broken Makefile, the above also removes tests postInstall = '' - install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README.md + install -Dm444 -t $out/share/doc/jdupes CHANGES LICENSE README.md ''; meta = with stdenv.lib; { @@ -40,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jbruchon/jdupes"; license = licenses.mit; maintainers = with maintainers; [ romildo ]; - platforms = platforms.all; }; } From 4eb382953974587047fc1d0b53ec26375900f084 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 13 May 2020 13:24:14 +0800 Subject: [PATCH 041/310] sarasa-gothic: replace p7zip with libarchive --- pkgs/data/fonts/sarasa-gothic/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 1be4835e20c9..eb1b7bf49e31 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, p7zip }: +{ lib, fetchurl, libarchive }: let version = "0.8.2"; @@ -12,7 +12,8 @@ in fetchurl { downloadToTemp = true; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile -o$out/share/fonts + mkdir -p $out/share/fonts + ${libarchive}/bin/bsdtar -xf $downloadedFile -C $out/share/fonts ''; meta = with lib; { From c8d1573dac82ae6500f89cecd4207f24975e3f65 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 13 May 2020 13:28:16 +0800 Subject: [PATCH 042/310] sarasa-gothic: 0.8.0 -> 0.12.6 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index eb1b7bf49e31..96bfaf191c3d 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, libarchive }: let - version = "0.8.2"; + version = "0.12.6"; in fetchurl { name = "sarasa-gothic-${version}"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "17xkpklb6spi10132lq658fwvrms3fs7ksb9j098z9vaqad1k51q"; + sha256 = "1b15gsmv2jr0r8xssr8216s8xsghr6w5wm3w3imm3qlh3kqk1qg8"; recursiveHash = true; downloadToTemp = true; From 9ac444d80ecbb9d6f4df685b405d7fd71ed9a92c Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 13 May 2020 10:24:36 +0200 Subject: [PATCH 043/310] dockerTools.examples: fix the nginx image Nginx now requires directories `/var/log/nginx` and `/var/cache/nginx` to be existing. The objective is to fix the test `nixosTests.docker-tools`. --- pkgs/build-support/docker/examples.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index f42b35e64943..b81d741ba2b5 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -69,6 +69,12 @@ rec { tag = "latest"; contents = pkgs.nginx; + extraCommands = '' + # nginx still tries to read this directory even if error_log + # directive is specifying another file :/ + mkdir -p var/log/nginx + mkdir -p var/cache/nginx + ''; runAsRoot = '' #!${pkgs.stdenv.shell} ${shadowSetup} From 8f50956ee059d882be5ed53ad9704ebcaa41856d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 May 2020 08:35:35 +0200 Subject: [PATCH 044/310] maintainers/scripts/update.nix: Import lib into scope This will make it easier to change it if we want to decouple from pkgs. --- maintainers/scripts/update.nix | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 7c45e148e822..23ea11b66e1a 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -9,6 +9,10 @@ # TODO: add assert statements let + pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; }); + + inherit (pkgs) lib; + /* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity. */ nubOn = f: list: @@ -16,21 +20,19 @@ let [] else let - x = pkgs.lib.head list; - xs = pkgs.lib.filter (p: f x != f p) (pkgs.lib.drop 1 list); + x = lib.head list; + xs = lib.filter (p: f x != f p) (lib.drop 1 list); in [x] ++ nubOn f xs; - pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; }); - packagesWith = cond: return: set: nubOn (pkg: pkg.updateScript) - (pkgs.lib.flatten - (pkgs.lib.mapAttrsToList + (lib.flatten + (lib.mapAttrsToList (name: pkg: let result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg + if lib.isDerivation pkg && cond name pkg then [(return name pkg)] else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false then packagesWith cond return pkg @@ -47,10 +49,10 @@ let packagesWithUpdateScriptAndMaintainer = maintainer': let maintainer = - if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then + if ! builtins.hasAttr maintainer' lib.maintainers then builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`." else - builtins.getAttr maintainer' pkgs.lib.maintainers; + builtins.getAttr maintainer' lib.maintainers; in packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg && (if builtins.hasAttr "maintainers" pkg.meta @@ -66,7 +68,7 @@ let packagesWithUpdateScript = path: let - attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs; + attrSet = lib.attrByPath (lib.splitString "." path) null pkgs; in if attrSet == null then builtins.throw "Attribute path `${path}` does not exists." @@ -77,7 +79,7 @@ let packageByName = name: let - package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs; + package = lib.attrByPath (lib.splitString "." name) null pkgs; in if package == null then builtins.throw "Package with an attribute name `${name}` does not exists." @@ -125,15 +127,15 @@ let packageData = package: { name = package.name; - pname = pkgs.lib.getName package; - updateScript = map builtins.toString (pkgs.lib.toList package.updateScript); + pname = lib.getName package; + updateScript = map builtins.toString (lib.toList package.updateScript); }; packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages)); optionalArgs = - pkgs.lib.optional (max-workers != null) "--max-workers=${max-workers}" - ++ pkgs.lib.optional (keep-going == "true") "--keep-going"; + lib.optional (max-workers != null) "--max-workers=${max-workers}" + ++ lib.optional (keep-going == "true") "--keep-going"; args = [ packagesJson ] ++ optionalArgs; From fab2ee8c10c2d39310c8e3cdddde9fd118727063 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 May 2020 08:30:39 +0200 Subject: [PATCH 045/310] maintainers/scripts/update.nix: derivation is the final station It does not make sense to look for derivations within derivations, not even when `recurseForDerivations` is true. Nix does not do that either: https://github.com/NixOS/nix/blob/ebc024df2287085d48ed6194aa756fd70c07f76c/src/libexpr/get-drvs.cc#L346-L355 --- maintainers/scripts/update.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 23ea11b66e1a..492000a10377 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -32,8 +32,8 @@ let (name: pkg: let result = builtins.tryEval ( - if lib.isDerivation pkg && cond name pkg - then [(return name pkg)] + if lib.isDerivation pkg + then lib.optional (cond name pkg) (return name pkg) else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false then packagesWith cond return pkg else [] From 9678bf59f2feac00aa3ab245879358a706c311b4 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 13 May 2020 11:17:12 +0200 Subject: [PATCH 046/310] cypress: 4.4.1 -> 4.5.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 3cb5b96d5887..10701f6b445d 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "4.4.1"; + version = "4.5.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0da1y90a6i3fjhyrzwwn3pavzbqin9v5v7hx8halz6i7cf1halfi"; + sha256 = "0pr9b36s63xplmyjgjdifw5pgas7bxwbnsckjix7djyln0j5ja3q"; }; # don't remove runtime deps From 3f3aeb7c85fb5b7e6b9e950aed3a36a0e65e8bde Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 May 2020 10:29:01 +0200 Subject: [PATCH 047/310] maintainers/scripts/update.nix: refactor package collector The `packagesWith` function expected an attrSet but `packagesWithUpdateScript` could be passing it a derivation or a list when the attribute path supplied by user through the `--argstr path` argument pointed to one. It only worked because derivations are also attrSets and contain their outputs as attributes, and did not work for lists at all. Additionally, the improper handling would cause the `src` attribute to be built in some rare cases (`mkYarnPackage` seems to trigger this). Rewriting the `packagesWith` function to be inductive with a derivation as a base case and attrSets and lists as inductive steps is much cleaner and also fixes the unnecessary build. --- maintainers/scripts/update.nix | 57 ++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 492000a10377..66ea18ddf62e 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -25,26 +25,29 @@ let in [x] ++ nubOn f xs; - packagesWith = cond: return: set: - nubOn (pkg: pkg.updateScript) - (lib.flatten - (lib.mapAttrsToList - (name: pkg: - let - result = builtins.tryEval ( - if lib.isDerivation pkg - then lib.optional (cond name pkg) (return name pkg) - else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false - then packagesWith cond return pkg - else [] - ); - in - if result.success then result.value - else [] - ) - set - ) - ); + packagesWithPath = relativePath: cond: return: pathContent: + let + result = builtins.tryEval pathContent; + + dedupResults = lst: nubOn (pkg: pkg.updateScript) (lib.concatLists lst); + in + if result.success then + let + pathContent = result.value; + in + if lib.isDerivation pathContent then + lib.optional (cond relativePath pathContent) (return relativePath pathContent) + else if lib.isAttrs pathContent then + # If user explicitly points to an attrSet or it is marked for recursion, we recur. + if relativePath == [] || pathContent.recurseForDerivations or false || pathContent.recurseForRelease or false then + dedupResults (lib.mapAttrsToList (name: elem: packagesWithPath (relativePath ++ [name]) cond return elem) pathContent) + else [] + else if lib.isList pathContent then + dedupResults (lib.imap0 (i: elem: packagesWithPath (relativePath ++ [i]) cond return elem) pathContent) + else [] + else []; + + packagesWith = packagesWithPath []; packagesWithUpdateScriptAndMaintainer = maintainer': let @@ -54,7 +57,7 @@ let else builtins.getAttr maintainer' lib.maintainers; in - packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg && + packagesWith (relativePath: pkg: builtins.hasAttr "updateScript" pkg && (if builtins.hasAttr "maintainers" pkg.meta then (if builtins.isList pkg.meta.maintainers then builtins.elem maintainer pkg.meta.maintainers @@ -63,19 +66,19 @@ let else false ) ) - (name: pkg: pkg) + (relativePath: pkg: pkg) pkgs; packagesWithUpdateScript = path: let - attrSet = lib.attrByPath (lib.splitString "." path) null pkgs; + pathContent = lib.attrByPath (lib.splitString "." path) null pkgs; in - if attrSet == null then + if pathContent == null then builtins.throw "Attribute path `${path}` does not exists." else - packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg) - (name: pkg: pkg) - attrSet; + packagesWith (relativePath: pkg: builtins.hasAttr "updateScript" pkg) + (relativePath: pkg: pkg) + pathContent; packageByName = name: let From deadc230342238b067bff84a61183836d954b76b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 13 May 2020 13:23:20 +0200 Subject: [PATCH 048/310] nginxModules.fancyindex: 0.4.3 -> 0.4.4 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1111990435a5..4ea74019692b 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -73,8 +73,8 @@ in src = fetchFromGitHub { owner = "aperezdc"; repo = "ngx-fancyindex"; - rev = "v0.4.3"; - sha256 = "12xdx6a76sfrq0yciylvyjlnvyczszpadn31jqya8c2dzdkyyx7f"; + rev = "v0.4.4"; + sha256 = "14xmzcl608pr7hb7wng6hpz7by51cfnxlszbka3zhp3kk86ljsi6"; }; }; From 96f3c622afee15aff241763d2c1a14c65e2fb113 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 May 2020 14:16:47 +0200 Subject: [PATCH 049/310] github/CODEOWNERS: Add myself to updaters --- .github/CODEOWNERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7c39ce48a3fe..211779a470e3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -55,6 +55,13 @@ # NixOS integration test driver /nixos/lib/test-driver @tfc +# Updaters +## update.nix +/maintainers/scripts/update.nix @jtojnar +/maintainers/scripts/update.py @jtojnar +## common-updater-scripts +/pkgs/common-updater/scripts/update-source-version @jtojnar + # Python-related code and docs /maintainers/scripts/update-python-libraries @FRidh /pkgs/top-level/python-packages.nix @FRidh @jonringer From c8683da483b4595976c40b2e4e79a5ea13ee4994 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 May 2020 16:45:55 +0200 Subject: [PATCH 050/310] chrome-gnome-shell: clean up * format with nixpkgs-fmt * reorder attributes * inline version --- .../extensions/chrome-gnome-shell/default.nix | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 1e3815705cd3..ee0bb82b284a 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,29 +1,53 @@ -{stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: +{ stdenv +, fetchurl +, cmake +, ninja +, jq +, python3 +, gnome3 +, wrapGAppsHook +}: let - version = "10.1"; - inherit (python3.pkgs) python pygobject3 requests; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "chrome-gnome-shell"; - inherit version; + version = "10.1"; src = fetchurl { url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; }; - nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; - buildInputs = [ gnome3.gnome-shell python pygobject3 requests ]; + nativeBuildInputs = [ + cmake + ninja + jq + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.gnome-shell + python + pygobject3 + requests + ]; + + cmakeFlags = [ + "-DBUILD_EXTENSION=OFF" + ]; + + wrapPrefixVariables = [ + "PYTHONPATH" + ]; + + # cmake setup hook changes /etc/opt into /var/empty + dontFixCmake = true; preConfigure = '' substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" ''; - # cmake setup hook changes /etc/opt into /var/empty - dontFixCmake = true; - - cmakeFlags = [ "-DBUILD_EXTENSION=OFF" ]; - wrapPrefixVariables = [ "PYTHONPATH" ]; passthru = { updateScript = gnome3.updateScript { From 5df7471c149cb4f20bc1cf292dbb038b66404110 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 May 2020 16:48:47 +0200 Subject: [PATCH 051/310] chrome-gnome-shell: Fix missing introspection data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was crashing with: TypeError: gobject `__main__+ChromeGNOMEShell' doesn't support property `application_id' – that is the constructor of parent class Gio.Application does not recognize the kwarg. This is typically caused by missing pygobject overrides but I think ones for Gio are built-in into pygobject. Even weirder, adding just `${gobject-introspection}/lib/girepository-1.0` seems to fix the issue so it might be missing the whole typelib. But then why does not it fail when importing it? from gi.repository import GLib, Gio For now, I am adding the Gio typelib which should been done from the start but more debugging should be done since weirdness like this can bring more bugs. Fixes: https://github.com/NixOS/nixpkgs/issues/87740 --- .../desktops/gnome-3/extensions/chrome-gnome-shell/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index ee0bb82b284a..5308d4bee5ac 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -6,6 +6,7 @@ , python3 , gnome3 , wrapGAppsHook +, gobject-introspection }: let @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { ninja jq wrapGAppsHook + gobject-introspection # for setup-hook ]; buildInputs = [ @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { python pygobject3 requests + gobject-introspection # for Gio typelib ]; cmakeFlags = [ From 5629e60d711a3ad77c31a67133e17fa165269368 Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Wed, 13 May 2020 17:53:40 +0200 Subject: [PATCH 052/310] sane-airscan: 0.9.17 -> 0.99.0 --- .../graphics/sane/backends/airscan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix index 11529eee2107..75f4a466b27d 100644 --- a/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg +{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng , sane-backends, meson, ninja }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.9.17"; + version = "0.99.0"; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ avahi libsoup libjpeg sane-backends ]; + buildInputs = [ avahi libsoup libjpeg libpng sane-backends ]; src = fetchFromGitHub { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "03y0c1z5s3wbvxa9nvji62w42cmvcgm2sw72j7wm831995q3abmx"; + sha256 = "0bbw3s95v5fmkpmmd26v9cf1c40dm85bgxlhs06ski5my803ck0a"; }; meta = with lib; { From ea78c87cc8ac302e7d93276a00cc58251559366a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:19:33 -0300 Subject: [PATCH 053/310] enlightenment.efl: 1.24.0 -> 1.24.1 --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index bd6c0529925a..bd553018cd89 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk"; + sha256 = "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7"; }; nativeBuildInputs = [ From 44aa59741d8d2059cdf029c35fcdb0297d537540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:24:26 -0300 Subject: [PATCH 054/310] enlightenment.efl: remove SDL dependence in favor of SDL2 --- pkgs/desktops/enlightenment/efl.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index bd553018cd89..ab3c4bdd7688 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -3,7 +3,6 @@ , meson , ninja , pkgconfig -, SDL , SDL2 , alsaLib , avahi @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL avahi fontconfig freetype From e3af180aa5e3a9c02ced11336661083aaba81f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:30:13 -0300 Subject: [PATCH 055/310] enlightenment.efl: no python script depends on dbus-python --- pkgs/desktops/enlightenment/efl.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index ab3c4bdd7688..60e4d93c9431 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -121,7 +121,6 @@ stdenv.mkDerivation rec { luajit openjpeg poppler - python3Packages.dbus-python utillinux xorg.libXScrnSaver xorg.libXcomposite From a1ad2590f8340811ec347ccdc096046345e21931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:38:12 -0300 Subject: [PATCH 056/310] enlightenment.efl: evas loaders disabler defaults to json No need to mention it explicitly. --- pkgs/desktops/enlightenment/efl.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 60e4d93c9431..be025ead407c 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -144,9 +144,8 @@ stdenv.mkDerivation rec { "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working "-D drm=true" - "-D embedded-lz4=false" "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs - "-D evas-loaders-disabler=json" + "-D embedded-lz4=false" "-D fb=true" "-D opengl=full" "-D sdl=true" From 4e02f045b63bc44e0d0c625f8c923629f0178326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:44:41 -0300 Subject: [PATCH 057/310] enlightenment.efl: use the default tpe of OpenGL support: es-egl According to the Debian package full OpenGL is no longer supported on Linux. --- pkgs/desktops/enlightenment/efl.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index be025ead407c..cc66ee7e24a0 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -147,7 +147,6 @@ stdenv.mkDerivation rec { "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs "-D embedded-lz4=false" "-D fb=true" - "-D opengl=full" "-D sdl=true" ]; From 4a03e20b03f48d4554ff3aa465ccd4acd2eb5c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 14:24:04 -0300 Subject: [PATCH 058/310] enlightenment.efl: does not depend on libXp, libxkbfile and xcbutilkeysyms --- pkgs/desktops/enlightenment/efl.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index cc66ee7e24a0..c147766c2a0a 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -129,13 +129,10 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXi xorg.libXinerama - xorg.libXp xorg.libXrandr xorg.libXrender xorg.libXtst xorg.libxcb - xorg.libxkbfile - xorg.xcbutilkeysyms ]; dontDropIconThemeCache = true; From 6fc7c5b40115b060bd5037b70c5df878b15c2865 Mon Sep 17 00:00:00 2001 From: ysengrimm Date: Wed, 13 May 2020 20:21:21 +0200 Subject: [PATCH 059/310] mu: 1.4.3 -> 1.4.5 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 611e848b9af0..4cd5318acf5c 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg"; + sha256 = "18y672cqaicp30zymxr88spmzcn0x7rcv14nbdmd8hzp52rscpj7"; }; postPatch = stdenv.lib.optionalString (batchSize != null) '' From 9f3f8088ac6d343dbbc216cf03c6720ba937d581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 15:25:28 -0300 Subject: [PATCH 060/310] enlightenment.efl: avahi is not enabled by default --- pkgs/desktops/enlightenment/efl.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index c147766c2a0a..07443cfd7815 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -5,7 +5,6 @@ , pkgconfig , SDL2 , alsaLib -, avahi , bullet , check , curl @@ -70,7 +69,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - avahi fontconfig freetype giflib From 7bb9ae7be7e4c8e6f43e0af3bb8e5ff18f4be6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 15:29:34 -0300 Subject: [PATCH 061/310] enlightenment.efl: enable connman network backend Default is none. --- pkgs/desktops/enlightenment/efl.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 07443cfd7815..78f8f3966ed5 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -142,6 +142,7 @@ stdenv.mkDerivation rec { "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs "-D embedded-lz4=false" "-D fb=true" + "-D network-backend=connman" "-D sdl=true" ]; From 91234c6a887847ce5e5b315e01b4672023c0c54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 16:05:06 -0300 Subject: [PATCH 062/310] enlightenment.terminology: 1.6.0 -> 1.7.0 --- pkgs/desktops/enlightenment/terminology.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 205d133e1d29..3eff9292cb6c 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "terminology"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0xxx4xyhis6fy3frgb34ip0aj0kc4zashf60gzbxmq5gadbb0p5r"; + sha256 = "11qan2k6w94cglysh95yxkbv6hw9x15ri927hkiy3k0hbmpbrxc8"; }; nativeBuildInputs = [ From e413f4b5051a1aa08c6c5f74abaae35845bb8594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 16:35:17 -0300 Subject: [PATCH 063/310] arc-theme: format with nixpkgs-fmt --- pkgs/data/themes/arc/default.nix | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 14e1b248261a..a0747ae0e50a 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3, gnome3 -, gtk-engine-murrine, optipng, inkscape }: +{ stdenv +, fetchFromGitHub +, sassc +, autoreconfHook +, pkgconfig +, gtk3 +, gnome3 +, gtk-engine-murrine +, optipng +, inkscape +}: stdenv.mkDerivation rec { pname = "arc-theme"; version = "20200416"; src = fetchFromGitHub { - owner = "jnsh"; - repo = pname; - rev = "0779e1ca84141d8b443cf3e60b85307a145169b6"; + owner = "jnsh"; + repo = pname; + rev = "0779e1ca84141d8b443cf3e60b85307a145169b6"; sha256 = "1ddyi8g4rkd4mxadjvl66wc0lxpa4qdr98nbbhm5abaqfs2yldd4"; }; @@ -45,9 +54,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; - homepage = "https://github.com/jnsh/arc-theme"; - license = licenses.gpl3; + homepage = "https://github.com/jnsh/arc-theme"; + license = licenses.gpl3; + platforms = platforms.linux; maintainers = with maintainers; [ simonvandel romildo ]; - platforms = platforms.linux; }; } From e4db862d82479463e83e685d98719dd779e261f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 17:01:10 -0300 Subject: [PATCH 064/310] arc-theme: 20200416 -> 20200513 --- pkgs/data/themes/arc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index a0747ae0e50a..bff569bf528d 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20200416"; + version = "20200513"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; - rev = "0779e1ca84141d8b443cf3e60b85307a145169b6"; - sha256 = "1ddyi8g4rkd4mxadjvl66wc0lxpa4qdr98nbbhm5abaqfs2yldd4"; + rev = version; + sha256 = "1xiaf31v3j040hflhf09kpznc93a5fqs92m5jf79y46w3dgpia0p"; }; nativeBuildInputs = [ From d8da67f1e4f1b86b72de981bc53e893f9b7537a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 17:04:43 -0300 Subject: [PATCH 065/310] arc-theme: enable gnome shell --- pkgs/data/themes/arc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index bff569bf528d..9fba432656a7 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-gnome-shell" # 3.36 not supported + "--with-gnome-shell=${gnome3.gnome-shell.version}" "--disable-cinnamon" # not equipped to test "--disable-unity" ]; From 717656fd03ef561a9d6384c3702a16e4707547c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 18:13:16 -0300 Subject: [PATCH 066/310] balsa: format with nixpkgs-fmt --- .../networking/mailreaders/balsa/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 04d00a166aa8..5202606b9932 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -1,7 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, - webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme, - libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection, - wrapGAppsHook +{ stdenv +, fetchurl +, pkgconfig +, intltool +, glib +, gtk3 +, gmime +, gnutls +, webkitgtk +, libesmtp +, openssl +, libnotify +, gtkspell3 +, gpgme +, libcanberra-gtk3 +, libsecret +, gtksourceview +, gobject-introspection +, wrapGAppsHook }: stdenv.mkDerivation rec { From 7172181c3d0f4b305f38577107e1afb025ff5490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 18:17:05 -0300 Subject: [PATCH 067/310] balsa: sort dependence list --- .../networking/mailreaders/balsa/default.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 5202606b9932..bb4e16d17b6a 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -1,21 +1,21 @@ { stdenv , fetchurl -, pkgconfig -, intltool , glib -, gtk3 , gmime , gnutls -, webkitgtk -, libesmtp -, openssl -, libnotify -, gtkspell3 -, gpgme -, libcanberra-gtk3 -, libsecret -, gtksourceview , gobject-introspection +, gpgme +, gtk3 +, gtksourceview +, gtkspell3 +, intltool +, libcanberra-gtk3 +, libesmtp +, libnotify +, libsecret +, openssl +, pkgconfig +, webkitgtk , wrapGAppsHook }: @@ -37,18 +37,18 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 gmime gnutls - webkitgtk - openssl - libnotify - gtkspell3 gpgme - libcanberra-gtk3 + gtk3 gtksourceview - libsecret + gtkspell3 + libcanberra-gtk3 libesmtp + libnotify + libsecret + openssl + webkitgtk ]; configureFlags = [ From 58a93ee62d9cd318934993e7d88660ef1ad61490 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 11 May 2020 23:53:02 -0300 Subject: [PATCH 068/310] smallwm: init at 2020-02-28 --- .../services/x11/window-managers/default.nix | 1 + .../services/x11/window-managers/smallwm.nix | 25 ++++++++++++ .../window-managers/smallwm/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 66 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/smallwm.nix create mode 100644 pkgs/applications/window-managers/smallwm/default.nix diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index b815c5f16a1e..51096d804981 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -28,6 +28,7 @@ in ./notion.nix ./ratpoison.nix ./sawfish.nix + ./smallwm.nix ./stumpwm.nix ./spectrwm.nix ./tinywm.nix diff --git a/nixos/modules/services/x11/window-managers/smallwm.nix b/nixos/modules/services/x11/window-managers/smallwm.nix new file mode 100644 index 000000000000..091ba4f92b94 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/smallwm.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.smallwm; +in +{ + ###### interface + options = { + services.xserver.windowManager.smallwm.enable = mkEnableOption "smallwm"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "smallwm"; + start = '' + ${pkgs.smallwm}/bin/smallwm & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.smallwm ]; + }; +} diff --git a/pkgs/applications/window-managers/smallwm/default.nix b/pkgs/applications/window-managers/smallwm/default.nix new file mode 100644 index 000000000000..b6d3821e8d06 --- /dev/null +++ b/pkgs/applications/window-managers/smallwm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub +, doxygen, graphviz, libX11, libXrandr }: + +stdenv.mkDerivation rec { + + pname = "smallwm"; + version = "2020-02-28"; + + src = fetchFromGitHub { + owner = "adamnew123456"; + repo = "SmallWM"; + rev = "c2dc72afa87241bcf7e646630f4aae216ce78613"; + sha256 = "0cqhy81ymdcdyvgi55a401rr96h2akskcxi9ddzjbln4a71yjlz8"; + }; + + nativeBuildInputs = [ doxygen graphviz ]; + buildInputs = [ libX11 libXrandr ]; + + dontConfigure = true; + + makeFlags = [ "CC=${stdenv.cc}/bin/cc" "CXX=${stdenv.cc}/bin/c++" ]; + + buildFlags = [ "all" "doc" ]; + + installPhase = '' + install -dm755 $out/bin $out/share/doc/${pname}-${version} + install -m755 bin/smallwm -t $out/bin + cp -r README.markdown doc/html doc/latex $out/share/doc/${pname}-${version} + ''; + + meta = with stdenv.lib;{ + description = "A small X window manager, extended from tinywm"; + homepage = "https://github.com/adamnew123456/SmallWM"; + license = licenses.bsd2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f21ed5b6dce..6e394097bd6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19997,6 +19997,8 @@ in spectmorph = callPackage ../applications/audio/spectmorph { }; + smallwm = callPackage ../applications/window-managers/smallwm { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; From 6aeaa1019c5fca8876b8f9ab1845619d15d1ceaf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 12 May 2020 18:13:51 -0300 Subject: [PATCH 069/310] yeahwm: init at 0.3.5 yeahwm is a small window manager for X11, inspired by evilwm --- .../services/x11/window-managers/default.nix | 1 + .../services/x11/window-managers/yeahwm.nix | 25 ++++++++ .../window-managers/yeahwm/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 86 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/yeahwm.nix create mode 100644 pkgs/applications/window-managers/yeahwm/default.nix diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 51096d804981..af211e3b5349 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -36,6 +36,7 @@ in ./windowmaker.nix ./wmii.nix ./xmonad.nix + ./yeahwm.nix ./qtile.nix ./none.nix ]; diff --git a/nixos/modules/services/x11/window-managers/yeahwm.nix b/nixos/modules/services/x11/window-managers/yeahwm.nix new file mode 100644 index 000000000000..351bd7dfe48b --- /dev/null +++ b/nixos/modules/services/x11/window-managers/yeahwm.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.yeahwm; +in +{ + ###### interface + options = { + services.xserver.windowManager.yeahwm.enable = mkEnableOption "yeahwm"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "yeahwm"; + start = '' + ${pkgs.yeahwm}/bin/yeahwm & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.yeahwm ]; + }; +} diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix new file mode 100644 index 000000000000..a8323ff1d386 --- /dev/null +++ b/pkgs/applications/window-managers/yeahwm/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl +, lesstif +, libX11, libXext, libXmu, libXinerama }: + +stdenv.mkDerivation rec { + + pname = "yeahwm"; + version = "0.3.5"; + + src = fetchurl { + url = "http://phrat.de/${pname}_${version}.tar.gz"; + sha256 = "01gfzjvb40n16m2ja4238nk08k4l203y6a61cydqvf68924fjb69"; + }; + + buildInputs = [ lesstif libX11 libXext libXinerama libXmu ]; + + dontConfigure = true; + + preBuild = '' + makeFlagsArray+=( CC="${stdenv.cc}/bin/cc" \ + XROOT="${libX11}" \ + INCLUDES="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXinerama.dev}/include -I${libXmu.dev}/include" \ + LDPATH="-L${libX11}/lib -L${libXext}/lib -L${libXinerama}/lib -L${libXmu}/lib" \ + prefix="${placeholder "out"}" ) + ''; + + postInstall = '' + gzip -9 --stdout yeahwm.1 > yeahwm.1.gz + install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/ + ''; + + meta = with stdenv.lib;{ + description = "An X window manager based on evilwm and aewm"; + longDescription = '' + YeahWM is a h* window manager for X based on evilwm and aewm. + + Features + - Sloppy Focus. + - BeOS-like tabbed titles, which can be repositioned. + - Support for Xinerama. + - Simple Appearance. + - Good keyboard control. + - Creative usage of the mouse. + - Respects aspect size hints. + - Solid resize and move operations. + - Virtual Desktops. + - "Magic" Screen edges for desktop switching. + - Snapping to other windows and screen borders when moving windows. + - Small binary size(ca. 23kb). + - Little resource usage. + - It's slick. + ''; + homepage = "http://phrat.de/index.html"; + license = licenses.isc; + maintainers = [ maintainers.AndersonTorres ]; + platforms = libX11.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e394097bd6b..93cc914b5837 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22536,6 +22536,8 @@ in vwm = callPackage ../applications/window-managers/vwm { }; + yeahwm = callPackage ../applications/window-managers/yeahwm { }; + vym = qt5.callPackage ../applications/misc/vym { }; waon = callPackage ../applications/audio/waon { }; From 43ce2a52199100976b18e95c731a2b7879db8091 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 12 May 2020 21:53:59 -0300 Subject: [PATCH 070/310] berry: init at 0.1.5 berry is a small window manager for X11 --- .../services/x11/window-managers/berry.nix | 25 ++++++++++ .../services/x11/window-managers/default.nix | 1 + .../window-managers/berry/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 75 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/berry.nix create mode 100644 pkgs/applications/window-managers/berry/default.nix diff --git a/nixos/modules/services/x11/window-managers/berry.nix b/nixos/modules/services/x11/window-managers/berry.nix new file mode 100644 index 000000000000..0d2285e7a60e --- /dev/null +++ b/nixos/modules/services/x11/window-managers/berry.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.berry; +in +{ + ###### interface + options = { + services.xserver.windowManager.berry.enable = mkEnableOption "berry"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "berry"; + start = '' + ${pkgs.berry}/bin/berry & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.berry ]; + }; +} diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index af211e3b5349..c8af8fdc29a4 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -10,6 +10,7 @@ in imports = [ ./2bwm.nix ./afterstep.nix + ./berry.nix ./bspwm.nix ./cwm.nix ./dwm.nix diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix new file mode 100644 index 000000000000..2a41a3d3c073 --- /dev/null +++ b/pkgs/applications/window-managers/berry/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub +, libX11, libXft, libXinerama, fontconfig, freetype }: + +stdenv.mkDerivation rec { + pname = "berry"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "JLErvin"; + repo = "berry"; + rev = version; + sha256 = "1wxbjzpwqb9x7vd7kb095fiqj271rki980dnwcxjxpqlmmrmjzyl"; + }; + + buildInputs = [ libX11 libXft libXinerama fontconfig freetype ]; + + preBuild = '' + makeFlagsArray+=( PREFIX="${placeholder "out"}" + X11INC="${libX11.dev}/include" + X11LIB="${libX11}/lib" + XINERAMALIBS="-lXinerama" + XINERAMAFLAGS="-DXINERAMA" + FREETYPELIBS="-lfontconfig -lXft" + FREETYPEINC="${freetype.dev}/include/freetype2" ) + ''; + + meta = with stdenv.lib; { + description = "A healthy, bite-sized window manager"; + longDescription = '' + berry is a healthy, bite-sized window manager written in C for unix + systems. Its main features include: + + - Controlled via a powerful command-line client, allowing users to control + windows via a hotkey daemon such as sxhkd or expand functionality via + shell scripts. + - Small, hackable source code. + - Extensible themeing options with double borders, title bars, and window + text. + - Intuitively place new windows in unoccupied spaces. + - Virtual desktops. + ''; + homepage = "https://berrywm.org/"; + license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93cc914b5837..cdd7d348e492 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18675,6 +18675,8 @@ in bb = callPackage ../applications/misc/bb { }; + berry = callPackage ../applications/window-managers/berry { }; + bevelbar = callPackage ../applications/window-managers/bevelbar { }; bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; From 1c2c0b2eb8ead11d06bd840e9a1d6b4d1f86d49e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 13 May 2020 01:26:41 -0300 Subject: [PATCH 071/310] lwm: init at 1.2.4 lwm is a lightweight window manager --- .../services/x11/window-managers/default.nix | 1 + .../services/x11/window-managers/lwm.nix | 25 +++++++++++ .../window-managers/lwm/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 73 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/lwm.nix create mode 100644 pkgs/applications/window-managers/lwm/default.nix diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index c8af8fdc29a4..87702c58727a 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -22,6 +22,7 @@ in ./i3.nix ./jwm.nix ./leftwm.nix + ./lwm.nix ./metacity.nix ./mwm.nix ./openbox.nix diff --git a/nixos/modules/services/x11/window-managers/lwm.nix b/nixos/modules/services/x11/window-managers/lwm.nix new file mode 100644 index 000000000000..e2aa062fd13b --- /dev/null +++ b/nixos/modules/services/x11/window-managers/lwm.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.lwm; +in +{ + ###### interface + options = { + services.xserver.windowManager.lwm.enable = mkEnableOption "lwm"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "lwm"; + start = '' + ${pkgs.lwm}/bin/lwm & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.lwm ]; + }; +} diff --git a/pkgs/applications/window-managers/lwm/default.nix b/pkgs/applications/window-managers/lwm/default.nix new file mode 100644 index 000000000000..49cdc81b9ce0 --- /dev/null +++ b/pkgs/applications/window-managers/lwm/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl +, imake, libX11, libSM, libXext, libICE }: + +stdenv.mkDerivation rec { + pname = "lwm"; + version = "1.2.4"; + + src = fetchurl { + url = "http://www.jfc.org.uk/files/lwm/${pname}-${version}.tar.gz"; + sha256 = "1bcdr173f0gl61fyl43p3gr145angci7lvjqb8rl00y9f9amvh3y"; + }; + + nativeBuildInputs = [ imake ]; + + buildInputs = [ libX11 libSM libXext libICE ]; + + dontConfigure = true; + + preBuild = '' + sed -i 's|^LOCAL_LIBRARIES.*|& $(ICELIB)|' Imakefile + xmkmf + ''; + + installPhase = '' + install -dm755 $out/bin $out/share/man/man1 + install -m755 lwm $out/bin/lwm + install -m644 lwm.man $out/share/man/man1/lwm.1 + ''; + + meta = with stdenv.lib; { + description = "Lightweight Window Manager"; + longDescription = '' + lwm is a window manager for X that tries to keep out of your face. There + are no icons, no button bars, no icon docks, no root menus, no nothing: if + you want all that, then other programs can provide it. There's no + configurability either: if you want that, you want a different window + manager; one that helps your operating system in its evil conquest of your + disc space and its annexation of your physical memory. + ''; + homepage = "http://www.jfc.org.uk/software/lwm.html"; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdd7d348e492..ef1fe6ead6e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19978,6 +19978,8 @@ in leftwm = callPackage ../applications/window-managers/leftwm { }; + lwm = callPackage ../applications/window-managers/lwm { }; + musikcube = callPackage ../applications/audio/musikcube {}; pinboard-notes-backup = haskell.lib.overrideCabal From d56c2a0b24ae92cdab3c19f054ae15e743ec376c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 18:12:22 -0300 Subject: [PATCH 072/310] balsa: 2.5.9 -> 2.6.1 Remove --with-gpgme as gpg is fixed build requirement now. --- .../networking/mailreaders/balsa/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index bb4e16d17b6a..055aa15b2ec8 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , glib -, gmime +, gmime3 , gnutls , gobject-introspection , gpgme @@ -11,6 +11,7 @@ , intltool , libcanberra-gtk3 , libesmtp +, libical , libnotify , libsecret , openssl @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "balsa"; - version = "2.5.9"; + version = "2.6.1"; src = fetchurl { url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2"; - sha256 = "19gs1qfvbk9qx4rjmgrmvid00kl9k153zjjx8zjii2lz09w7g19i"; + sha256 = "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4"; }; nativeBuildInputs = [ @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gmime + gmime3 gnutls gpgme gtk3 @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { gtkspell3 libcanberra-gtk3 libesmtp + libical libnotify libsecret openssl @@ -53,7 +55,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-canberra" - "--with-gpgme" "--with-gtksourceview" "--with-libsecret" "--with-ssl" From 150a18f9b93fc9c509d9b5e7ab24c5ce95cff802 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 14 May 2020 00:30:31 -0400 Subject: [PATCH 073/310] mu: fix on darwin --- pkgs/tools/networking/mu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 4cd5318acf5c..98dec71f456b 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -21,8 +21,11 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - sqlite xapian glib gmime3 texinfo emacs guile libsoup icu - ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; + sqlite xapian glib gmime3 texinfo emacs libsoup icu + ] + # Workaround for https://github.com/djcb/mu/issues/1641 + ++ stdenv.lib.optional (!stdenv.isDarwin) guile + ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; From 9761128d2da7bf4d878982918242e43ae28f9b94 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 29 Apr 2020 23:08:21 -0400 Subject: [PATCH 074/310] go-modules: Augment builds w/ vendor src This is done in response to complaints that the module format is not human readable. The vendor source blob is flat files and should be extremely readable. --- .../go-modules/generic/default.nix | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 42b446b9fa86..dc4958bfadd9 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -13,12 +13,15 @@ # path to go.mod and go.sum directory , modRoot ? "./" -# modSha256 is the sha256 of the vendored dependencies +# vendorSha256 is the sha256 of the vendored dependencies # -# CAUTION: if `null` is used as a value, the derivation won't be a -# fixed-output derivation but disable the build sandbox instead. Don't use -# this in nixpkgs as Hydra won't build those packages. -, modSha256 +# if vendorSha256 is null, then we won't fetch any dependencies and +# rely on the vendor folder within the source. +, vendorSha256 ? null +# Whether to delete the vendor folder supplied with the source. +, deleteVendor ? false + +, modSha256 ? null # We want parallel builds by default , enableParallelBuilding ? true @@ -37,21 +40,26 @@ with builtins; let - args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ]; + args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ]; removeReferences = [ ] ++ lib.optional (!allowGoReference) go; removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; - go-modules = go.stdenv.mkDerivation (let modArgs = { + deleteFlag = if deleteVendor then "true" else "false"; + + go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = { + name = "${name}-go-modules"; - nativeBuildInputs = [ go git cacert ]; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ go git cacert ]; inherit (args) src; inherit (go) GOOS GOARCH; patches = args.patches or []; + preBuild = args.preBuild or ""; + sourceRoot = args.sourceRoot or ""; GO111MODULE = "on"; @@ -64,7 +72,6 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" - mkdir -p "''${GOPATH}/pkg/mod/cache/download" cd "${modRoot}" runHook postConfigure ''; @@ -72,7 +79,16 @@ let buildPhase = args.modBuildPhase or '' runHook preBuild - go mod download + if [ ${deleteFlag} == "true" ]; then + rm -rf vendor + fi + + if [ -e vendor ]; then + echo "vendor folder exists, please set 'vendorSha256=null;' or 'deleteVendor=true;' in your expression" + exit 10 + fi + go mod vendor + mkdir -p vendor runHook postBuild ''; @@ -81,23 +97,19 @@ let runHook preInstall # remove cached lookup results and tiles - rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb" - cp -r "''${GOPATH}/pkg/mod/cache/download" $out + cp -r --reflink=auto vendor $out runHook postInstall ''; dontFixup = true; }; in modArgs // ( - if modSha256 == null then - { __noChroot = true; } - else { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = modSha256; + outputHash = vendorSha256; } - ) // overrideModAttrs modArgs); + ) // overrideModAttrs modArgs) else ""; package = go.stdenv.mkDerivation (args // { nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; @@ -105,6 +117,7 @@ let inherit (go) GOOS GOARCH; GO111MODULE = "on"; + GOFLAGS = "-mod=vendor"; configurePhase = args.configurePhase or '' runHook preConfigure @@ -112,9 +125,12 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" export GOSUMDB=off - export GOPROXY=file://${go-modules} - + export GOPROXY=off cd "$modRoot" + if [ -n "${go-modules}" ]; then + rm -rf vendor + ln -s ${go-modules} vendor + fi runHook postConfigure ''; @@ -212,7 +228,7 @@ let disallowedReferences = lib.optional (!allowGoReference) go; - passthru = passthru // { inherit go go-modules modSha256; }; + passthru = passthru // { inherit go go-modules vendorSha256 ; }; meta = { # Add default meta information @@ -225,5 +241,7 @@ let }); in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" +else if modSha256 != null then + throw "${package.name} should use vendorSha256 not modSha256" else package From c5f18c44b14eb9b0834cb4633339c321d1f73223 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Thu, 7 May 2020 23:13:49 -0400 Subject: [PATCH 075/310] go-modules: Doc updates --- doc/languages-frameworks/go.xml | 14 +++++++------- nixos/doc/manual/release-notes/rl-2009.xml | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 70c135555ea4..ff39276f640e 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -36,7 +36,7 @@ pet = buildGoModule rec { sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; }; - modSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; + vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; subPackages = [ "." ]; @@ -56,7 +56,7 @@ pet = buildGoModule rec { - modSha256 is the hash of the output of the intermediate fetcher derivation. + vendorSha256 is the hash of the output of the intermediate fetcher derivation. @@ -68,12 +68,12 @@ pet = buildGoModule rec { - modSha256 can also take null as an input. + vendorSha256 can also take null as an input. - When `null` is used as a value, the derivation won't be a - fixed-output derivation but disable the build sandbox instead. This can be useful outside - of nixpkgs where re-generating the modSha256 on each mod.sum changes is cumbersome, - but will fail to build by Hydra, as builds with a disabled sandbox are discouraged. + When `null` is used as a value, rather than fetching the dependencies + and vendoring them, we use the vendoring included within the source repo. + If you'd like to not have to update this field on dependency changes, + run `go mod vendor` in your source repo and set 'vendorSha256 = null;' diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 5b1d04e4bc16..315a2eaeacb6 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -98,6 +98,13 @@ + + + The go-modules builder now uses vendorSha256 instead of modSha256 to pin + fetched version data. This is currently a warning, but will be removed in the next release. + + + Grafana is now built without support for phantomjs by default. Phantomjs support has been From a0ddea1d6a9f07b0631e0dbcd3b7240d2eb82ef7 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Sat, 2 May 2020 02:22:14 -0400 Subject: [PATCH 076/310] go-modules: Add in old modsha256 w/ warning --- .../go-modules/generic/default.nix | 3 +- pkgs/development/go-modules/generic/old.nix | 229 ++++++++++++++++++ 2 files changed, 231 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/go-modules/generic/old.nix diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index dc4958bfadd9..9baeefe1b2cb 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -242,6 +242,7 @@ let in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" else if modSha256 != null then - throw "${package.name} should use vendorSha256 not modSha256" + lib.warn "modSha256 is deprecated and will be removed in the next release (20.09), use vendorSha256 instead" ( + import ./old.nix { inherit go cacert git lib removeReferencesTo stdenv; } args') else package diff --git a/pkgs/development/go-modules/generic/old.nix b/pkgs/development/go-modules/generic/old.nix new file mode 100644 index 000000000000..42b446b9fa86 --- /dev/null +++ b/pkgs/development/go-modules/generic/old.nix @@ -0,0 +1,229 @@ +{ go, cacert, git, lib, removeReferencesTo, stdenv }: + +{ name ? "${args'.pname}-${args'.version}" +, src +, buildInputs ? [] +, nativeBuildInputs ? [] +, passthru ? {} +, patches ? [] + +# A function to override the go-modules derivation +, overrideModAttrs ? (_oldAttrs : {}) + +# path to go.mod and go.sum directory +, modRoot ? "./" + +# modSha256 is the sha256 of the vendored dependencies +# +# CAUTION: if `null` is used as a value, the derivation won't be a +# fixed-output derivation but disable the build sandbox instead. Don't use +# this in nixpkgs as Hydra won't build those packages. +, modSha256 + +# We want parallel builds by default +, enableParallelBuilding ? true + +# Disabled flag +, disabled ? false + +# Do not enable this without good reason +# IE: programs coupled with the compiler +, allowGoReference ? false + +, meta ? {} + +, ... }@args': + +with builtins; + +let + args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ]; + + removeReferences = [ ] ++ lib.optional (!allowGoReference) go; + + removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; + + go-modules = go.stdenv.mkDerivation (let modArgs = { + name = "${name}-go-modules"; + + nativeBuildInputs = [ go git cacert ]; + + inherit (args) src; + inherit (go) GOOS GOARCH; + + patches = args.patches or []; + + GO111MODULE = "on"; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; + + configurePhase = args.modConfigurePhase or '' + runHook preConfigure + + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + mkdir -p "''${GOPATH}/pkg/mod/cache/download" + cd "${modRoot}" + runHook postConfigure + ''; + + buildPhase = args.modBuildPhase or '' + runHook preBuild + + go mod download + + runHook postBuild + ''; + + installPhase = args.modInstallPhase or '' + runHook preInstall + + # remove cached lookup results and tiles + rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb" + cp -r "''${GOPATH}/pkg/mod/cache/download" $out + + runHook postInstall + ''; + + dontFixup = true; + }; in modArgs // ( + if modSha256 == null then + { __noChroot = true; } + else + { + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = modSha256; + } + ) // overrideModAttrs modArgs); + + package = go.stdenv.mkDerivation (args // { + nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; + + inherit (go) GOOS GOARCH; + + GO111MODULE = "on"; + + configurePhase = args.configurePhase or '' + runHook preConfigure + + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + export GOSUMDB=off + export GOPROXY=file://${go-modules} + + cd "$modRoot" + + runHook postConfigure + ''; + + buildPhase = args.buildPhase or '' + runHook preBuild + + buildGoDir() { + local d; local cmd; + cmd="$1" + d="$2" + . $TMPDIR/buildFlagsArray + echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0 + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 + local OUT + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then + if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then + echo "$OUT" >&2 + return 1 + fi + fi + if [ -n "$OUT" ]; then + echo "$OUT" >&2 + fi + return 0 + } + + getGoDirs() { + local type; + type="$1" + if [ -n "$subPackages" ]; then + echo "$subPackages" | sed "s,\(^\| \),\1./,g" + else + find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique + fi + } + + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + buildFlagsArray+=(-x) + fi + + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then + declare -p buildFlagsArray > $TMPDIR/buildFlagsArray + else + touch $TMPDIR/buildFlagsArray + fi + if [ -z "$enableParallelBuilding" ]; then + export NIX_BUILD_CORES=1 + fi + for pkg in $(getGoDirs ""); do + echo "Building subPackage $pkg" + buildGoDir install "$pkg" + done + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # normalize cross-compiled builds w.r.t. native builds + ( + dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH} + if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then + mv $dir/* $dir/.. + fi + if [[ -d $dir ]]; then + rmdir $dir + fi + ) + '' + '' + runHook postBuild + ''; + + doCheck = args.doCheck or false; + checkPhase = args.checkPhase or '' + runHook preCheck + + for pkg in $(getGoDirs test); do + buildGoDir test "$pkg" + done + + runHook postCheck + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + mkdir -p $out + dir="$GOPATH/bin" + [ -e "$dir" ] && cp -r $dir $out + + runHook postInstall + ''; + + preFixup = (args.preFixup or "") + '' + find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + ''; + + strictDeps = true; + + disallowedReferences = lib.optional (!allowGoReference) go; + + passthru = passthru // { inherit go go-modules modSha256; }; + + meta = { + # Add default meta information + platforms = go.meta.platforms or lib.platforms.all; + } // meta // { + # add an extra maintainer to every package + maintainers = (meta.maintainers or []) ++ + [ lib.maintainers.kalbasit ]; + }; + }); +in if disabled then + throw "${package.name} not supported for go ${go.meta.branch}" +else + package From d6162dab509ababe7c3ce83c17a3ef63855e0832 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Thu, 30 Apr 2020 21:59:00 -0400 Subject: [PATCH 077/310] go-modules: Update files to use vendorSha256 --- pkgs/applications/blockchains/go-ethereum.nix | 16 +- pkgs/applications/blockchains/lnd.nix | 4 +- pkgs/applications/editors/glow/default.nix | 4 +- pkgs/applications/graphics/pdfcpu/default.nix | 5 +- pkgs/applications/misc/archiver/default.nix | 4 +- pkgs/applications/misc/cheat/default.nix | 2 +- pkgs/applications/misc/exercism/default.nix | 4 +- .../applications/misc/geoipupdate/default.nix | 4 +- pkgs/applications/misc/gomatrix/default.nix | 4 +- pkgs/applications/misc/hugo/default.nix | 20 +- pkgs/applications/misc/sampler/default.nix | 4 +- .../misc/terminal-parrot/default.nix | 4 +- pkgs/applications/misc/todoist/default.nix | 4 +- pkgs/applications/misc/wtf/default.nix | 4 +- .../networking/cloudflared/default.nix | 5 +- .../networking/cluster/argo/default.nix | 4 +- .../networking/cluster/argocd/default.nix | 4 +- .../networking/cluster/atlantis/default.nix | 4 +- .../cluster/docker-machine/hyperkit.nix | 4 +- .../cluster/docker-machine/kvm2.nix | 4 +- .../networking/cluster/fluxctl/default.nix | 4 +- .../networking/cluster/helm/default.nix | 4 +- .../networking/cluster/helmfile/default.nix | 4 +- .../networking/cluster/helmsman/default.nix | 2 +- .../cluster/hetzner-kube/default.nix | 4 +- .../networking/cluster/jx/gomod.patch | 186 ++ .../networking/cluster/k9s/default.nix | 4 +- .../networking/cluster/kube3d/default.nix | 4 +- .../networking/cluster/kubeseal/default.nix | 4 +- .../networking/cluster/kubeval/default.nix | 4 +- .../networking/cluster/linkerd/default.nix | 10 +- .../networking/cluster/minikube/default.nix | 2 +- .../cluster/node-problem-detector/default.nix | 11 +- .../networking/cluster/prow/default.nix | 4 +- .../networking/cluster/qbec/default.nix | 4 +- .../elasticsearch/default.nix | 4 +- .../terraform-providers/lxd/default.nix | 4 +- .../terraform-providers/vpsadmin/default.nix | 4 +- .../networking/cluster/terragrunt/default.nix | 4 +- .../networking/gmailctl/default.nix | 5 +- .../networking/hydroxide/default.nix | 4 +- .../instant-messengers/gomuks/default.nix | 5 +- .../instant-messengers/gomuks/gomod.patch | 20 + .../networking/ipfs-cluster/default.nix | 5 +- .../networking/ipfs-migrator/default.nix | 4 +- .../networking/mailreaders/aerc/default.nix | 19 +- .../mailreaders/hasmail/default.nix | 4 +- .../networking/p2p/magnetico/default.nix | 4 +- .../networking/syncthing/default.nix | 4 +- .../networking/websocketd/default.nix | 4 +- .../git-and-tools/gh/default.nix | 4 +- .../git-and-tools/ghq/default.nix | 4 +- .../git-and-tools/git-bug/default.nix | 4 +- .../git-and-tools/git-subtrac/default.nix | 4 +- .../git-and-tools/lab/default.nix | 4 +- .../git-and-tools/lefthook/default.nix | 4 +- .../version-management/sourcehut/builds.nix | 4 +- .../version-management/sourcehut/git.nix | 10 +- .../virtualization/firectl/default.nix | 6 +- .../virtualization/firectl/gomod.patch | 15 + .../virtualization/gvisor/containerd-shim.nix | 4 +- .../compilers/go-jsonnet/default.nix | 4 +- pkgs/development/compilers/tinygo/default.nix | 18 +- pkgs/development/compilers/tinygo/go.mod | 13 + pkgs/development/compilers/tinygo/main.go | 18 + .../interpreters/joker/default.nix | 4 +- pkgs/development/libraries/packr/default.nix | 6 +- .../libraries/protolock/default.nix | 4 +- .../tools/analysis/tflint/default.nix | 4 +- pkgs/development/tools/azcopy/default.nix | 4 +- .../tools/bazel-gazelle/default.nix | 4 +- pkgs/development/tools/bazelisk/default.nix | 6 +- pkgs/development/tools/bazelisk/gomod.patch | 12 + .../tools/build-managers/mage/default.nix | 4 +- pkgs/development/tools/conftest/default.nix | 4 +- .../drone-cli/default.nix | 4 +- .../continuous-integration/drone/default.nix | 4 +- .../continuous-integration/fly/default.nix | 4 +- pkgs/development/tools/cue/default.nix | 4 +- .../tools/database/dbmate/default.nix | 4 +- pkgs/development/tools/dive/default.nix | 4 +- .../development/tools/go-protobuf/default.nix | 4 +- pkgs/development/tools/go-tools/default.nix | 4 +- pkgs/development/tools/godef/default.nix | 4 +- pkgs/development/tools/gofumpt/default.nix | 4 +- pkgs/development/tools/gogetdoc/default.nix | 4 +- .../tools/golangci-lint/default.nix | 2 +- .../tools/gomodifytags/default.nix | 4 +- pkgs/development/tools/gopkgs/default.nix | 4 +- pkgs/development/tools/gopls/default.nix | 4 +- pkgs/development/tools/gotestsum/default.nix | 4 +- pkgs/development/tools/gotools/default.nix | 4 +- pkgs/development/tools/hcloud/default.nix | 4 +- pkgs/development/tools/kcli/default.nix | 4 +- pkgs/development/tools/kind/default.nix | 2 +- pkgs/development/tools/kubeprompt/default.nix | 4 +- pkgs/development/tools/kustomize/default.nix | 4 +- pkgs/development/tools/misc/act/default.nix | 4 +- .../tools/misc/circleci-cli/default.nix | 4 +- .../misc/editorconfig-checker/default.nix | 4 +- .../misc/go-license-detector/default.nix | 4 +- .../development/tools/misc/mkcert/default.nix | 4 +- .../tools/misc/reviewdog/default.nix | 2 +- .../tools/misc/terracognita/default.nix | 4 +- pkgs/development/tools/mod/default.nix | 4 +- pkgs/development/tools/packet-cli/default.nix | 4 +- pkgs/development/tools/pet/default.nix | 4 +- .../tools/proto-contrib/default.nix | 4 +- .../tools/protoc-gen-doc/default.nix | 4 +- pkgs/development/tools/prototool/default.nix | 4 +- pkgs/development/tools/reftools/default.nix | 4 +- pkgs/development/tools/renderizer/default.nix | 4 +- pkgs/development/tools/richgo/default.nix | 4 +- pkgs/development/tools/run/default.nix | 4 +- pkgs/development/tools/yq-go/default.nix | 4 +- pkgs/development/web/flyctl/default.nix | 5 +- pkgs/development/web/minify/default.nix | 4 +- pkgs/os-specific/darwin/smimesign/default.nix | 2 +- pkgs/os-specific/linux/fscrypt/default.nix | 4 +- pkgs/servers/blockbook/default.nix | 16 +- pkgs/servers/caddy/default.nix | 4 +- pkgs/servers/caddy/v2.nix | 3 +- pkgs/servers/consul/default.nix | 3 +- pkgs/servers/dns/coredns/default.nix | 4 +- pkgs/servers/documize-community/default.nix | 15 +- pkgs/servers/documize-community/vendor.patch | 2392 +++++++++++++++++ pkgs/servers/echoip/default.nix | 4 +- pkgs/servers/gobetween/default.nix | 24 +- pkgs/servers/gobetween/gomod.patch | 21 + pkgs/servers/gortr/default.nix | 4 +- pkgs/servers/gotify/default.nix | 2 +- pkgs/servers/gotify/mod-sha.nix | 1 - pkgs/servers/hasura/cli.nix | 4 +- pkgs/servers/imgproxy/default.nix | 4 +- pkgs/servers/matterbridge/default.nix | 4 +- pkgs/servers/mautrix-whatsapp/default.nix | 19 +- pkgs/servers/minio/default.nix | 4 +- pkgs/servers/monitoring/do-agent/default.nix | 4 +- pkgs/servers/monitoring/mtail/default.nix | 4 +- .../prometheus/dnsmasq-exporter.nix | 4 +- .../prometheus/mikrotik-exporter.nix | 4 +- .../prometheus/varnish-exporter.nix | 4 +- pkgs/servers/monitoring/sensu-go/default.nix | 4 +- pkgs/servers/monitoring/telegraf/default.nix | 4 +- pkgs/servers/monitoring/thanos/default.nix | 4 +- pkgs/servers/nosql/influxdb/default.nix | 4 +- pkgs/servers/sql/dolt/default.nix | 4 +- pkgs/servers/tailscale/default.nix | 11 +- pkgs/servers/traefik/default.nix | 4 +- pkgs/servers/web-apps/shiori/default.nix | 4 +- pkgs/shells/elvish/default.nix | 4 +- pkgs/shells/zsh/antibody/default.nix | 4 +- pkgs/shells/zsh/zsh-history/default.nix | 4 +- pkgs/tools/admin/aws-vault/default.nix | 4 +- pkgs/tools/admin/awsweeper/default.nix | 10 +- pkgs/tools/admin/berglas/default.nix | 4 +- pkgs/tools/admin/certigo/default.nix | 4 +- pkgs/tools/admin/clair/default.nix | 4 +- pkgs/tools/admin/eksctl/default.nix | 2 +- pkgs/tools/admin/iamy/default.nix | 4 +- pkgs/tools/admin/lego/default.nix | 2 +- pkgs/tools/audio/mpd-mpris/default.nix | 5 +- pkgs/tools/backup/wal-g/default.nix | 4 +- pkgs/tools/misc/3mux/default.nix | 4 +- pkgs/tools/misc/chezmoi/default.nix | 4 +- pkgs/tools/misc/clipman/default.nix | 4 +- pkgs/tools/misc/docui/default.nix | 4 +- pkgs/tools/misc/fzf/default.nix | 4 +- pkgs/tools/misc/gotify-cli/default.nix | 4 +- pkgs/tools/misc/kepubify/default.nix | 4 +- pkgs/tools/misc/lf/default.nix | 4 +- pkgs/tools/misc/libgen-cli/default.nix | 4 +- pkgs/tools/misc/mutagen/default.nix | 4 +- pkgs/tools/misc/neo-cowsay/default.nix | 4 +- pkgs/tools/misc/pg_flame/default.nix | 4 +- pkgs/tools/misc/pgcenter/default.nix | 4 +- pkgs/tools/misc/pgmetrics/default.nix | 4 +- pkgs/tools/misc/pistol/default.nix | 5 +- pkgs/tools/misc/powerline-go/default.nix | 4 +- pkgs/tools/misc/up/default.nix | 6 +- pkgs/tools/misc/up/gomod.patch | 23 + pkgs/tools/networking/amass/default.nix | 2 +- pkgs/tools/networking/cassowary/default.nix | 4 +- pkgs/tools/networking/clash/default.nix | 4 +- pkgs/tools/networking/corerad/default.nix | 4 +- pkgs/tools/networking/croc/default.nix | 4 +- pkgs/tools/networking/curlie/default.nix | 4 +- pkgs/tools/networking/dnsproxy/default.nix | 4 +- pkgs/tools/networking/frp/default.nix | 4 +- pkgs/tools/networking/grpcui/default.nix | 4 +- pkgs/tools/networking/hey/default.nix | 4 +- .../tools/networking/minio-client/default.nix | 4 +- pkgs/tools/networking/nebula/default.nix | 4 +- pkgs/tools/networking/obfs4/default.nix | 4 +- pkgs/tools/networking/pixiecore/default.nix | 4 +- pkgs/tools/networking/shadowfox/default.nix | 4 +- pkgs/tools/networking/tendermint/default.nix | 4 +- pkgs/tools/networking/termshark/default.nix | 4 +- pkgs/tools/networking/v2ray/generic.nix | 4 +- pkgs/tools/networking/yggdrasil/default.nix | 4 +- .../mynewt-newt/default.nix | 4 +- .../tools/package-management/nfpm/default.nix | 4 +- pkgs/tools/security/age/default.nix | 4 +- pkgs/tools/security/bettercap/default.nix | 4 +- pkgs/tools/security/browserpass/default.nix | 4 +- pkgs/tools/security/gobuster/default.nix | 4 +- pkgs/tools/security/gopass/default.nix | 4 +- pkgs/tools/security/saml2aws/default.nix | 17 +- pkgs/tools/security/sops/default.nix | 4 +- pkgs/tools/system/ctop/default.nix | 4 +- pkgs/tools/system/gotop/default.nix | 4 +- pkgs/tools/system/jump/default.nix | 4 +- pkgs/tools/system/netdata/go.d.plugin.nix | 4 +- pkgs/tools/text/gjo/default.nix | 5 +- pkgs/tools/text/shfmt/default.nix | 4 +- 215 files changed, 3251 insertions(+), 423 deletions(-) create mode 100644 pkgs/applications/networking/cluster/jx/gomod.patch create mode 100644 pkgs/applications/networking/instant-messengers/gomuks/gomod.patch create mode 100644 pkgs/applications/virtualization/firectl/gomod.patch create mode 100644 pkgs/development/compilers/tinygo/go.mod create mode 100644 pkgs/development/compilers/tinygo/main.go create mode 100644 pkgs/development/tools/bazelisk/gomod.patch create mode 100644 pkgs/servers/documize-community/vendor.patch create mode 100644 pkgs/servers/gobetween/gomod.patch delete mode 100644 pkgs/servers/gotify/mod-sha.nix create mode 100644 pkgs/tools/misc/up/gomod.patch diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 6a443571d0f2..15583d0a1efd 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -11,7 +11,21 @@ buildGoModule rec { sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425"; }; - modSha256 = "07xrw3fivfpbkg4mp8ghrj1bishfas82dbd780fymgs2h74iigf3"; + usb = fetchFromGitHub { + owner = "karalabe"; + repo = "usb"; + rev = "911d15fe12a9c411cf5d0dd5635231c759399bed"; + sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; + }; + + vendorSha256 = "12aw8b8ci7nssidh1yz8d2hk43csdacq5jca9y70rjakpl3zndsz"; + + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${usb}/libusb vendor/github.com/karalabe/usb + cp -r --reflink=auto ${usb}/hidapi vendor/github.com/karalabe/usb + ''; + }); subPackages = [ "cmd/abidump" diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index aff38e242f81..1f249223df58 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1amciz924s2h6qhy7w34jpv1jc25p5ayfxzvjph6hhx0bccrm88w"; }; - modSha256 = "15i4h3pkvyav9qsbfinzifram0knkylg24j6j0mxs4bnj80j4ycm"; + vendorSha256 = "1iyghg11cxvbzi0gl40fvv8pl3d3k52j179w3x5m1f09r5ji223y"; subPackages = ["cmd/lncli" "cmd/lnd"]; @@ -21,4 +21,4 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with maintainers; [ cypherpunk2140 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 928291940cfe..fd1e61463f8b 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0vhl8d7xxqqyl916nh8sgm1xdaf7xlc3r18464bd2av22q9yz68n"; }; - modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf"; + vendorSha256 = "1c16s5xiqr36azh2w90wg14jlw67ca2flbgjijpz7qd0ypxyfqlk"; buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ ehmry filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index b127be821c13..bcbdfb9980e8 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4"; }; - modSha256 = "0ak34wr5cbcvblndslsxdd24vfj3h02xqjqnj5amkll5iqn5mzi1"; + vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7"; subPackages = [ "cmd/pdfcpu" ]; @@ -22,5 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} - +} \ No newline at end of file diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 64b592b78714..0e345b1e273d 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "1yr2jhidqvbwh1y08lpqaidwpr5yx3bhvznm5fc9pk64s7z5kq3h"; }; - modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv"; + vendorSha256 = "1ikrgl03r9zkn86kxkqi2kf540g3qzzz24i5wvh6g3d5q49nygl9"; meta = with lib; { description = "Easily create & extract archives, and compress & decompress files of various formats"; @@ -23,4 +23,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 85101a6d71bf..3a8aea913caf 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { installShellCompletion scripts/cheat.{bash,fish,zsh} ''; - modSha256 = "1z4za3rivc3vqv59p5yb5c9dcpmq669rzmf4z7zilbvmgm0pbgfp"; + vendorSha256 = null; meta = with stdenv.lib; { description = "Create and view interactive cheatsheets on the command-line"; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index a071761599a3..d983458a7ce1 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7"; }; - modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m"; + vendorSha256 = "0b2m9xkac60k5rbxmb03cxf530m23av14pnsjk8067l998sm4vqi"; subPackages = [ "./exercism" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.rbasso ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index b7b90448e4bc..2d3c3f799e8b 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "057f9kp8g3wixjh9dm58g0qvzfcmhwbk1d573ldly4g5404r9bvf"; }; - modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5"; + vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx"; meta = with stdenv.lib; { description = "Automatic GeoIP database updater"; @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ das_j ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix index 5d412469617f..0cf6c9660932 100644 --- a/pkgs/applications/misc/gomatrix/default.nix +++ b/pkgs/applications/misc/gomatrix/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m"; }; - modSha256 = "13higizadnf4ypk8qn1b5s6mdg7n6l3indb43mjp1b4cfzjsyl91"; + vendorSha256 = "1yw0gph4zfg8w4343882l6b9lggwyak2zz8ic1l1m2m44p3aq169"; meta = with lib; { description = ''Displays "The Matrix" in a terminal''; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ skykanin ]; homepage = "https://github.com/GeertJohan/gomatrix"; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f0e191097d50..a3135c4bcdf0 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, libsass }: buildGoModule rec { pname = "hugo"; version = "0.70.0"; - goPackagePath = "github.com/gohugoio/hugo"; + buildInputs = [ libsass ]; src = fetchFromGitHub { owner = "gohugoio"; @@ -13,7 +13,21 @@ buildGoModule rec { sha256 = "14g1x95jh91z9xm3xkv2psw2jn7z6bv2009miyv727df4d58nh6m"; }; - modSha256 = "015ha8pjz1fv8qg558xa6hl52fp2qd486ir9m01dvxw63xqx76ss"; + golibsass = fetchFromGitHub { + owner = "bep"; + repo = "golibsass"; + rev = "8a04397f0baba474190a9f58019ff499ec43057a"; + sha256 = "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"; + }; + + overrideModAttrs = (_: { + postBuild = '' + rm -rf vendor/github.com/bep/golibsass/ + cp -r --reflink=auto ${golibsass} vendor/github.com/bep/golibsass + ''; + }); + + vendorSha256 = "1wl9pg5wf1n5n7gq6lyz0l5ij4icjpfinl4myxwj93l2hqqyx2lf"; buildFlags = [ "-tags" "extended" ]; diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index 0c5494f146f7..a1f4c8f41bca 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; }; - modSha256 = "02ai193lpzsxdn1hpbndkfxdc88nyl4kcgbadhy122kgx13crcy8"; + vendorSha256 = "04nywhkil5xkipcibrp6vi63rfcvqgv7yxbxmmrhqys2cdxfvazv"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with maintainers; [ uvnikita ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index 68241d79850d..accaf62c60e2 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; }; - modSha256 = "01i8fim9z2l8rpdgfaih9ldvbap7gcx5767a15miv8q7sxpr90cp"; + vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c"; meta = with stdenv.lib; { description = "Shows colorful, animated party parrot in your terminial"; @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = [ maintainers.heel ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index 1e82ac2cccbe..b3b3561227f1 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0d3c621jaqxd6i58xm6nvi0avrh5mk23r169i95bn73igzw62w33"; }; - modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp"; + vendorSha256 = "0cznb8glh36dwyyn1gx1ggkwa9zffrrxg52k78brnaczsl0rsmky"; meta = { homepage = "https://github.com/sachaos/todoist"; @@ -19,4 +19,4 @@ buildGoModule rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index e557c5081c81..330d778c5de8 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7"; }; - modSha256 = "0csxc5q7i2iq8z71ysfan2kwf4mghi89i5zja5g1a4cvmcabiq1g"; + vendorSha256 = "1q54bl1z9ljpsf63i5r6vzv7f143slja0n8lyppaxxdcg18h8gn0"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index b34cd3306c06..31bb18f20a82 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, runCommand }: buildGoModule rec { pname = "cloudflared"; @@ -11,7 +11,8 @@ buildGoModule rec { sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404"; }; - modSha256 = "1mnfp8nhbllv8msglci1hq4026rqsc1yibrh2xnwwbf2f3yqx8h0"; + vendorSha256 = "14w2iz3ycbzfvlr8a6qn86aaa8687cm203d73wpfkfskp277hwz0"; + deleteVendor = true; buildFlagsArray = "-ldflags=-X main.Version=${version}"; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 891d153a09e1..7179a2915434 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf"; }; - modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45"; + vendorSha256 = "0dhzr62x2lzf3w0j2r496cr7jvkdcavfqaqr2xh972k3qqc9caky"; subPackages = [ "cmd/argo" ]; @@ -46,4 +46,4 @@ buildGoModule rec { maintainers = with maintainers; [ groodt ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 7f9ebda93c0a..409498905051 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj"; }; - modSha256 = "1qivg7yy7ymmgkrvl365x29d8jnsphbz18j1ykgwwysyw3n4jkdg"; + vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj"; nativeBuildInputs = [ packr ]; @@ -37,4 +37,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ shahrukh330 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 7d04595d3feb..b6077b5c4d82 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6"; }; - modSha256 = "18f7cf61yn5jkji5a4v6xw6c7xl40nj32n5w34xmcmszzf64cwkn"; + vendorSha256 = null; subPackages = [ "." ]; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ jpotier ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index ec5a79e9acee..0c5a716aa8a1 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; pname = "docker-machine-hyperkit"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ atkinschang ]; platforms = platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 6af1bf126b56..60d478fe1584 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; pname = "docker-machine-kvm2"; @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with maintainers; [ tadfisher atkinschang ]; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 10991d47cca9..4354d72a5bd9 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0"; }; - modSha256 = "0zwq7n1lggj27j5yxgfplbaccw5fhbm7vm0sja839r1jamrn3ips"; + vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp"; subPackages = [ "cmd/fluxctl" ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ Gonzih filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index deb6d75f12c5..9d3809c1717b 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd"; }; - modSha256 = "000knqwsajlqika4abp3fh721mn1vykcsnv3c1qw0mzffkmzwsqd"; + vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; @@ -28,4 +28,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 628ae10f11b7..f193186144a2 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -15,7 +15,7 @@ buildGoModule { goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "0j7w12rrnsv2h5v0bqh6sjq9anm51zs0p3nzlhwsksw9c98r9avk"; + vendorSha256 = "0m16l3px2ykdsrmlirf7c4lwgmigs6p3rdr61l49acwsmniz2m8a"; nativeBuildInputs = [ makeWrapper ]; @@ -36,4 +36,4 @@ buildGoModule { maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index f1d81975e1e6..992b6c4dc5e3 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0i7sg3iwxb07gjxcz6chpdcx3fqykzldmf7s1c9m02hkps910ca8"; }; - modSha256 = "19qdrrwmjc32nw8m0zi251z32wqj2d956wgd1dkcvx1x0n4p435g"; + vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; meta = with lib; { description = "Helm Charts (k8s applications) as Code tool"; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 1d9940c8f318..98edd849bac5 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw"; }; - modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh"; + vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h"; buildFlagsArray = '' -ldflags= @@ -25,4 +25,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ eliasp ]; platforms = lib.platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/jx/gomod.patch b/pkgs/applications/networking/cluster/jx/gomod.patch new file mode 100644 index 000000000000..0116d45955dc --- /dev/null +++ b/pkgs/applications/networking/cluster/jx/gomod.patch @@ -0,0 +1,186 @@ +diff --git a/go.mod b/go.mod +index cd54a606e..a78b23286 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,5 +1,7 @@ + module github.com/jenkins-x/jx + ++go 1.14 ++ + require ( + code.gitea.io/sdk v0.0.0-20180702024448-79a281c4e34a + github.com/Azure/draft v0.15.0 +@@ -7,7 +9,6 @@ require ( + github.com/IBM-Cloud/bluemix-go v0.0.0-20181008063305-d718d474c7c2 + github.com/Jeffail/gabs v1.1.1 + github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e +- github.com/Masterminds/semver v1.4.2 // indirect + github.com/Netflix/go-expect v0.0.0-20180814212900-124a37274874 + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect + github.com/Pallinder/go-randomdata v0.0.0-20180616180521-15df0648130a +@@ -20,7 +21,7 @@ require ( + github.com/andygrunwald/go-gerrit v0.0.0-20181026193842-43cfd7a94eb4 + github.com/andygrunwald/go-jira v1.5.0 + github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect +- github.com/antham/chyle v1.4.0 ++ github.com/antham/chyle v1.9.0 + github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect + github.com/armon/go-radix v1.0.0 // indirect + github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect +@@ -36,21 +37,18 @@ require ( + github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f + github.com/codeship/codeship-go v0.0.0-20180717142545-7793ca823354 + github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect +- github.com/cpuguy83/go-md2man v1.0.8 // indirect + github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect + github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c + github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect + github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45 // indirect + github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect + github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect +- github.com/emicklei/go-restful v2.8.0+incompatible +- github.com/emirpasic/gods v1.9.0 // indirect +- github.com/fatih/color v1.7.0 ++ github.com/emicklei/go-restful v2.8.0+incompatible // indirect ++ github.com/fatih/color v1.9.0 + github.com/fatih/structs v1.0.0 + github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect + github.com/gfleury/go-bitbucket-v1 v0.0.0-20190216152406-3a732135aa4d + github.com/ghodss/yaml v1.0.0 +- github.com/gliderlabs/ssh v0.1.1 // indirect + github.com/go-ldap/ldap v3.0.1+incompatible // indirect + github.com/go-ole/go-ole v1.2.1 // indirect + github.com/go-openapi/jsonreference v0.17.0 +@@ -59,9 +57,9 @@ require ( + github.com/gobwas/glob v0.2.3 // indirect + github.com/gocql/gocql v0.0.0-20190126123547-8516aabb0f99 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b +- github.com/golang/protobuf v1.2.0 ++ github.com/golang/protobuf v1.3.1 + github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect +- github.com/google/go-cmp v0.2.0 ++ github.com/google/go-cmp v0.3.0 + github.com/google/go-containerregistry v0.0.0-20190317040536-ebbba8469d06 // indirect + github.com/google/go-github v17.0.0+incompatible + github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect +@@ -79,15 +77,15 @@ require ( + github.com/hashicorp/go-sockaddr v1.0.0 // indirect + github.com/hashicorp/go-uuid v1.0.1 // indirect + github.com/hashicorp/go-version v0.0.0-20180716215031-270f2f71b1ee +- github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce ++ github.com/hashicorp/hcl v1.0.0 + github.com/hashicorp/vault v0.11.4 + github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20190115203747-edbfe287c5d9 // indirect +- github.com/heptio/sonobuoy v0.12.0 ++ github.com/heptio/sonobuoy v0.18.1 + github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c + github.com/hpcloud/tail v1.0.0 + github.com/iancoleman/orderedmap v0.0.0-20181121102841-22c6ecc9fe13 + github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 // indirect +- github.com/imdario/mergo v0.3.6 ++ github.com/imdario/mergo v0.3.8 + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jbrukh/bayesian v0.0.0-20161210175230-bf3f261f9a9c // indirect + github.com/jefferai/jsonx v1.0.0 // indirect +@@ -95,14 +93,12 @@ require ( + github.com/jenkins-x/golang-jenkins v0.0.0-20180919102630-65b83ad42314 + github.com/jetstack/cert-manager v0.5.2 + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect +- github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55 // indirect + github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a // indirect + github.com/knative/build v0.5.0 + github.com/knative/build-pipeline v0.1.0 // indirect + github.com/knative/pkg v0.0.0-20190402181056-ff46edef0ae5 + github.com/knative/serving v0.5.0 + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect +- github.com/kr/pty v1.1.2 // indirect + github.com/kubernetes/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect + github.com/kubernetes/kube-openapi v0.0.0-20190320154901-5e45bb682580 // indirect + github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect +@@ -114,9 +110,8 @@ require ( + github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect + github.com/mholt/archiver v3.1.1+incompatible + github.com/mitchellh/copystructure v1.0.0 // indirect +- github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 // indirect + github.com/mitchellh/go-testing-interface v1.0.0 // indirect +- github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 ++ github.com/mitchellh/mapstructure v1.1.2 + github.com/nlopes/slack v0.0.0-20180721202243-347a74b1ea30 + github.com/nwaples/rardecode v1.0.0 // indirect + github.com/onsi/ginkgo v1.6.0 +@@ -130,55 +125,48 @@ require ( + github.com/petergtz/pegomock v2.2.0+incompatible + github.com/pierrec/lz4 v2.0.5+incompatible // indirect + github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15 +- github.com/pkg/errors v0.8.0 +- github.com/prometheus/common v0.2.0 // indirect ++ github.com/pkg/errors v0.8.1 + github.com/rodaine/hclencoder v0.0.0-20180926060551-0680c4321930 +- github.com/russross/blackfriday v1.5.1 +- github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 ++ github.com/russross/blackfriday v1.5.2 ++ github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 // indirect + github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5 + github.com/sergi/go-diff v1.0.0 // indirect + github.com/sethvargo/go-password v0.1.2 + github.com/shirou/gopsutil v0.0.0-20180901134234-eb1f1ab16f2e + github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect +- github.com/sirupsen/logrus v1.4.1 +- github.com/spf13/cobra v0.0.3 +- github.com/spf13/pflag v1.0.3 +- github.com/src-d/gcfg v1.3.0 // indirect ++ github.com/sirupsen/logrus v1.4.2 ++ github.com/spf13/cobra v0.0.7 ++ github.com/spf13/pflag v1.0.5 + github.com/stoewer/go-strcase v1.0.1 + github.com/stretchr/objx v0.2.0 // indirect +- github.com/stretchr/testify v1.3.0 ++ github.com/stretchr/testify v1.4.0 + github.com/tektoncd/pipeline v0.0.0-20190327171839-7c43fbae2816 + github.com/trivago/tgo v1.0.1 // indirect + github.com/ulikunitz/xz v0.5.6 // indirect + github.com/wbrefvem/go-bitbucket v0.0.0-20190128183802-fc08fd046abb + github.com/xanzy/go-gitlab v0.0.0-20180814191223-f3bc634ab936 +- github.com/xanzy/ssh-agent v0.2.0 // indirect + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + gocloud.dev v0.9.0 + golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c // indirect +- golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect + golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 // indirect +- golang.org/x/net v0.0.0-20181201002055-351d144fa1fc // indirect + golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 +- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 +- golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 ++ golang.org/x/sync v0.0.0-20190423024810-112230192c58 ++ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e + google.golang.org/api v0.1.0 // indirect + google.golang.org/genproto v0.0.0-20190219182410-082222b4a5c5 // indirect + gopkg.in/AlecAivazis/survey.v1 v1.6.2 + gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect + gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect +- gopkg.in/src-d/go-billy.v4 v4.2.0 // indirect +- gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 // indirect +- gopkg.in/src-d/go-git.v4 v4.5.0 ++ gopkg.in/src-d/go-git.v4 v4.13.1 + gopkg.in/warnings.v0 v0.1.2 // indirect +- gopkg.in/yaml.v2 v2.2.1 ++ gopkg.in/yaml.v2 v2.2.2 + gotest.tools v2.2.0+incompatible // indirect + k8s.io/api v0.0.0-20190126160303-ccdd560a045f + k8s.io/apiextensions-apiserver v0.0.0-20181128195303-1f84094d7e8e + k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 + k8s.io/client-go v9.0.0+incompatible +- k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da +- k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 ++ k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect ++ k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 // indirect + k8s.io/helm v2.7.2+incompatible + k8s.io/klog v0.2.0 // indirect + k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 +@@ -197,6 +185,4 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d + + replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 + +-replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible +- + replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index a51d1afb3674..4be3398f4be8 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - modSha256 = "11jxyzajlk6b5j19sg1kjr7qdzpxkwjwrvyhx9mwy6jb5sgqbzv8"; + vendorSha256 = "0vvzv5v7j77v809h2ial9n23244j1sy3xhkarsv0wwkifc3swvq5"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 2eea6adb28d1..32b8b4498611 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion} ''; - modSha256 = "0c8bfl0hz5cfhi6jzhhylz051jiix6s7s20fn23w7wri4xaqrjn8"; + vendorSha256 = null; meta = with stdenv.lib; { homepage = "https://github.com/rancher/k3d"; @@ -30,4 +30,4 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ kuznero jlesquembre ngerstle ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index ef87b67a3600..4486f473969d 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0z51iwdc4m0y8wyyx3mcvbzxlrgws7n5wkcd0g7nr73irnsld4lh"; }; - modSha256 = "029h0zr3fpzlsv9hf1d1x5j7aalxkcsyszsxjz8fqrhjafqc7zvq"; + vendorSha256 = null; subPackages = [ "cmd/kubeseal" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 3d3674dbe0fc..10d75435e421 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; }; - modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; + vendorSha256 = "1kpwvi84i3h1yjprd6m6hn8l9j235931871y3qk9cl0g8q0hv9ja"; meta = with lib; { description = "Validate your Kubernetes configuration files"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ johanot nicknovitski ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 3d66a7c62f20..331cef0444cd 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "linkerd-unstablle"; - version = "2019-07-26"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "linkerd"; repo = "linkerd2"; - rev = "065dd3ec9d4b84c90383b31be16ccadd34a8ab0d"; - sha256 = "01m8g627sd126as0a74fy9svmymwd41sifd897nhn6kz78a21gq8"; + rev = "9e9f3bb1e2aeab8cf20f98f5cad159bbb6f24883"; + sha256 = "1pvj31wz1klwhcqga1m8kixdqsxwmppp9ix6r3wpp4dwfig45fm0"; }; - modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl"; + vendorSha256 = "0vls58ld50jca5yn73kvg3lx4z83cc7skky54a90pkbj737y58pz"; subPackages = [ "cli/cmd" ]; @@ -21,4 +21,4 @@ buildGoModule { license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 830dcec95168..040447b0ccd9 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { # for -ldflags commit = "63ab801ac27e5742ae442ce36dff7877dcccb278"; - modSha256 = "1g94jjwr5higg1b297zwp6grkj7if3mrdafjq9vls9y2svh11xr8"; + vendorSha256 = "1l9dxn7yy21x4b3cg6l5a08wx2ng8qf531ilg8yf1rznwfwjajrv"; src = fetchFromGitHub { owner = "kubernetes"; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index a7a98de6d39b..f68d5f08e66e 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -11,14 +11,7 @@ buildGoModule rec { sha256 = "02avknglmkr9k933a64hkw0rjfxvyh4sc3x70p41b8q2g6vzv2gs"; }; - # Project upstream recommends building through vendoring - overrideModAttrs = (_: { - buildCommand = '' - echo "Skipping go.mod, using vendoring instead." && touch $out - ''; - }); - - modSha256 = "0ip26j2h11n1kgkz36rl4akv694yz65hr72q4kv4b3lxcbi65b3p"; + vendorSha256 = null; # Optionally, a log counter binary can be created to parse journald logs. # The binary is dynamically linked against systemd libraries, making it a @@ -47,4 +40,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ lbpdt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 0b2f798d35b4..4ad685418d35 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; }; - modSha256 = "1xajdg10a27icc7g1y3ym4pkgg64rp4afybbjlhbg3k3whir9xa1"; + vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql"; subPackages = [ "prow/cmd/admission" @@ -63,4 +63,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 53b421ec5521..ddde1e50edde 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d"; }; - modSha256 = "1wb15vrkb4ryvrjp68ygmadnf78s354106ya210pnmsbb53rbhaz"; + vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6"; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 1aadbbc5ccd3..6afa63c4a525 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; }; - modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; + vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ basvandijk ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index fd2a6c36d65c..69d93ac1c754 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv"; }; - modSha256 = "1h95ng9by3i3v15s1ws1fv86a47vglivn42xbffdy94s108g0908"; + vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0"; postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ gila ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix index 2f788ed915ee..270c7adcb47f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { hash = "sha256-+6jRjcManQdoKh7ewOJI1UaulY5OSbkIUHmtrBI33u4="; }; - modSha256 = "sha256-gz+t50uHFj4BQnJg6kOJI/joJVE+usLpVzTqziek2wY="; + vendorSha256 = "0j90fnzba23mwf9bzf9w5h0hszkl3h61p5i780s9v9c0hbzhbqsh"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ zimbatm ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 245bd2fffbb0..6a4e1979e883 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1znb9d4n9zv3dq10dw17kb1h04gj8iz6gwx1a741fcf4ygp8zpy1"; }; - modSha256 = "0pjqsb6lxk73prc6jxj07iwd1wyy5gqz24kigb308r3n0c2vcnky"; + vendorSha256 = "0h737h25f80zfx84vm6ry0581c32ylcb5h9givqk5k5kh5qgkbgx"; buildInputs = [ makeWrapper ]; @@ -30,4 +30,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index a7dc6fe1550d..a9b9436a211a 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j"; }; - modSha256 = "1c7dk6l8lkq2j04cp5g97hwkwfmmyn5r0vpr5zpavvalxgjidsf4"; + vendorSha256 = "0qp8n7z3vcsbc6safp7i18i0i3r4hy4nidzwl85i981sg12vcg6b"; meta = with stdenv.lib; { description = "Declarative configuration for Gmail filters"; @@ -23,5 +23,4 @@ buildGoModule rec { maintainers = [ maintainers.doronbehar ]; platforms = platforms.unix; }; -} - +} \ No newline at end of file diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 679b3f4014fa..4753cd464b13 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys"; }; - modSha256 = "0888ikywclhjb4n7xqxc7hvzlhx1qhf4c3skaddqs3nrxm171jwn"; + vendorSha256 = "0d8yfmsl8rycbq8gjnvc657j14644lq0zmr9l88ik360szw6v6gc"; subPackages = [ "cmd/hydroxide" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 2962d190d369..c58940c6c32c 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -5,6 +5,7 @@ buildGoModule rec { version = "2020-03-20"; goPackagePath = "maunium.net/go/gomuks"; + patches = [ ./gomod.patch ]; src = fetchFromGitHub { owner = "tulir"; @@ -13,7 +14,7 @@ buildGoModule rec { sha256 = "0f7i88vrvl1xl4hmjplq3wwihqwijbgxy6nk5fkvc8pfmm5hsjcs"; }; - modSha256 = "10w0bjhnf6bbqx5jbgfv2jxxyqswzx25p64kkjmvh5qamjzpbjz2"; + vendorSha256 = "0awiw41nzgp4gj9fd8lcgk880aa07n535jksn0ya1cmsgavcfbvc"; postInstall = '' cp -r ${ @@ -37,4 +38,4 @@ buildGoModule rec { maintainers = with maintainers; [ tilpner emily ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch b/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch new file mode 100644 index 000000000000..ca8a32a4d2fb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch @@ -0,0 +1,20 @@ +diff --git a/go.mod b/go.mod +index 75d4a09..ef2a7ef 100644 +--- a/go.mod ++++ b/go.mod +@@ -9,13 +9,14 @@ require ( + github.com/lithammer/fuzzysearch v1.1.0 + github.com/lucasb-eyer/go-colorful v1.0.3 + github.com/mattn/go-runewidth v0.0.8 ++ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect + github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pkg/errors v0.9.1 + github.com/rivo/uniseg v0.1.0 + github.com/russross/blackfriday/v2 v2.0.1 + github.com/sasha-s/go-deadlock v0.2.0 + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect +- github.com/stretchr/testify v1.5.1 ++ github.com/stretchr/testify v1.3.0 + go.etcd.io/bbolt v1.3.3 + golang.org/x/image v0.0.0-20200119044424-58c23975cae1 + golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index f921970175a2..c41912794d06 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "0.12.1"; rev = "v${version}"; - modSha256 = "0bn47lcb9plzvl2vqqj7p33ishz6bbqpsgf2i6p34g13bwwpq647"; + vendorSha256 = "1n0zb3v83wsy8y3k7xbpjc2ykh1b2n6p10d5wkflhga49q7rf64h"; src = fetchFromGitHub { owner = "ipfs"; @@ -21,5 +21,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ jglukasik ]; }; -} - +} \ No newline at end of file diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index 727f89da9a2b..7a9d8f639707 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm"; }; - modSha256 = "1magqgbb6prnihr8lr6jc2fcgsbqqc9y317mkdnvq9qs6bj0a6qj"; + vendorSha256 = null; subPackages = [ "." ]; @@ -22,4 +22,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ elitak ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index f53f2244e9f1..584128356393 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc , python3, perl, w3m, dante +, fetchFromGitHub }: let @@ -14,7 +15,21 @@ in buildGoModule rec { sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9"; }; - modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x"; + libvterm = fetchFromGitHub { + owner = "ddevault"; + repo = "go-libvterm"; + rev = "b7d861da381071e5d3701e428528d1bfe276e78f"; + sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6"; + }; + + vendorSha256 = "0rnyjjlsxsi0y23m6ckyd52562m33qr35fvdcdzy31mbfpi8kl2k"; + + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${libvterm}/libvterm vendor/github.com/ddevault/go-libvterm + cp -r --reflink=auto ${libvterm}/encoding vendor/github.com/ddevault/go-libvterm + ''; + }); nativeBuildInputs = [ scdoc @@ -60,4 +75,4 @@ in buildGoModule rec { license = licenses.mit; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index 49f0ac533659..b02788e67722 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; }; - modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2"; + vendorSha256 = "0sblgjmn3i3k31jfq5zy3bx7bv5z2cg6rjzr7aj87c57yhzzcmk7"; nativeBuildInputs = [ pkgconfig @@ -38,4 +38,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index da7713d7bc62..1dcf42b7ece1 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1622xcl5v67lrnkjwbg7g5b5ikrawx7p91jxbj3ixc1za2f3a3fn"; }; - modSha256 = "193n323xaypm9xkpray68nqcgyf141x8qzpxzwjnrmsgfz8p6wgk"; + vendorSha256 = "0g4m0jnpy0q64xnflphyc0lmhni0q9448h7grbbr7f1s9lpqsjml"; nativeBuildInputs = [ go-bindata ]; buildPhase = '' @@ -30,4 +30,4 @@ buildGoModule rec { badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index fa3290f74850..a00d0eb819ea 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,7 +13,7 @@ let sha256 = "0yy31rfvr9d6kidfvvy36ljxlc14x5ir3ln19zg4k02hdqn0xkpj"; }; - modSha256 = "1vs7lxlqd7jr4r9xkk7w7k6gxzjmm7ic0a1scfpx8rcr5swa9cq1"; + vendorSha256 = "03df08nghcf6k3a7xxgw03cq2mvvkmrrzzai0w18mrga0aa700c9"; patches = [ ./add-stcli-target.patch @@ -103,4 +103,4 @@ in { --replace /usr/bin/strelaysrv $out/bin/strelaysrv ''; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix index 4160e70b9c44..17f42b5ece4f 100644 --- a/pkgs/applications/networking/websocketd/default.nix +++ b/pkgs/applications/networking/websocketd/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q"; }; - modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs"; + vendorSha256 = "05k31z4h3b327mh940zh52im4xfk7kf5phb8b7xp4l9bgckhz4lb"; meta = with lib; { description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = [ maintainers.bjornfor ]; license = licenses.bsd2; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index adec2a361b54..2386ac87ceab 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7"; }; - modSha256 = "0v33x9bnwjfg4425vralnsb4i22c0g1rcmaga9911v0i7d51k0fn"; + vendorSha256 = "0s99bjmsafnzhl3s2lcybxgsw1s4i1h3vh6p40gz4vsfhndidqrq"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}" @@ -33,4 +33,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index f9d8eab8e55a..3401e851b31b 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1i0q9lxdxbyj0l0510cbkwkbycawrx8cxlbdrhb2p2fnk0vqnyiv"; }; - modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41"; + vendorSha256 = "1r8lvy2xk0gvlwy6k86wh14ajb6hgs9f1fwfqk17ra1cb404l2lz"; buildFlagsArray = '' -ldflags= @@ -29,4 +29,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ sigma ]; license = stdenv.lib.licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 3ca25d6cf13e..0903af7499a7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "01ab3mlwh5g1vr3x85fppflg18gb8ip9mjfsp2b5rfigd9lxyyns"; }; - modSha256 = "05wxvzsbhvz15596019vs7h09kynfsfjx3i5xyrl5xjzdxbaqbrq"; + vendorSha256 = "0c8b47lj4wl3s21lm0vx4z7hznylm8c4fb8b8gxm278kn3zys607"; buildFlagsArray = '' -ldflags= @@ -35,4 +35,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ royneary ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index a5097697a867..df29eb152353 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k"; }; - modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; + vendorSha256 = "1ccwbhzwys8sl3m2rs2lp70snzsi2a0ahnnq8kn15rrlvsv5qahf"; meta = with lib; { description = "Keep the content for your git submodules all in one place: the parent repo"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 5a00d6b1f86f..eaab2e6c5054 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; + vendorSha256 = "1lrmafvv5zfn9kc0p8g5vdz351n1zbaqwhwk861fxys0rdpqskyc"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -31,4 +31,4 @@ buildGoModule rec { maintainers = with maintainers; [ marsam dtzWill ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 9fc89d520ae9..613e5bf10d68 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "14rcvbzzrx0m3xijl8qhw5l2h0q10hqzad2hqm3079g893f2qad0"; }; - modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq"; + vendorSha256 = "1pdrw4vwbj9cka2pjbjvxviigfvnrf8sgws27ixwwiblbkj4isc8"; meta = with stdenv.lib; { description = "Fast and powerful Git hooks manager for any type of projects"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ rencire ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 99907993104f..a40a0552338d 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -11,7 +11,7 @@ let pname = "builds-sr-ht-worker"; goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; - modSha256 = "10is7siscids9qz6jh9m1i17749dafqqkg4b3sslmxaxyn16yj97"; + vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp"; }; in buildPythonPackage rec { inherit version; @@ -57,4 +57,4 @@ in buildPythonPackage rec { license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index de4656e58816..27ac5cc858dc 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -11,7 +11,7 @@ let pname = "gitsrht-shell"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell"; - modSha256 = "0lxxxzh39bviab71kfsqqr217338yxn5l2zkak55r6qqs6iz4ccv"; + vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; }; buildDispatcher = src: buildGoModule { @@ -19,7 +19,7 @@ let pname = "gitsrht-dispatcher"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch"; - modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1"; + vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; }; buildKeys = src: buildGoModule { @@ -27,7 +27,7 @@ let pname = "gitsrht-keys"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys"; - modSha256 = "1pfcw9n63zhlxm9kd3bxa2zqmzd8mgl7yl2ck055j56v3k929w3f"; + vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; }; buildUpdateHook = src: buildGoModule { @@ -35,7 +35,7 @@ let pname = "gitsrht-update-hook"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook"; - modSha256 = "0p8qd6hpgmnlfqk5vw6l41dqs7qjhf6xijzj5iv6wv1cf362b4wp"; + vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; }; in buildPythonPackage rec { inherit version; @@ -79,4 +79,4 @@ in buildPythonPackage rec { license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index f91cc6d5ed3e..47ae4637b57e 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -4,6 +4,8 @@ buildGoModule rec { pname = "firectl"; version = "0.1.0"; + patches = [ ./gomod.patch ]; + src = fetchFromGitHub { owner = "firecracker-microvm"; repo = pname; @@ -11,7 +13,7 @@ buildGoModule rec { sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p"; }; - modSha256 = "1nqjz1afklcxc3xcpmygjdh3lfxjk6zvmghr8z8fr3nw2wvw2ddr"; + vendorSha256 = "1xbpck1gvzl75xgrajf5yzl199l4f2f6j3mac5586i7b00b9jxqj"; meta = with stdenv.lib; { description = "A command-line tool to run Firecracker microVMs"; @@ -20,4 +22,4 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/virtualization/firectl/gomod.patch b/pkgs/applications/virtualization/firectl/gomod.patch new file mode 100644 index 000000000000..96c65e728221 --- /dev/null +++ b/pkgs/applications/virtualization/firectl/gomod.patch @@ -0,0 +1,15 @@ +diff --git a/go.mod b/go.mod +index 1044001..7bafeda 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,7 +1,10 @@ + module github.com/firecracker-microvm/firectl + ++go 1.14 ++ + require ( + github.com/firecracker-microvm/firecracker-go-sdk v0.15.1 ++ github.com/go-openapi/strfmt v0.17.1 + github.com/jessevdk/go-flags v1.4.0 + github.com/pkg/errors v0.8.0 + github.com/sirupsen/logrus v1.1.1 diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix index 702aeaded3e9..97623511222f 100644 --- a/pkgs/applications/virtualization/gvisor/containerd-shim.nix +++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "077bhrmjrpcxv1z020yxhx2c4asn66j21gxlpa6hz0av3lfck9lm"; }; - modSha256 = "1jdhgbrn59ahnabwnig99i21f6kimmqx9f3dg10ffwfs3dx0gzlg"; + vendorSha256 = "11jai5jl024k7wbhz4a3zzdbvl0si07jwgwmyr8bn4i0nqx8ig2k"; buildPhase = '' make @@ -33,4 +33,4 @@ buildGoModule rec { maintainers = with maintainers; [ andrew-d ]; platforms = [ "x86_64-linux" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index a39ee351f21e..6c00d5ee6ce5 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i"; }; - modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq"; + vendorSha256 = "1vdv0nq31mjprxzxf8x0diaigissy07vnm338h8jrk5i74x5by39"; subPackages = [ "cmd/jsonnet" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ nshalman ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 069ef69dc7ef..b955cd7f87a7 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -1,6 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc -, avrdude, openocd, gcc-arm-embedded, makeWrapper }: +, avrdude, openocd, gcc-arm-embedded, makeWrapper, fetchurl }: +let main = ./main.go; + gomod = ./go.mod; +in buildGoModule rec { pname = "tinygo"; version = "0.13.0"; @@ -11,8 +14,19 @@ buildGoModule rec { rev = "v${version}"; sha256 = "0x59j56y704m2hfkg78illgw9f6czrx265x887jfd989lnxphyqa"; }; + + overrideModAttrs = (_: { + patches = []; + preBuild = '' + rm -rf * + cp ${main} main.go + cp ${gomod} go.mod + ''; + }); - modSha256 = "0y8n4mcr4jhas29ahvk8k4zbj1iz65fdpsgq61qa8kcsm8m5kqa6"; + preBuild = "cp ${gomod} go.mod"; + + vendorSha256 = "19194dlzpl6zzw2gqybma5pwip71rw8z937f104k6c158qzzgy62"; enableParallelBuilding = true; subPackages = [ "." ]; buildInputs = [ llvm clang-unwrapped makeWrapper ]; diff --git a/pkgs/development/compilers/tinygo/go.mod b/pkgs/development/compilers/tinygo/go.mod new file mode 100644 index 000000000000..f01b38d3e512 --- /dev/null +++ b/pkgs/development/compilers/tinygo/go.mod @@ -0,0 +1,13 @@ +module github.com/tinygo-org/tinygo + +go 1.14 + +require ( + github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 + github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf + github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46 + go.bug.st/serial v1.0.0 + golang.org/x/tools v0.0.0-20200512001501-aaeff5de670a + google.golang.org/appengine v1.4.0 + tinygo.org/x/go-llvm v0.0.0-20200401165421-8d120882fc7a +) diff --git a/pkgs/development/compilers/tinygo/main.go b/pkgs/development/compilers/tinygo/main.go new file mode 100644 index 000000000000..050cf8afe39f --- /dev/null +++ b/pkgs/development/compilers/tinygo/main.go @@ -0,0 +1,18 @@ +package main + +import ( + "fmt" + + _ "github.com/blakesmith/ar" + _ "github.com/google/shlex" + _ "github.com/marcinbor85/gohex" + _ "go.bug.st/serial" + _ "golang.org/x/tools/go/ast/astutil" + _ "golang.org/x/tools/go/ssa" + _ "google.golang.org/appengine" + _ "tinygo.org/x/go-llvm" +) + +func main() { + fmt.Println("vim-go") +} diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 39588a0c363b..789816c34d04 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn"; }; - modSha256 = "165mjfjk4x95ckw7wg96bg9pzb3297sggnip38nz2jxxbqr0ff8b"; + vendorSha256 = "1rn8ijq3v3fzlbyvm7g4i3qpwcl3vrl4rbcvlbzv05wxrgcw9iqb"; preBuild = '' go generate ./... @@ -26,4 +26,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ andrestylianos ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 6a53743a10ea..ec2de274ccb2 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -18,7 +18,7 @@ let p2 = buildGoModule rec { subPackages = [ "packr2" ]; - modSha256 = "1xxqyn78074jna0iri7sks6b2l4sdnn5sg57n09vrrf6kh39h2y9"; + vendorSha256 = "12yq121b0bn8z12091fyqhhz421kgx4z1nskrkvbxlhyc47bwyrp"; meta = with stdenv.lib; { description = "The simple and easy way to embed static files into Go binaries"; @@ -40,7 +40,7 @@ p1 = buildGoModule rec { subPackages = [ "packr" ]; - modSha256 = "045qfdi82yhpghjd0cimxhas4nkj7g30n9qyvkrl9ck01sahx76f"; + vendorSha256 = "0m3yj8ww4a16j56p8d8w0sdnyx0g2bkd8zg0l4d8vb72mvg5asga"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; @@ -53,4 +53,4 @@ in symlinkJoin{ name = "packr"; paths = [p1 p2]; -} +} \ No newline at end of file diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index f1eb3ae51f32..2bdaa3ab7b6f 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw"; }; - modSha256 = "1q755ipqsfpr41s5fxzmx50lwcdqc5a7akwx6mzn789w2z07x8lg"; + vendorSha256 = "0ap1iwcapvvvmwgdc4zbsp8mglrhbswkdgm4dw8baw8qk0nlci6y"; postInstall = '' rm $out/bin/plugin* @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ groodt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 8ad237bd1d2d..bcd4f7daec8a 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi"; }; - modSha256 = "0ksblhra7ln4ryggr2x8fzl8a7ljz5zdjgdxz82c75wd7wdbw8f5"; + vendorSha256 = "0kjz9v7r7g4cg11w77ijfmvwnbbkrvrfwwsfsmyxrlhznmb3v0wi"; subPackages = [ "." ]; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 87e732e8dc70..903245deb31e 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - modSha256 = "02c668bp1pfrd994lhg6z3hm1qg3530nk9aw1cahiwj549vxxfhm"; + vendorSha256 = "1276k2hpyr7bqp6hdi576xcdcd2c8vz100jpls663z7vb2rbpvxf"; postInstall = '' ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index ca2a0ec1e682..ff019e785100 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "1rw9zq8rmc0zr91kk70xl67dl6jx4dswwisv3bd1f16yncqgv2a1"; }; - modSha256 = "0bfhy0ig8apxb5qzxjdj6q7jr2i6rdq0ffby0pha8viadah8v2rm"; + vendorSha256 = null; subPackages = [ "cmd/gazelle" ]; @@ -28,4 +28,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 80ec4c4f448d..d59e409b5ddf 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -4,6 +4,8 @@ buildGoModule rec { pname = "bazelisk"; version = "1.4.0"; + patches = [ ./gomod.patch ]; + src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; @@ -11,7 +13,7 @@ buildGoModule rec { sha256 = "14zp0bi0p1rfbx1pxi5y28ndxwbqbvfx0pvy3jh1mnx5qsii1gcq"; }; - modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz"; + vendorSha256 = "10156k90ky3znb9rxhy7zasskxmlcs5cn9f3xk25ana1c66vxszr"; buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; @@ -24,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/bazelisk/gomod.patch b/pkgs/development/tools/bazelisk/gomod.patch new file mode 100644 index 000000000000..e5ff46bfa7bf --- /dev/null +++ b/pkgs/development/tools/bazelisk/gomod.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod b/go.mod +index 8eef134..54382cb 100644 +--- a/go.mod ++++ b/go.mod +@@ -3,6 +3,7 @@ module github.com/bazelbuild/bazelisk + go 1.14 + + require ( ++ github.com/bazelbuild/rules_go v0.22.4 + github.com/hashicorp/go-version v1.2.0 + github.com/mitchellh/go-homedir v1.1.0 + ) diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index 37cea6adb1a5..ed145d38c7f7 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0lazf4r5ps1s04pvz608qaxbrbc6dv0j99n39iv42zwxxh0mbd0p"; }; - modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; buildFlagsArray = [ "-ldflags=" @@ -27,4 +27,4 @@ buildGoModule rec { maintainers = with maintainers; [ swdunlop ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 2d7c2c03cea8..eb55bf5dd4c4 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38"; }; - modSha256 = "0nwmxmh1pmism5r9zzghfrzizr1fbyc8d4jljrbzjjq1l449r2ja"; + vendorSha256 = "1kay7b5rxypj4i0d2iwdlb1mj0qq3zvlrjp34zzv5kywz5gy4144"; buildFlagsArray = '' -ldflags= @@ -25,4 +25,4 @@ buildGoModule rec { maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index a3df81d26053..bbd2c2f19358 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -7,7 +7,7 @@ in buildGoModule rec { revision = "v${version}"; goPackagePath = "github.com/drone/drone-cli"; - modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; + vendorSha256 = "1zzx5yy0pp0c8pias4sfxfvdzhhrff9f8j51qf6dkif99xwdq3hb"; preBuild = '' buildFlagsArray+=("-ldflags" "-X main.version=${version}") @@ -25,4 +25,4 @@ in buildGoModule rec { license = licenses.asl20; description = "Command line client for the Drone continuous integration server."; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 05257f65af52..54b801da0756 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "1.6.5"; goPackagePath = "github.com/drone/drone"; - modSha256 = "1fyb9218s52w8c6c3v6rgivbyzy5hz4q4z8r75ng2yrmjmmiv2gr"; + vendorSha256 = "1dvf8vz3jr9smki3jql0kvd8z8rwdq93y7blbr2yjjfsdvx6lxl1"; src = fetchFromGitHub { owner = "drone"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; description = "Continuous Integration platform built on container technology"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 483b8e6b30c4..216121c8bd3f 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq"; }; - modSha256 = "1wiyfii4rmj3rp8ls0ill0sjpnpjz7l3q5fzrscm8ap1qn90gvzg"; + vendorSha256 = "127mc1wzqhn0l4ni6qxcx06qfdb1cgahzypjrs4vgr6i4sipjxck"; subPackages = [ "fly" ]; @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ivanbrennan ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 69e95f0484ae..0b9bc192c3ee 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "1qbnm3qb8jz9bljw2gb5bb9g41s5lbq4xvcaj3zgi4fc3708hlji"; }; - modSha256 = "0n9idgishlp4gaq12kngi42rq9rnkas7g6cj7jpkk8p30c74ki6z"; + vendorSha256 = "12w2rxp0s3i1ck0qvp2dkg9kk6pyymycdfnfxggcyg4fjshh8afg"; subPackages = [ "cmd/cue" ]; @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ solson ]; license = stdenv.lib.licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index c710aeaa5167..ccf7a699dae8 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky"; }; - modSha256 = "1ky6cxpmw93nrk26vyrxz8kqa7247axzaxilm6ciypxf30ad0vdq"; + vendorSha256 = "1915h1hi2y2sx5jvx84c1j281zaz100gbhyalvg5jqjr1van5s4d"; meta = with stdenv.lib; { description = "Database migration tool"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = [ maintainers.manveru ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index b942e0c91996..b48d7425b140 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1v69xbkjmyzm5g4wi9amjk65fs4qgxkqc0dvq55vqjigzrranp22"; }; - modSha256 = "1y8mqxlzbizra2m9aayp6w07s39gddvm5igdaw9kwxwjwvd1dbfc"; + vendorSha256 = "0219q9zjc0i6fbdngqh0wjpmq8wj5bjiz5dls0c1aam0lh4vwkhc"; nativeBuildInputs = [ pkg-config ]; @@ -25,4 +25,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ marsam spacekookie ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index febf71657eb4..43731b72a55a 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; }; - modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; meta = with stdenv.lib; { homepage = "https://github.com/golang/protobuf"; @@ -20,4 +20,4 @@ buildGoModule rec { license = licenses.bsd3; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 2035408de3bc..faf2e9938d0d 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; }; - modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p"; + vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; meta = with lib; { description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ rvolosatovs kalbasit ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 5cf515992720..a1dfac9b79be 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { goPackagePath = "github.com/rogpeppe/godef"; subPackages = [ "." ]; - modSha256 = "06mi8f2qs54gk2anxqcf70h96s63a99xhnlm294djyv37wy1yffi"; + vendorSha256 = null; src = fetchFromGitHub { inherit rev; @@ -23,4 +23,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ]; license = stdenv.lib.licenses.bsd3; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index c5e27289615d..adb2ef463f7a 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0"; }; - modSha256 = "1ladpxhr90awnms2qmlm2lz91wyh92fl3rqbfr54qngrkpkpbhr2"; + vendorSha256 = "14a3p163xy861xb6x160wy15hzjc75n36jdyzaxl877i17shba8z"; meta = with lib; { description = "A stricter gofmt"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 744ff0b60737..5d360f4572ab 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "2019-02-28"; rev = "b37376c5da6aeb900611837098f40f81972e63e4"; - modSha256 = "0j6a2b8hx54cnjz1ya65v9czg9ygqj6zwg52ffpz7cqkx0pgl9q4"; + vendorSha256 = null; goPackagePath = "github.com/zmb3/gogetdoc"; excludedPackages = "\\(testdata\\)"; @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 3fa326fe0d2b..256e53415567 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1capiw8af4wmx3wpfslb30xivfyh72x5kj12f8p5pwhl6id31931"; }; - modSha256 = "0adsy71hl6256v40b5gb00kmqswbgfb1576m6lwak1fcfi07hf6b"; + vendorSha256 = "16wr8ixicbvdpg5mg6q07sa1b03ydpwdbvbjl3r9qihdqkhhzlr1"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 2f784b999e27..dd3ea4b26223 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "gomodifytags"; version = "1.4.0"; - modSha256 = "0nkdk2zgnwsg9lv20vqk2lshk4g9fqwqxd5bpr78nlahb9xk486s"; + vendorSha256 = null; goPackagePath = "github.com/fatih/gomodifytags"; @@ -21,4 +21,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.bsd3; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 51c4255a0135..c1773333b5d2 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln"; }; - modSha256 = "0v9lg5kq3776b2s4kgyi19jy8shjqrr0f5ljrchsj1k7867sxiw7"; + vendorSha256 = "1pwsc488ldw039by8nqpni801zry7dnf0rx4hhd73xpv2w7s8n2r"; meta = { description = "Tool to get list available Go packages."; @@ -23,4 +23,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 77fd195b1abf..9591c6415162 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; modRoot = "gopls"; - modSha256 = "1p0g28i707xyxz1g6hb56qlc4km9ik7vjky0v80hw7n73vzs5mr9"; + vendorSha256 = "1zj0zpyl9wq23vks426vqg5xjwjcaj1079rkc67489h0p7y0aqv5"; meta = with stdenv.lib; { description = "Official language server for the Go language"; @@ -20,4 +20,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ mic92 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 3dd7fb9e3523..fba4585155ed 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44"; }; - modSha256 = "10zkk4zqla5yqs5sq2qc7x1vhadfyd1l7s29xyjmg4grs8iimk2j"; + vendorSha256 = "0d45i8wm35m2cdbk48razkdr49a3hfwnp84inlz7hj054cq6vimi"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ endocrimes ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 6efb1d5da8fb..a7858474a426 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { rm -rf gopls ''; - modSha256 = "1pijbkp7a9n2naicg21ydii6xc0g4jm5bw42lljwaks7211ag8k9"; + vendorSha256 = "0pplmqxrnc8qnr5708igx4dm7rb0hicvhg6lh5hj8zkx38nb19s0"; postConfigure = '' # Make the builtin tools available here @@ -47,4 +47,4 @@ buildGoModule rec { # Do not copy this without a good reason for enabling # In this case tools is heavily coupled with go itself and embeds paths. allowGoReference = true; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index bdaf04054e9c..ee7ed4766228 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "0cxh92df8gdl4bmr22pdvdxdkdjyfy0jv48y0k6awy1xz61r94ap"; }; - modSha256 = "1sdp62q4rnx7dp4i0dhnc8kzi8h6zzjdy7ym0mk9r7xkxxx0s3ds"; + vendorSha256 = "1iiqmdnjnrsqgjisb5j5casa2hmqmafn79157skl5zxawndvc2rj"; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; @@ -37,4 +37,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index bbcb10a354cf..fece8c17cead 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; + vendorSha256 = "0whqrms5mc7v14p2h1jfvkawm30xaylivijlsghrsaq468qcgg15"; subPackages = [ "." ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ cswank ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 77df7bee063d..f58303cae6f2 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "0r301nqvycik8fwlghq0cymmq4rm7xp8haj39i2nynxyw8zk6zym"; }; - modSha256 = "1vfdyd4yj79f2n0w98k9h4sklxwg49ajlp1blvpslbzmpfkmcjsz"; + vendorSha256 = "1qvbm8v8yah6r6cw1cvdw79yiwxb2amzdkkzvzbwigy0j4bvn9mi"; goPackagePath = "sigs.k8s.io/kind"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 7c6f3f3396cf..bac22169edf2 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { ''; goPackagePath = "github.com/jlesquembre/kubeprompt"; - modSha256 = "0rbpdk2dixywn3wcdgz48f3xw3b7fk8xh7mrlx27wz7fq5wj9v8f"; + vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; meta = with stdenv.lib; { description = "Kubernetes prompt"; @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ jlesquembre ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index bf4aae23be76..e35cc1c8fbd5 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g"; + vendorSha256 = "06mf5zvxn10g5rqjpqv3afvhj9xmijbj8ag8pqcg1996s4rp4p7a"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; @@ -36,4 +36,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 8df465c4958f..e7234c0492d4 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "14ird8z8f467spa0kdzjf6lq7pipq7rwxrdk6ppv7y1fxw96qm9x"; }; - modSha256 = "09q8dh4g4k0y7mrhwyi9py7zdiipmq91j3f32cn635v2xw6zyg2k"; + vendorSha256 = "0ns20vvrj0j921wsx227dxbpga6kll7pxglfqhl53xckrh85yyd8"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 5b3b728ea986..6e8f5676bbdb 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0md6y2rnzhkpxc2pm3c46jrhwicrswy9qlr6a4mmvpjq1imj1hjq"; }; - modSha256 = "169d0mm52l6w6jln5ak6zkh97q65m9jpg3bm8qll6sfrmrnfncfi"; + vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.mit; homepage = "https://circleci.com/"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 88c43a8c42a5..c1181c41fb83 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1gn7q6wg7byhr1l5ly60rbb700xrww9slbq7gbxbw5c1fl0pp3yk"; }; - modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x"; + vendorSha256 = "1w5hsdmi95v7qj3fc4jkjapw8cnh41f09wbbzcfmfmvygrii7z16"; meta = with lib; { description = "A tool to verify that your files are in harmony with your .editorconfig"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ uri-canva ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 6675f7ed3e25..22b85a1fa334 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ln1z3y9q5igf9djkxw05ql2hb1ijcvvz0mrbwz11cdv9xrsa4z4"; }; - modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb"; + vendorSha256 = "0gan5l7vsq0hixxcymhhs8p07v92w60r0lhgvrr9a99nic12vmia"; meta = with lib; { description = "Reliable project licenses detector"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ dtzWill ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 1449a55e3a86..218473aee78d 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0w1ji96hbd3anzsz82xjcafsqhgyz7c7n41rsq60yrllwbj5946f"; }; - modSha256 = "13a3snhcqq3a9lfy9zfr2rx10mf2ymvhmds1bg8n4m7lbwnzm4fg"; + vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h"; goPackagePath = "github.com/FiloSottile/mkcert"; buildFlagsArray = '' @@ -25,4 +25,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 1a6fb6746a1a..9e4dbcac5b80 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1ag55n3gfwcp6v8v3hha8bdqxw9r4bmz97p00vyqla9gjzn5ka9w"; }; - modSha256 = "0x9bcszk9hd7vwg9lnlg4vqv4r9vx8x91j3ghijbr1jmqxhgjb9a"; + vendorSha256 = "0lann22hjdcrwyab76hinvbbmg3rf7y3knrxlfg0164gl3y5xb5g"; subPackages = [ "cmd/reviewdog" ]; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index e533b065f411..70b07dd71cd5 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ib0p361sxh2qzxccg32pcml4by4mk45abhljwmljwybs34wh5rh"; }; - modSha256 = "1cbhm3jwv0z9fh1q8mva56nbsp9rfyjcs03yxrc8ffkvif0gapps"; + vendorSha256 = "0q772i49nyxzs51jrh45n14ljh7qj5wygkn2x32pxi6ykw6la4x8"; subPackages = [ "." ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 5237d131af02..839594f4cc80 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl"; }; - modSha256 = "1nl7d00prw1663xrl1nvj1xbs7wzkbqn75i92al821pz12dybdif"; + vendorSha256 = "032s62rjjq7bqiz5fg17yfkq4j4dsbl6vhvs1wf2sg8jvbqmvdwn"; subPackages = [ "cmd/mod" ]; @@ -26,4 +26,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index 52bb0f158446..a484098f0c60 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "17f3ax7pjm5k93cxj7fd8hwr4id1lbzz9pkl2xflpxydi89bwdfz"; }; - modSha256 = "1hyv1vxk1rsr3jq3b08q0487sqf3y0km3mlwvqivib1y6hrknnnr"; + vendorSha256 = "10praxaiscxq4v3zknrabldxl7rpklkr5wdlwa5lxsx0if8mrvp7"; meta = with stdenv.lib; { description = "Official Packet CLI"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index 8bbb34fabd40..d37c529ecf9b 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1na3az7vicjq1rxd3ybid47yrblsdazgli0dchkbwh8zchwhqj33"; }; - modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf"; + vendorSha256 = "0pnd89iqdj3f719xf4iy5r04n51d0rrrf0qb2zjirpw7vh7g82i9"; subPackages = [ "." ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index 4de843be9512..90253ed57048 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; }; - modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0"; + vendorSha256 = "1ivvq5ch9grdrwqq29flv9821kyb16k0cj6wgj5v0dyn63w420aw"; meta = with lib; { description = "Contributed tools and other packages on top of the Go proto package"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index 77c1df6f43e3..5579d006e97b 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "004axh2gqc4f115mdxxg59d19hph3rr0bq9d08n3nyl315f590kj"; }; - modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd"; + vendorSha256 = "17qdpsff8jk7ks5v6ix1rb966x3yvq03vk5bs2zbnxfdra7bv3n6"; meta = with lib; { description = "Documentation generator plugin for Google Protocol Buffers"; @@ -27,4 +27,4 @@ buildGoModule { license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index 37b0f1fdf8db..63a805175dd8 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg"; + vendorSha256 = "19wza3vkkda44cng8m6f9y7qpzrgk2adyjmcafk17v4773rxlncf"; postInstall = '' wrapProgram "$out/bin/prototool" \ @@ -30,4 +30,4 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 7e71926b895e..7f8d1be1a52b 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "2019-12-21"; rev = "65925cf013156409e591f7a1be4df96f640d02f4"; - modSha256 = "1sihahgkcj018ixbnz58npfh4drhqip2xmc9p7lq3an8japb9nyx"; + vendorSha256 = null; goPackagePath = "github.com/davidrjenni/reftools"; excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 93634f935d1d..877fdeea8f2b 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1bip12pcn8bqgph7vd7bzzadwbyqh80fx7gqciv9fchycwsj04rf"; }; - modSha256 = "0ss5l2n1sl1i2hvxsdzy6p61mnnxmm6h256jvv0p0ajynx8g538q"; + vendorSha256 = "13z357ww4j5bmmy8ag6d6gd5b2dib8kby73q8317pqnqzaxrrbcj"; meta = with stdenv.lib; { description = "CLI to render Go template text files"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.gpl3; maintainers = with maintainers; [ yurrriq ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 9178f53bfde4..4fc4d4abc618 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "07ipa54c4mzm6yizgvkm6x5yim1xgv3f0xdxg35qziacdfcwd6m4"; }; - modSha256 = "12wbjfqy6qnapm3f2pz1ci1gvc0y8kzr8c99kihyh1jv9r3zy1wz"; + vendorSha256 = "1nvk3akjwfcbvif1w4cglsqplcajlwq3mnvk9b75nmn9qaqfbfjf"; subPackages = [ "." ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 61e04a774aa9..391cbff1716b 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "0q9f8lzrzybdablqph5wihqhfbfzb3bbnnxvhy7g5ccg1kzy7mgp"; }; - modSha256 = "0s2lw9q5jskj41jqr8bv5w45pkrp2s0yfd2hgjgsd0q4ifm07k7s"; + vendorSha256 = "1g5rmiiwqpm8gky9yr5f2a7zsjjmm9i12r7yxj9cz7y3rmw9sw8c"; meta = with stdenv.lib; { description = "Easily manage and invoke small scripts and wrappers"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ rawkode filalex77 ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 8bcfaa2e46ac..882199a82a93 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1jll5nmskvs61031h3sizhv3scv8znrr9apyc4qlxcp4jiv7xpmp"; }; - modSha256 = "1m7sha6kwis1a00il1iigb9lxxh5m2myj9ps20s816m0b9bhd43v"; + vendorSha256 = "0rlvbyhl53x1bhwr7f7zs4swa580saak19z3d3g58srq3jyw6zlc"; meta = with lib; { description = "Portable command-line YAML processor"; @@ -19,4 +19,4 @@ buildGoModule rec { license = [ licenses.mit ]; maintainers = [ maintainers.lewo ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 22da8cd75189..9cf73bd15f4e 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { rm $out/bin/helpgen ''; - modSha256 = "0d0hfmdk81apha3r7zspam8wqadpy6qmqkgbq0sbiwrji4155hrh"; + vendorSha256 = "10wcyxzkwvbhf86dq1rh852zgdg28draay0515zp459z34vv4zna"; meta = with lib; { description = "Command line tools for fly.io services"; @@ -28,5 +28,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ aaronjanse ]; }; -} - +} \ No newline at end of file diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 3752519d0609..7396063a3f19 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "12jns7m9liyjg9wy8ynvji2d2g4k2z1ymp6k3610mivmvg159sy4"; }; - modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i"; + vendorSha256 = "120d3nzk8cr5496cxp5p6ydlzw9mmpg7dllqhv1kpgwlbxmd8vr3"; buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; @@ -20,4 +20,4 @@ buildGoModule rec { license = licenses.mit; homepage = "https://go.tacodewolff.nl/minify"; }; -} +} \ No newline at end of file diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index fff3a3b43fd0..39582ff6dcce 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0higcg2rdz02c0n50vigg7w7bxc7wlmg1x2ygrbh3iwms5lc74vi"; }; - modSha256 = "1k3gnjzblfk14y19zhlvwysx045nbw0xr5nngh7zj1wcqxhhm206"; + vendorSha256 = "00000000000000000hlvwysx045nbw0xr5nngh7zj1wcqxhhm206"; buildFlagsArray = "-ldflags=-X main.versionString=${version}"; diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 9f734a47c29b..2bed2aa1c6fb 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { --replace "/usr/local" "$out" ''; - modSha256 = "110b647q6ljsg5gwlciqv4cddxmk332nahcrpidrpsiqs2yjv1md"; + vendorSha256 = "0yak221mlyfacvlsaq9g3xiyk94n94vqgkbaji8d21pi8hhr38m6"; nativeBuildInputs = [ gnum4 ]; buildInputs = [ pam ]; @@ -50,4 +50,4 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 9bc10989efdb..627ac42efd20 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { sha256 = "01nb4if2dix2h95xvqvafil325jjw2a4v1izb9mad0cjqcf8rk6n"; }; - modSha256 = "1zp06mpkxaxykw8pr679fg9dd7039qj13j5lknxp7hr8dga0jvpy"; + vendorSha256 = "1qjlvhizl8cy06cgf4phia70bgbm4lj57z5z2gyr8aglx98bnpdn"; buildInputs = [ bzip2 zlib snappy zeromq lz4 ]; @@ -37,6 +37,20 @@ buildGoModule rec { -X github.com/trezor/blockbook/common.buildDate=unknown ''; + goethereum = fetchFromGitHub { + owner = "ethereum"; + repo = "go-ethereum"; + rev = "v1.8.20"; + sha256 = "0m2q1nz6f39pyr2rk6vflkwi4ykganzwr7wndpwr9rliw0x8jgi0"; + }; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/ethereum/go-ethereum + cp -r --reflink=auto ${goethereum} vendor/github.com/ethereum/go-ethereum + ''; + }); + preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index bcd4b7065b58..415f85371850 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g"; }; - modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an"; + vendorSha256 = "09vnci9pp8zp7bvn8zj68wslz2nc54nhcd0ll31sqfjbp00215mj"; preBuild = '' cat << EOF > caddy/main.go @@ -33,4 +33,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 4175dfa20fcb..c4f12e58b0fa 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -12,8 +12,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv"; }; - - modSha256 = "19sxyvfq1bpg85w8cd1yk2s6rd8759cf2zqs5b6wyny4cak2bl83"; + vendorSha256 = "004hpjxpp18f71vy5v5ky0g07a8d5xh5qwl5b4bbx34hpf8yxs81"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index dd6484344e85..a702626e1c14 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -26,7 +26,8 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr"; + vendorSha256 = "1lcpldkssbq6qkkq22bvx9jb5klcxr8422mpx47wz39pry8vy9b6"; + deleteVendor = true; preBuild = '' buildFlagsArray+=("-ldflags" diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index cbf29b5d7c75..598f5bedc2bf 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "18c02ss0sxxg8lkhdmyaac2x5alfxsizf6jqhck8bqkf6hiyv5hc"; }; - modSha256 = "07mlprwa37s6qpg5wvpljbvkiqcvrcljr27qsdwz49wldhdp6im6"; + vendorSha256 = "0ykhqsz4a7bkkxcg7w23jl3qs36law1f8l1b5r3i26qlamibqxl7"; meta = with stdenv.lib; { homepage = "https://coredns.io"; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rushmorem rtreffer deltaevo ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index f6a44c9193db..4c09d7f1eeb4 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -4,6 +4,8 @@ buildGoModule rec { pname = "documize-community"; version = "3.7.0"; + patches = [ ./vendor.patch ]; + src = fetchFromGitHub { owner = "documize"; repo = "community"; @@ -11,18 +13,21 @@ buildGoModule rec { sha256 = "1pcldf9lqvpb2h2a3kr3mahj2v1jasjwrszj6czjmkyml7x2sz7c"; }; - modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0"; + vendorSha256 = null; nativeBuildInputs = [ go-bindata go-bindata-assetfs ]; - subPackages = [ "edition/community.go" ]; + # This is really weird, but they've managed to screw up + # their folder structure enough, you can only build by + # literally cding into this folder. + preBuild = "cd edition"; + + subPackages = [ "." ]; passthru.tests = { inherit (nixosTests) documize; }; postInstall = '' - # `buildGoModule` calls `go install` (without `go build` first), so - # `-o bin/documize` doesn't work. - mv $out/bin/community $out/bin/documize + mv $out/bin/edition $out/bin/documize ''; meta = with lib; { diff --git a/pkgs/servers/documize-community/vendor.patch b/pkgs/servers/documize-community/vendor.patch new file mode 100644 index 000000000000..82146981f321 --- /dev/null +++ b/pkgs/servers/documize-community/vendor.patch @@ -0,0 +1,2392 @@ +diff --git a/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml b/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml +new file mode 100644 +index 00000000..e0c87602 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml +@@ -0,0 +1 @@ ++repo_token: x2wlA1x0X8CK45ybWpZRCVRB4g7vtkhaw +diff --git a/vendor/github.com/microcosm-cc/bluemonday/.travis.yml b/vendor/github.com/microcosm-cc/bluemonday/.travis.yml +new file mode 100644 +index 00000000..4f666461 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/.travis.yml +@@ -0,0 +1,22 @@ ++language: go ++go: ++ - 1.1.x ++ - 1.2.x ++ - 1.3.x ++ - 1.4.x ++ - 1.5.x ++ - 1.6.x ++ - 1.7.x ++ - 1.8.x ++ - 1.9.x ++ - 1.10.x ++ - 1.11.x ++ - tip ++matrix: ++ allow_failures: ++ - go: tip ++ fast_finish: true ++install: ++ - go get . ++script: ++ - go test -v ./... +diff --git a/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md b/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md +new file mode 100644 +index 00000000..d2b12302 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md +@@ -0,0 +1,51 @@ ++# Contributing to bluemonday ++ ++Third-party patches are essential for keeping bluemonday secure and offering the features developers want. However there are a few guidelines that we need contributors to follow so that we can maintain the quality of work that developers who use bluemonday expect. ++ ++## Getting Started ++ ++* Make sure you have a [Github account](https://github.com/signup/free) ++ ++## Guidelines ++ ++1. Do not vendor dependencies. As a security package, were we to vendor dependencies the projects that then vendor bluemonday may not receive the latest security updates to the dependencies. By not vendoring dependencies the project that implements bluemonday will vendor the latest version of any dependent packages. Vendoring is a project problem, not a package problem. bluemonday will be tested against the latest version of dependencies periodically and during any PR/merge. ++ ++## Submitting an Issue ++ ++* Submit a ticket for your issue, assuming one does not already exist ++* Clearly describe the issue including the steps to reproduce (with sample input and output) if it is a bug ++ ++If you are reporting a security flaw, you may expect that we will provide the code to fix it for you. Otherwise you may want to submit a pull request to ensure the resolution is applied sooner rather than later: ++ ++* Fork the repository on Github ++* Issue a pull request containing code to resolve the issue ++ ++## Submitting a Pull Request ++ ++* Submit a ticket for your issue, assuming one does not already exist ++* Describe the reason for the pull request and if applicable show some example inputs and outputs to demonstrate what the patch does ++* Fork the repository on Github ++* Before submitting the pull request you should ++ 1. Include tests for your patch, 1 test should encapsulate the entire patch and should refer to the Github issue ++ 1. If you have added new exposed/public functionality, you should ensure it is documented appropriately ++ 1. If you have added new exposed/public functionality, you should consider demonstrating how to use it within one of the helpers or shipped policies if appropriate or within a test if modifying a helper or policy is not appropriate ++ 1. Run all of the tests `go test -v ./...` or `make test` and ensure all tests pass ++ 1. Run gofmt `gofmt -w ./$*` or `make fmt` ++ 1. Run vet `go tool vet *.go` or `make vet` and resolve any issues ++ 1. Install golint using `go get -u github.com/golang/lint/golint` and run vet `golint *.go` or `make lint` and resolve every warning ++* When submitting the pull request you should ++ 1. Note the issue(s) it resolves, i.e. `Closes #6` in the pull request comment to close issue #6 when the pull request is accepted ++ ++Once you have submitted a pull request, we *may* merge it without changes. If we have any comments or feedback, or need you to make changes to your pull request we will update the Github pull request or the associated issue. We expect responses from you within two weeks, and we may close the pull request is there is no activity. ++ ++### Contributor Licence Agreement ++ ++We haven't gone for the formal "Sign a Contributor Licence Agreement" thing that projects like [puppet](https://cla.puppetlabs.com/), [Mojito](https://developer.yahoo.com/cocktails/mojito/cla/) and companies like [Google](http://code.google.com/legal/individual-cla-v1.0.html) are using. ++ ++But we do need to know that we can accept and merge your contributions, so for now the act of contributing a pull request should be considered equivalent to agreeing to a contributor licence agreement, specifically: ++ ++You accept that the act of submitting code to the bluemonday project is to grant a copyright licence to the project that is perpetual, worldwide, non-exclusive, no-charge, royalty free and irrevocable. ++ ++You accept that all who comply with the licence of the project (BSD 3-clause) are permitted to use your contributions to the project. ++ ++You accept, and by submitting code do declare, that you have the legal right to grant such a licence to the project and that each of the contributions is your own original creation. +diff --git a/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md b/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md +new file mode 100644 +index 00000000..b98873f3 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md +@@ -0,0 +1,6 @@ ++1. Andrew Krasichkov @buglloc https://github.com/buglloc ++1. John Graham-Cumming http://jgc.org/ ++1. Mike Samuel mikesamuel@gmail.com ++1. Dmitri Shuralyov shurcooL@gmail.com ++1. https://github.com/opennota ++1. https://github.com/Gufran +\ No newline at end of file +diff --git a/vendor/github.com/microcosm-cc/bluemonday/LICENSE.md b/vendor/github.com/microcosm-cc/bluemonday/LICENSE.md +new file mode 100644 +index 00000000..f822458e +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/LICENSE.md +@@ -0,0 +1,28 @@ ++Copyright (c) 2014, David Kitchen ++ ++All rights reserved. ++ ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++ ++* Redistributions of source code must retain the above copyright notice, this ++ list of conditions and the following disclaimer. ++ ++* Redistributions in binary form must reproduce the above copyright notice, ++ this list of conditions and the following disclaimer in the documentation ++ and/or other materials provided with the distribution. ++ ++* Neither the name of the organisation (Microcosm) nor the names of its ++ contributors may be used to endorse or promote products derived from ++ this software without specific prior written permission. ++ ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +diff --git a/vendor/github.com/microcosm-cc/bluemonday/Makefile b/vendor/github.com/microcosm-cc/bluemonday/Makefile +new file mode 100644 +index 00000000..b15dc74f +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/Makefile +@@ -0,0 +1,42 @@ ++# Targets: ++# ++# all: Builds the code locally after testing ++# ++# fmt: Formats the source files ++# build: Builds the code locally ++# vet: Vets the code ++# lint: Runs lint over the code (you do not need to fix everything) ++# test: Runs the tests ++# cover: Gives you the URL to a nice test coverage report ++# ++# install: Builds, tests and installs the code locally ++ ++.PHONY: all fmt build vet lint test cover install ++ ++# The first target is always the default action if `make` is called without ++# args we build and install into $GOPATH so that it can just be run ++ ++all: fmt vet test install ++ ++fmt: ++ @gofmt -s -w ./$* ++ ++build: ++ @go build ++ ++vet: ++ @go vet *.go ++ ++lint: ++ @golint *.go ++ ++test: ++ @go test -v ./... ++ ++cover: COVERAGE_FILE := coverage.out ++cover: ++ @go test -coverprofile=$(COVERAGE_FILE) && \ ++ cover -html=$(COVERAGE_FILE) && rm $(COVERAGE_FILE) ++ ++install: ++ @go install ./... +diff --git a/vendor/github.com/microcosm-cc/bluemonday/README.md b/vendor/github.com/microcosm-cc/bluemonday/README.md +new file mode 100644 +index 00000000..ce679c10 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/README.md +@@ -0,0 +1,350 @@ ++# bluemonday [![Build Status](https://travis-ci.org/microcosm-cc/bluemonday.svg?branch=master)](https://travis-ci.org/microcosm-cc/bluemonday) [![GoDoc](https://godoc.org/github.com/microcosm-cc/bluemonday?status.png)](https://godoc.org/github.com/microcosm-cc/bluemonday) [![Sourcegraph](https://sourcegraph.com/github.com/microcosm-cc/bluemonday/-/badge.svg)](https://sourcegraph.com/github.com/microcosm-cc/bluemonday?badge) ++ ++bluemonday is a HTML sanitizer implemented in Go. It is fast and highly configurable. ++ ++bluemonday takes untrusted user generated content as an input, and will return HTML that has been sanitised against a whitelist of approved HTML elements and attributes so that you can safely include the content in your web page. ++ ++If you accept user generated content, and your server uses Go, you **need** bluemonday. ++ ++The default policy for user generated content (`bluemonday.UGCPolicy().Sanitize()`) turns this: ++```html ++Hello World ++``` ++ ++Into a harmless: ++```html ++Hello World ++``` ++ ++And it turns this: ++```html ++XSS ++``` ++ ++Into this: ++```html ++XSS ++``` ++ ++Whilst still allowing this: ++```html ++ ++ ++ ++``` ++ ++To pass through mostly unaltered (it gained a rel="nofollow" which is a good thing for user generated content): ++```html ++ ++ ++ ++``` ++ ++It protects sites from [XSS](http://en.wikipedia.org/wiki/Cross-site_scripting) attacks. There are many [vectors for an XSS attack](https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet) and the best way to mitigate the risk is to sanitize user input against a known safe list of HTML elements and attributes. ++ ++You should **always** run bluemonday **after** any other processing. ++ ++If you use [blackfriday](https://github.com/russross/blackfriday) or [Pandoc](http://johnmacfarlane.net/pandoc/) then bluemonday should be run after these steps. This ensures that no insecure HTML is introduced later in your process. ++ ++bluemonday is heavily inspired by both the [OWASP Java HTML Sanitizer](https://code.google.com/p/owasp-java-html-sanitizer/) and the [HTML Purifier](http://htmlpurifier.org/). ++ ++## Technical Summary ++ ++Whitelist based, you need to either build a policy describing the HTML elements and attributes to permit (and the `regexp` patterns of attributes), or use one of the supplied policies representing good defaults. ++ ++The policy containing the whitelist is applied using a fast non-validating, forward only, token-based parser implemented in the [Go net/html library](https://godoc.org/golang.org/x/net/html) by the core Go team. ++ ++We expect to be supplied with well-formatted HTML (closing elements for every applicable open element, nested correctly) and so we do not focus on repairing badly nested or incomplete HTML. We focus on simply ensuring that whatever elements do exist are described in the policy whitelist and that attributes and links are safe for use on your web page. [GIGO](http://en.wikipedia.org/wiki/Garbage_in,_garbage_out) does apply and if you feed it bad HTML bluemonday is not tasked with figuring out how to make it good again. ++ ++### Supported Go Versions ++ ++bluemonday is tested against Go 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, and tip. ++ ++We do not support Go 1.0 as we depend on `golang.org/x/net/html` which includes a reference to `io.ErrNoProgress` which did not exist in Go 1.0. ++ ++## Is it production ready? ++ ++*Yes* ++ ++We are using bluemonday in production having migrated from the widely used and heavily field tested OWASP Java HTML Sanitizer. ++ ++We are passing our extensive test suite (including AntiSamy tests as well as tests for any issues raised). Check for any [unresolved issues](https://github.com/microcosm-cc/bluemonday/issues?page=1&state=open) to see whether anything may be a blocker for you. ++ ++We invite pull requests and issues to help us ensure we are offering comprehensive protection against various attacks via user generated content. ++ ++## Usage ++ ++Install in your `${GOPATH}` using `go get -u github.com/microcosm-cc/bluemonday` ++ ++Then call it: ++```go ++package main ++ ++import ( ++ "fmt" ++ ++ "github.com/microcosm-cc/bluemonday" ++) ++ ++func main() { ++ // Do this once for each unique policy, and use the policy for the life of the program ++ // Policy creation/editing is not safe to use in multiple goroutines ++ p := bluemonday.UGCPolicy() ++ ++ // The policy can then be used to sanitize lots of input and it is safe to use the policy in multiple goroutines ++ html := p.Sanitize( ++ `Google`, ++ ) ++ ++ // Output: ++ // Google ++ fmt.Println(html) ++} ++``` ++ ++We offer three ways to call Sanitize: ++```go ++p.Sanitize(string) string ++p.SanitizeBytes([]byte) []byte ++p.SanitizeReader(io.Reader) bytes.Buffer ++``` ++ ++If you are obsessed about performance, `p.SanitizeReader(r).Bytes()` will return a `[]byte` without performing any unnecessary casting of the inputs or outputs. Though the difference is so negligible you should never need to care. ++ ++You can build your own policies: ++```go ++package main ++ ++import ( ++ "fmt" ++ ++ "github.com/microcosm-cc/bluemonday" ++) ++ ++func main() { ++ p := bluemonday.NewPolicy() ++ ++ // Require URLs to be parseable by net/url.Parse and either: ++ // mailto: http:// or https:// ++ p.AllowStandardURLs() ++ ++ // We only allow

and ++ p.AllowAttrs("href").OnElements("a") ++ p.AllowElements("p") ++ ++ html := p.Sanitize( ++ `Google`, ++ ) ++ ++ // Output: ++ // Google ++ fmt.Println(html) ++} ++``` ++ ++We ship two default policies: ++ ++1. `bluemonday.StrictPolicy()` which can be thought of as equivalent to stripping all HTML elements and their attributes as it has nothing on its whitelist. An example usage scenario would be blog post titles where HTML tags are not expected at all and if they are then the elements *and* the content of the elements should be stripped. This is a *very* strict policy. ++2. `bluemonday.UGCPolicy()` which allows a broad selection of HTML elements and attributes that are safe for user generated content. Note that this policy does *not* whitelist iframes, object, embed, styles, script, etc. An example usage scenario would be blog post bodies where a variety of formatting is expected along with the potential for TABLEs and IMGs. ++ ++## Policy Building ++ ++The essence of building a policy is to determine which HTML elements and attributes are considered safe for your scenario. OWASP provide an [XSS prevention cheat sheet](https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet) to help explain the risks, but essentially: ++ ++1. Avoid anything other than the standard HTML elements ++1. Avoid `script`, `style`, `iframe`, `object`, `embed`, `base` elements that allow code to be executed by the client or third party content to be included that can execute code ++1. Avoid anything other than plain HTML attributes with values matched to a regexp ++ ++Basically, you should be able to describe what HTML is fine for your scenario. If you do not have confidence that you can describe your policy please consider using one of the shipped policies such as `bluemonday.UGCPolicy()`. ++ ++To create a new policy: ++```go ++p := bluemonday.NewPolicy() ++``` ++ ++To add elements to a policy either add just the elements: ++```go ++p.AllowElements("b", "strong") ++``` ++ ++Or add elements as a virtue of adding an attribute: ++```go ++// Not the recommended pattern, see the recommendation on using .Matching() below ++p.AllowAttrs("nowrap").OnElements("td", "th") ++``` ++ ++Attributes can either be added to all elements: ++```go ++p.AllowAttrs("dir").Matching(regexp.MustCompile("(?i)rtl|ltr")).Globally() ++``` ++ ++Or attributes can be added to specific elements: ++```go ++// Not the recommended pattern, see the recommendation on using .Matching() below ++p.AllowAttrs("value").OnElements("li") ++``` ++ ++It is **always** recommended that an attribute be made to match a pattern. XSS in HTML attributes is very easy otherwise: ++```go ++// \p{L} matches unicode letters, \p{N} matches unicode numbers ++p.AllowAttrs("title").Matching(regexp.MustCompile(`[\p{L}\p{N}\s\-_',:\[\]!\./\\\(\)&]*`)).Globally() ++``` ++ ++You can stop at any time and call .Sanitize(): ++```go ++// string htmlIn passed in from a HTTP POST ++htmlOut := p.Sanitize(htmlIn) ++``` ++ ++And you can take any existing policy and extend it: ++```go ++p := bluemonday.UGCPolicy() ++p.AllowElements("fieldset", "select", "option") ++``` ++ ++### Links ++ ++Links are difficult beasts to sanitise safely and also one of the biggest attack vectors for malicious content. ++ ++It is possible to do this: ++```go ++p.AllowAttrs("href").Matching(regexp.MustCompile(`(?i)mailto|https?`)).OnElements("a") ++``` ++ ++But that will not protect you as the regular expression is insufficient in this case to have prevented a malformed value doing something unexpected. ++ ++We provide some additional global options for safely working with links. ++ ++`RequireParseableURLs` will ensure that URLs are parseable by Go's `net/url` package: ++```go ++p.RequireParseableURLs(true) ++``` ++ ++If you have enabled parseable URLs then the following option will `AllowRelativeURLs`. By default this is disabled (bluemonday is a whitelist tool... you need to explicitly tell us to permit things) and when disabled it will prevent all local and scheme relative URLs (i.e. `href="localpage.html"`, `href="../home.html"` and even `href="//www.google.com"` are relative): ++```go ++p.AllowRelativeURLs(true) ++``` ++ ++If you have enabled parseable URLs then you can whitelist the schemes (commonly called protocol when thinking of `http` and `https`) that are permitted. Bear in mind that allowing relative URLs in the above option will allow for a blank scheme: ++```go ++p.AllowURLSchemes("mailto", "http", "https") ++``` ++ ++Regardless of whether you have enabled parseable URLs, you can force all URLs to have a rel="nofollow" attribute. This will be added if it does not exist, but only when the `href` is valid: ++```go ++// This applies to "a" "area" "link" elements that have a "href" attribute ++p.RequireNoFollowOnLinks(true) ++``` ++ ++We provide a convenience method that applies all of the above, but you will still need to whitelist the linkable elements for the URL rules to be applied to: ++```go ++p.AllowStandardURLs() ++p.AllowAttrs("cite").OnElements("blockquote", "q") ++p.AllowAttrs("href").OnElements("a", "area") ++p.AllowAttrs("src").OnElements("img") ++``` ++ ++An additional complexity regarding links is the data URI as defined in [RFC2397](http://tools.ietf.org/html/rfc2397). The data URI allows for images to be served inline using this format: ++ ++```html ++ ++``` ++ ++We have provided a helper to verify the mimetype followed by base64 content of data URIs links: ++ ++```go ++p.AllowDataURIImages() ++``` ++ ++That helper will enable GIF, JPEG, PNG and WEBP images. ++ ++It should be noted that there is a potential [security](http://palizine.plynt.com/issues/2010Oct/bypass-xss-filters/) [risk](https://capec.mitre.org/data/definitions/244.html) with the use of data URI links. You should only enable data URI links if you already trust the content. ++ ++We also have some features to help deal with user generated content: ++```go ++p.AddTargetBlankToFullyQualifiedLinks(true) ++``` ++ ++This will ensure that anchor `` links that are fully qualified (the href destination includes a host name) will get `target="_blank"` added to them. ++ ++Additionally any link that has `target="_blank"` after the policy has been applied will also have the `rel` attribute adjusted to add `noopener`. This means a link may start like `` and will end up as ``. It is important to note that the addition of `noopener` is a security feature and not an issue. There is an unfortunate feature to browsers that a browser window opened as a result of `target="_blank"` can still control the opener (your web page) and this protects against that. The background to this can be found here: [https://dev.to/ben/the-targetblank-vulnerability-by-example](https://dev.to/ben/the-targetblank-vulnerability-by-example) ++ ++### Policy Building Helpers ++ ++We also bundle some helpers to simplify policy building: ++```go ++ ++// Permits the "dir", "id", "lang", "title" attributes globally ++p.AllowStandardAttributes() ++ ++// Permits the "img" element and its standard attributes ++p.AllowImages() ++ ++// Permits ordered and unordered lists, and also definition lists ++p.AllowLists() ++ ++// Permits HTML tables and all applicable elements and non-styling attributes ++p.AllowTables() ++``` ++ ++### Invalid Instructions ++ ++The following are invalid: ++```go ++// This does not say where the attributes are allowed, you need to add ++// .Globally() or .OnElements(...) ++// This will be ignored without error. ++p.AllowAttrs("value") ++ ++// This does not say where the attributes are allowed, you need to add ++// .Globally() or .OnElements(...) ++// This will be ignored without error. ++p.AllowAttrs( ++ "type", ++).Matching( ++ regexp.MustCompile("(?i)^(circle|disc|square|a|A|i|I|1)$"), ++) ++``` ++ ++Both examples exhibit the same issue, they declare attributes but do not then specify whether they are whitelisted globally or only on specific elements (and which elements). Attributes belong to one or more elements, and the policy needs to declare this. ++ ++## Limitations ++ ++We are not yet including any tools to help whitelist and sanitize CSS. Which means that unless you wish to do the heavy lifting in a single regular expression (inadvisable), **you should not allow the "style" attribute anywhere**. ++ ++It is not the job of bluemonday to fix your bad HTML, it is merely the job of bluemonday to prevent malicious HTML getting through. If you have mismatched HTML elements, or non-conforming nesting of elements, those will remain. But if you have well-structured HTML bluemonday will not break it. ++ ++## TODO ++ ++* Add support for CSS sanitisation to allow some CSS properties based on a whitelist, possibly using the [Gorilla CSS3 scanner](http://www.gorillatoolkit.org/pkg/css/scanner) - PRs welcome so long as testing covers XSS and demonstrates safety first ++* Investigate whether devs want to blacklist elements and attributes. This would allow devs to take an existing policy (such as the `bluemonday.UGCPolicy()` ) that encapsulates 90% of what they're looking for but does more than they need, and to remove the extra things they do not want to make it 100% what they want ++* Investigate whether devs want a validating HTML mode, in which the HTML elements are not just transformed into a balanced tree (every start tag has a closing tag at the correct depth) but also that elements and character data appear only in their allowed context (i.e. that a `table` element isn't a descendent of a `caption`, that `colgroup`, `thead`, `tbody`, `tfoot` and `tr` are permitted, and that character data is not permitted) ++ ++## Development ++ ++If you have cloned this repo you will probably need the dependency: ++ ++`go get golang.org/x/net/html` ++ ++Gophers can use their familiar tools: ++ ++`go build` ++ ++`go test` ++ ++I personally use a Makefile as it spares typing the same args over and over whilst providing consistency for those of us who jump from language to language and enjoy just typing `make` in a project directory and watch magic happen. ++ ++`make` will build, vet, test and install the library. ++ ++`make clean` will remove the library from a *single* `${GOPATH}/pkg` directory tree ++ ++`make test` will run the tests ++ ++`make cover` will run the tests and *open a browser window* with the coverage report ++ ++`make lint` will run golint (install via `go get github.com/golang/lint/golint`) ++ ++## Long term goals ++ ++1. Open the code to adversarial peer review similar to the [Attack Review Ground Rules](https://code.google.com/p/owasp-java-html-sanitizer/wiki/AttackReviewGroundRules) ++1. Raise funds and pay for an external security review +diff --git a/vendor/github.com/microcosm-cc/bluemonday/doc.go b/vendor/github.com/microcosm-cc/bluemonday/doc.go +new file mode 100644 +index 00000000..71dab608 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/doc.go +@@ -0,0 +1,104 @@ ++// Copyright (c) 2014, David Kitchen ++// ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are met: ++// ++// * Redistributions of source code must retain the above copyright notice, this ++// list of conditions and the following disclaimer. ++// ++// * Redistributions in binary form must reproduce the above copyright notice, ++// this list of conditions and the following disclaimer in the documentation ++// and/or other materials provided with the distribution. ++// ++// * Neither the name of the organisation (Microcosm) nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++/* ++Package bluemonday provides a way of describing a whitelist of HTML elements ++and attributes as a policy, and for that policy to be applied to untrusted ++strings from users that may contain markup. All elements and attributes not on ++the whitelist will be stripped. ++ ++The default bluemonday.UGCPolicy().Sanitize() turns this: ++ ++ Hello World ++ ++Into the more harmless: ++ ++ Hello World ++ ++And it turns this: ++ ++ XSS ++ ++Into this: ++ ++ XSS ++ ++Whilst still allowing this: ++ ++ ++ ++ ++ ++To pass through mostly unaltered (it gained a rel="nofollow"): ++ ++ ++ ++ ++ ++The primary purpose of bluemonday is to take potentially unsafe user generated ++content (from things like Markdown, HTML WYSIWYG tools, etc) and make it safe ++for you to put on your website. ++ ++It protects sites against XSS (http://en.wikipedia.org/wiki/Cross-site_scripting) ++and other malicious content that a user interface may deliver. There are many ++vectors for an XSS attack (https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet) ++and the safest thing to do is to sanitize user input against a known safe list ++of HTML elements and attributes. ++ ++Note: You should always run bluemonday after any other processing. ++ ++If you use blackfriday (https://github.com/russross/blackfriday) or ++Pandoc (http://johnmacfarlane.net/pandoc/) then bluemonday should be run after ++these steps. This ensures that no insecure HTML is introduced later in your ++process. ++ ++bluemonday is heavily inspired by both the OWASP Java HTML Sanitizer ++(https://code.google.com/p/owasp-java-html-sanitizer/) and the HTML Purifier ++(http://htmlpurifier.org/). ++ ++We ship two default policies, one is bluemonday.StrictPolicy() and can be ++thought of as equivalent to stripping all HTML elements and their attributes as ++it has nothing on its whitelist. ++ ++The other is bluemonday.UGCPolicy() and allows a broad selection of HTML ++elements and attributes that are safe for user generated content. Note that ++this policy does not whitelist iframes, object, embed, styles, script, etc. ++ ++The essence of building a policy is to determine which HTML elements and ++attributes are considered safe for your scenario. OWASP provide an XSS ++prevention cheat sheet ( https://www.google.com/search?q=xss+prevention+cheat+sheet ) ++to help explain the risks, but essentially: ++ ++ 1. Avoid whitelisting anything other than plain HTML elements ++ 2. Avoid whitelisting `script`, `style`, `iframe`, `object`, `embed`, `base` ++ elements ++ 3. Avoid whitelisting anything other than plain HTML elements with simple ++ values that you can match to a regexp ++*/ ++package bluemonday +diff --git a/vendor/github.com/microcosm-cc/bluemonday/go.mod b/vendor/github.com/microcosm-cc/bluemonday/go.mod +new file mode 100644 +index 00000000..fa8453c5 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/go.mod +@@ -0,0 +1,5 @@ ++module github.com/microcosm-cc/bluemonday ++ ++go 1.9 ++ ++require golang.org/x/net v0.0.0-20181220203305-927f97764cc3 +diff --git a/vendor/github.com/microcosm-cc/bluemonday/go.sum b/vendor/github.com/microcosm-cc/bluemonday/go.sum +new file mode 100644 +index 00000000..bee241d1 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/go.sum +@@ -0,0 +1,2 @@ ++golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis= ++golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +diff --git a/vendor/github.com/microcosm-cc/bluemonday/helpers.go b/vendor/github.com/microcosm-cc/bluemonday/helpers.go +new file mode 100644 +index 00000000..dfa5868d +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/helpers.go +@@ -0,0 +1,297 @@ ++// Copyright (c) 2014, David Kitchen ++// ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are met: ++// ++// * Redistributions of source code must retain the above copyright notice, this ++// list of conditions and the following disclaimer. ++// ++// * Redistributions in binary form must reproduce the above copyright notice, ++// this list of conditions and the following disclaimer in the documentation ++// and/or other materials provided with the distribution. ++// ++// * Neither the name of the organisation (Microcosm) nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++package bluemonday ++ ++import ( ++ "encoding/base64" ++ "net/url" ++ "regexp" ++) ++ ++// A selection of regular expressions that can be used as .Matching() rules on ++// HTML attributes. ++var ( ++ // CellAlign handles the `align` attribute ++ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td#attr-align ++ CellAlign = regexp.MustCompile(`(?i)^(center|justify|left|right|char)$`) ++ ++ // CellVerticalAlign handles the `valign` attribute ++ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td#attr-valign ++ CellVerticalAlign = regexp.MustCompile(`(?i)^(baseline|bottom|middle|top)$`) ++ ++ // Direction handles the `dir` attribute ++ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/bdo#attr-dir ++ Direction = regexp.MustCompile(`(?i)^(rtl|ltr)$`) ++ ++ // ImageAlign handles the `align` attribute on the `image` tag ++ // http://www.w3.org/MarkUp/Test/Img/imgtest.html ++ ImageAlign = regexp.MustCompile( ++ `(?i)^(left|right|top|texttop|middle|absmiddle|baseline|bottom|absbottom)$`, ++ ) ++ ++ // Integer describes whole positive integers (including 0) used in places ++ // like td.colspan ++ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td#attr-colspan ++ Integer = regexp.MustCompile(`^[0-9]+$`) ++ ++ // ISO8601 according to the W3 group is only a subset of the ISO8601 ++ // standard: http://www.w3.org/TR/NOTE-datetime ++ // ++ // Used in places like time.datetime ++ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time#attr-datetime ++ // ++ // Matches patterns: ++ // Year: ++ // YYYY (eg 1997) ++ // Year and month: ++ // YYYY-MM (eg 1997-07) ++ // Complete date: ++ // YYYY-MM-DD (eg 1997-07-16) ++ // Complete date plus hours and minutes: ++ // YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00) ++ // Complete date plus hours, minutes and seconds: ++ // YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00) ++ // Complete date plus hours, minutes, seconds and a decimal fraction of a ++ // second ++ // YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00) ++ ISO8601 = regexp.MustCompile( ++ `^[0-9]{4}(-[0-9]{2}(-[0-9]{2}([ T][0-9]{2}(:[0-9]{2}){1,2}(.[0-9]{1,6})` + ++ `?Z?([\+-][0-9]{2}:[0-9]{2})?)?)?)?$`, ++ ) ++ ++ // ListType encapsulates the common value as well as the latest spec ++ // values for lists ++ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol#attr-type ++ ListType = regexp.MustCompile(`(?i)^(circle|disc|square|a|A|i|I|1)$`) ++ ++ // SpaceSeparatedTokens is used in places like `a.rel` and the common attribute ++ // `class` which both contain space delimited lists of data tokens ++ // http://www.w3.org/TR/html-markup/datatypes.html#common.data.tokens-def ++ // Regexp: \p{L} matches unicode letters, \p{N} matches unicode numbers ++ SpaceSeparatedTokens = regexp.MustCompile(`^([\s\p{L}\p{N}_-]+)$`) ++ ++ // Number is a double value used on HTML5 meter and progress elements ++ // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-button-element.html#the-meter-element ++ Number = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$`) ++ ++ // NumberOrPercent is used predominantly as units of measurement in width ++ // and height attributes ++ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attr-height ++ NumberOrPercent = regexp.MustCompile(`^[0-9]+[%]?$`) ++ ++ // Paragraph of text in an attribute such as *.'title', img.alt, etc ++ // https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#attr-title ++ // Note that we are not allowing chars that could close tags like '>' ++ Paragraph = regexp.MustCompile(`^[\p{L}\p{N}\s\-_',\[\]!\./\\\(\)]*$`) ++ ++ // dataURIImagePrefix is used by AllowDataURIImages to define the acceptable ++ // prefix of data URIs that contain common web image formats. ++ // ++ // This is not exported as it's not useful by itself, and only has value ++ // within the AllowDataURIImages func ++ dataURIImagePrefix = regexp.MustCompile( ++ `^image/(gif|jpeg|png|webp);base64,`, ++ ) ++) ++ ++// AllowStandardURLs is a convenience function that will enable rel="nofollow" ++// on "a", "area" and "link" (if you have allowed those elements) and will ++// ensure that the URL values are parseable and either relative or belong to the ++// "mailto", "http", or "https" schemes ++func (p *Policy) AllowStandardURLs() { ++ // URLs must be parseable by net/url.Parse() ++ p.RequireParseableURLs(true) ++ ++ // !url.IsAbs() is permitted ++ p.AllowRelativeURLs(true) ++ ++ // Most common URL schemes only ++ p.AllowURLSchemes("mailto", "http", "https") ++ ++ // For all anchors we will add rel="nofollow" if it does not already exist ++ // This applies to "a" "area" "link" ++ p.RequireNoFollowOnLinks(true) ++} ++ ++// AllowStandardAttributes will enable "id", "title" and the language specific ++// attributes "dir" and "lang" on all elements that are whitelisted ++func (p *Policy) AllowStandardAttributes() { ++ // "dir" "lang" are permitted as both language attributes affect charsets ++ // and direction of text. ++ p.AllowAttrs("dir").Matching(Direction).Globally() ++ p.AllowAttrs( ++ "lang", ++ ).Matching(regexp.MustCompile(`[a-zA-Z]{2,20}`)).Globally() ++ ++ // "id" is permitted. This is pretty much as some HTML elements require this ++ // to work well ("dfn" is an example of a "id" being value) ++ // This does create a risk that JavaScript and CSS within your web page ++ // might identify the wrong elements. Ensure that you select things ++ // accurately ++ p.AllowAttrs("id").Matching( ++ regexp.MustCompile(`[a-zA-Z0-9\:\-_\.]+`), ++ ).Globally() ++ ++ // "title" is permitted as it improves accessibility. ++ p.AllowAttrs("title").Matching(Paragraph).Globally() ++} ++ ++// AllowStyling presently enables the class attribute globally. ++// ++// Note: When bluemonday ships a CSS parser and we can safely sanitise that, ++// this will also allow sanitized styling of elements via the style attribute. ++func (p *Policy) AllowStyling() { ++ ++ // "class" is permitted globally ++ p.AllowAttrs("class").Matching(SpaceSeparatedTokens).Globally() ++} ++ ++// AllowImages enables the img element and some popular attributes. It will also ++// ensure that URL values are parseable. This helper does not enable data URI ++// images, for that you should also use the AllowDataURIImages() helper. ++func (p *Policy) AllowImages() { ++ ++ // "img" is permitted ++ p.AllowAttrs("align").Matching(ImageAlign).OnElements("img") ++ p.AllowAttrs("alt").Matching(Paragraph).OnElements("img") ++ p.AllowAttrs("height", "width").Matching(NumberOrPercent).OnElements("img") ++ ++ // Standard URLs enabled ++ p.AllowStandardURLs() ++ p.AllowAttrs("src").OnElements("img") ++} ++ ++// AllowDataURIImages permits the use of inline images defined in RFC2397 ++// http://tools.ietf.org/html/rfc2397 ++// http://en.wikipedia.org/wiki/Data_URI_scheme ++// ++// Images must have a mimetype matching: ++// image/gif ++// image/jpeg ++// image/png ++// image/webp ++// ++// NOTE: There is a potential security risk to allowing data URIs and you should ++// only permit them on content you already trust. ++// http://palizine.plynt.com/issues/2010Oct/bypass-xss-filters/ ++// https://capec.mitre.org/data/definitions/244.html ++func (p *Policy) AllowDataURIImages() { ++ ++ // URLs must be parseable by net/url.Parse() ++ p.RequireParseableURLs(true) ++ ++ // Supply a function to validate images contained within data URI ++ p.AllowURLSchemeWithCustomPolicy( ++ "data", ++ func(url *url.URL) (allowUrl bool) { ++ if url.RawQuery != "" || url.Fragment != "" { ++ return false ++ } ++ ++ matched := dataURIImagePrefix.FindString(url.Opaque) ++ if matched == "" { ++ return false ++ } ++ ++ _, err := base64.StdEncoding.DecodeString(url.Opaque[len(matched):]) ++ if err != nil { ++ return false ++ } ++ ++ return true ++ }, ++ ) ++} ++ ++// AllowLists will enabled ordered and unordered lists, as well as definition ++// lists ++func (p *Policy) AllowLists() { ++ // "ol" "ul" are permitted ++ p.AllowAttrs("type").Matching(ListType).OnElements("ol", "ul") ++ ++ // "li" is permitted ++ p.AllowAttrs("type").Matching(ListType).OnElements("li") ++ p.AllowAttrs("value").Matching(Integer).OnElements("li") ++ ++ // "dl" "dt" "dd" are permitted ++ p.AllowElements("dl", "dt", "dd") ++} ++ ++// AllowTables will enable a rich set of elements and attributes to describe ++// HTML tables ++func (p *Policy) AllowTables() { ++ ++ // "table" is permitted ++ p.AllowAttrs("height", "width").Matching(NumberOrPercent).OnElements("table") ++ p.AllowAttrs("summary").Matching(Paragraph).OnElements("table") ++ ++ // "caption" is permitted ++ p.AllowElements("caption") ++ ++ // "col" "colgroup" are permitted ++ p.AllowAttrs("align").Matching(CellAlign).OnElements("col", "colgroup") ++ p.AllowAttrs("height", "width").Matching( ++ NumberOrPercent, ++ ).OnElements("col", "colgroup") ++ p.AllowAttrs("span").Matching(Integer).OnElements("colgroup", "col") ++ p.AllowAttrs("valign").Matching( ++ CellVerticalAlign, ++ ).OnElements("col", "colgroup") ++ ++ // "thead" "tr" are permitted ++ p.AllowAttrs("align").Matching(CellAlign).OnElements("thead", "tr") ++ p.AllowAttrs("valign").Matching(CellVerticalAlign).OnElements("thead", "tr") ++ ++ // "td" "th" are permitted ++ p.AllowAttrs("abbr").Matching(Paragraph).OnElements("td", "th") ++ p.AllowAttrs("align").Matching(CellAlign).OnElements("td", "th") ++ p.AllowAttrs("colspan", "rowspan").Matching(Integer).OnElements("td", "th") ++ p.AllowAttrs("headers").Matching( ++ SpaceSeparatedTokens, ++ ).OnElements("td", "th") ++ p.AllowAttrs("height", "width").Matching( ++ NumberOrPercent, ++ ).OnElements("td", "th") ++ p.AllowAttrs( ++ "scope", ++ ).Matching( ++ regexp.MustCompile(`(?i)(?:row|col)(?:group)?`), ++ ).OnElements("td", "th") ++ p.AllowAttrs("valign").Matching(CellVerticalAlign).OnElements("td", "th") ++ p.AllowAttrs("nowrap").Matching( ++ regexp.MustCompile(`(?i)|nowrap`), ++ ).OnElements("td", "th") ++ ++ // "tbody" "tfoot" ++ p.AllowAttrs("align").Matching(CellAlign).OnElements("tbody", "tfoot") ++ p.AllowAttrs("valign").Matching( ++ CellVerticalAlign, ++ ).OnElements("tbody", "tfoot") ++} +diff --git a/vendor/github.com/microcosm-cc/bluemonday/policies.go b/vendor/github.com/microcosm-cc/bluemonday/policies.go +new file mode 100644 +index 00000000..570bba88 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/policies.go +@@ -0,0 +1,253 @@ ++// Copyright (c) 2014, David Kitchen ++// ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are met: ++// ++// * Redistributions of source code must retain the above copyright notice, this ++// list of conditions and the following disclaimer. ++// ++// * Redistributions in binary form must reproduce the above copyright notice, ++// this list of conditions and the following disclaimer in the documentation ++// and/or other materials provided with the distribution. ++// ++// * Neither the name of the organisation (Microcosm) nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++package bluemonday ++ ++import ( ++ "regexp" ++) ++ ++// StrictPolicy returns an empty policy, which will effectively strip all HTML ++// elements and their attributes from a document. ++func StrictPolicy() *Policy { ++ return NewPolicy() ++} ++ ++// StripTagsPolicy is DEPRECATED. Use StrictPolicy instead. ++func StripTagsPolicy() *Policy { ++ return StrictPolicy() ++} ++ ++// UGCPolicy returns a policy aimed at user generated content that is a result ++// of HTML WYSIWYG tools and Markdown conversions. ++// ++// This is expected to be a fairly rich document where as much markup as ++// possible should be retained. Markdown permits raw HTML so we are basically ++// providing a policy to sanitise HTML5 documents safely but with the ++// least intrusion on the formatting expectations of the user. ++func UGCPolicy() *Policy { ++ ++ p := NewPolicy() ++ ++ /////////////////////// ++ // Global attributes // ++ /////////////////////// ++ ++ // "class" is not permitted as we are not allowing users to style their own ++ // content ++ ++ p.AllowStandardAttributes() ++ ++ ////////////////////////////// ++ // Global URL format policy // ++ ////////////////////////////// ++ ++ p.AllowStandardURLs() ++ ++ //////////////////////////////// ++ // Declarations and structure // ++ //////////////////////////////// ++ ++ // "xml" "xslt" "DOCTYPE" "html" "head" are not permitted as we are ++ // expecting user generated content to be a fragment of HTML and not a full ++ // document. ++ ++ ////////////////////////// ++ // Sectioning root tags // ++ ////////////////////////// ++ ++ // "article" and "aside" are permitted and takes no attributes ++ p.AllowElements("article", "aside") ++ ++ // "body" is not permitted as we are expecting user generated content to be a fragment ++ // of HTML and not a full document. ++ ++ // "details" is permitted, including the "open" attribute which can either ++ // be blank or the value "open". ++ p.AllowAttrs( ++ "open", ++ ).Matching(regexp.MustCompile(`(?i)^(|open)$`)).OnElements("details") ++ ++ // "fieldset" is not permitted as we are not allowing forms to be created. ++ ++ // "figure" is permitted and takes no attributes ++ p.AllowElements("figure") ++ ++ // "nav" is not permitted as it is assumed that the site (and not the user) ++ // has defined navigation elements ++ ++ // "section" is permitted and takes no attributes ++ p.AllowElements("section") ++ ++ // "summary" is permitted and takes no attributes ++ p.AllowElements("summary") ++ ++ ////////////////////////// ++ // Headings and footers // ++ ////////////////////////// ++ ++ // "footer" is not permitted as we expect user content to be a fragment and ++ // not structural to this extent ++ ++ // "h1" through "h6" are permitted and take no attributes ++ p.AllowElements("h1", "h2", "h3", "h4", "h5", "h6") ++ ++ // "header" is not permitted as we expect user content to be a fragment and ++ // not structural to this extent ++ ++ // "hgroup" is permitted and takes no attributes ++ p.AllowElements("hgroup") ++ ++ ///////////////////////////////////// ++ // Content grouping and separating // ++ ///////////////////////////////////// ++ ++ // "blockquote" is permitted, including the "cite" attribute which must be ++ // a standard URL. ++ p.AllowAttrs("cite").OnElements("blockquote") ++ ++ // "br" "div" "hr" "p" "span" "wbr" are permitted and take no attributes ++ p.AllowElements("br", "div", "hr", "p", "span", "wbr") ++ ++ /////////// ++ // Links // ++ /////////// ++ ++ // "a" is permitted ++ p.AllowAttrs("href").OnElements("a") ++ ++ // "area" is permitted along with the attributes that map image maps work ++ p.AllowAttrs("name").Matching( ++ regexp.MustCompile(`^([\p{L}\p{N}_-]+)$`), ++ ).OnElements("map") ++ p.AllowAttrs("alt").Matching(Paragraph).OnElements("area") ++ p.AllowAttrs("coords").Matching( ++ regexp.MustCompile(`^([0-9]+,)+[0-9]+$`), ++ ).OnElements("area") ++ p.AllowAttrs("href").OnElements("area") ++ p.AllowAttrs("rel").Matching(SpaceSeparatedTokens).OnElements("area") ++ p.AllowAttrs("shape").Matching( ++ regexp.MustCompile(`(?i)^(default|circle|rect|poly)$`), ++ ).OnElements("area") ++ p.AllowAttrs("usemap").Matching( ++ regexp.MustCompile(`(?i)^#[\p{L}\p{N}_-]+$`), ++ ).OnElements("img") ++ ++ // "link" is not permitted ++ ++ ///////////////////// ++ // Phrase elements // ++ ///////////////////// ++ ++ // The following are all inline phrasing elements ++ p.AllowElements("abbr", "acronym", "cite", "code", "dfn", "em", ++ "figcaption", "mark", "s", "samp", "strong", "sub", "sup", "var") ++ ++ // "q" is permitted and "cite" is a URL and handled by URL policies ++ p.AllowAttrs("cite").OnElements("q") ++ ++ // "time" is permitted ++ p.AllowAttrs("datetime").Matching(ISO8601).OnElements("time") ++ ++ //////////////////// ++ // Style elements // ++ //////////////////// ++ ++ // block and inline elements that impart no semantic meaning but style the ++ // document ++ p.AllowElements("b", "i", "pre", "small", "strike", "tt", "u") ++ ++ // "style" is not permitted as we are not yet sanitising CSS and it is an ++ // XSS attack vector ++ ++ ////////////////////// ++ // HTML5 Formatting // ++ ////////////////////// ++ ++ // "bdi" "bdo" are permitted ++ p.AllowAttrs("dir").Matching(Direction).OnElements("bdi", "bdo") ++ ++ // "rp" "rt" "ruby" are permitted ++ p.AllowElements("rp", "rt", "ruby") ++ ++ /////////////////////////// ++ // HTML5 Change tracking // ++ /////////////////////////// ++ ++ // "del" "ins" are permitted ++ p.AllowAttrs("cite").Matching(Paragraph).OnElements("del", "ins") ++ p.AllowAttrs("datetime").Matching(ISO8601).OnElements("del", "ins") ++ ++ /////////// ++ // Lists // ++ /////////// ++ ++ p.AllowLists() ++ ++ //////////// ++ // Tables // ++ //////////// ++ ++ p.AllowTables() ++ ++ /////////// ++ // Forms // ++ /////////// ++ ++ // By and large, forms are not permitted. However there are some form ++ // elements that can be used to present data, and we do permit those ++ // ++ // "button" "fieldset" "input" "keygen" "label" "output" "select" "datalist" ++ // "textarea" "optgroup" "option" are all not permitted ++ ++ // "meter" is permitted ++ p.AllowAttrs( ++ "value", ++ "min", ++ "max", ++ "low", ++ "high", ++ "optimum", ++ ).Matching(Number).OnElements("meter") ++ ++ // "progress" is permitted ++ p.AllowAttrs("value", "max").Matching(Number).OnElements("progress") ++ ++ ////////////////////// ++ // Embedded content // ++ ////////////////////// ++ ++ // Vast majority not permitted ++ // "audio" "canvas" "embed" "iframe" "object" "param" "source" "svg" "track" ++ // "video" are all not permitted ++ ++ p.AllowImages() ++ ++ return p ++} +diff --git a/vendor/github.com/microcosm-cc/bluemonday/policy.go b/vendor/github.com/microcosm-cc/bluemonday/policy.go +new file mode 100644 +index 00000000..f61d98f5 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/policy.go +@@ -0,0 +1,552 @@ ++// Copyright (c) 2014, David Kitchen ++// ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are met: ++// ++// * Redistributions of source code must retain the above copyright notice, this ++// list of conditions and the following disclaimer. ++// ++// * Redistributions in binary form must reproduce the above copyright notice, ++// this list of conditions and the following disclaimer in the documentation ++// and/or other materials provided with the distribution. ++// ++// * Neither the name of the organisation (Microcosm) nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++package bluemonday ++ ++import ( ++ "net/url" ++ "regexp" ++ "strings" ++) ++ ++// Policy encapsulates the whitelist of HTML elements and attributes that will ++// be applied to the sanitised HTML. ++// ++// You should use bluemonday.NewPolicy() to create a blank policy as the ++// unexported fields contain maps that need to be initialized. ++type Policy struct { ++ ++ // Declares whether the maps have been initialized, used as a cheap check to ++ // ensure that those using Policy{} directly won't cause nil pointer ++ // exceptions ++ initialized bool ++ ++ // If true then we add spaces when stripping tags, specifically the closing ++ // tag is replaced by a space character. ++ addSpaces bool ++ ++ // When true, add rel="nofollow" to HTML anchors ++ requireNoFollow bool ++ ++ // When true, add rel="nofollow" to HTML anchors ++ // Will add for href="http://foo" ++ // Will skip for href="/foo" or href="foo" ++ requireNoFollowFullyQualifiedLinks bool ++ ++ // When true add target="_blank" to fully qualified links ++ // Will add for href="http://foo" ++ // Will skip for href="/foo" or href="foo" ++ addTargetBlankToFullyQualifiedLinks bool ++ ++ // When true, URLs must be parseable by "net/url" url.Parse() ++ requireParseableURLs bool ++ ++ // When true, u, _ := url.Parse("url"); !u.IsAbs() is permitted ++ allowRelativeURLs bool ++ ++ // When true, allow data attributes. ++ allowDataAttributes bool ++ ++ // map[htmlElementName]map[htmlAttributeName]attrPolicy ++ elsAndAttrs map[string]map[string]attrPolicy ++ ++ // map[htmlAttributeName]attrPolicy ++ globalAttrs map[string]attrPolicy ++ ++ // If urlPolicy is nil, all URLs with matching schema are allowed. ++ // Otherwise, only the URLs with matching schema and urlPolicy(url) ++ // returning true are allowed. ++ allowURLSchemes map[string]urlPolicy ++ ++ // If an element has had all attributes removed as a result of a policy ++ // being applied, then the element would be removed from the output. ++ // ++ // However some elements are valid and have strong layout meaning without ++ // any attributes, i.e. . To prevent those being removed we maintain ++ // a list of elements that are allowed to have no attributes and that will ++ // be maintained in the output HTML. ++ setOfElementsAllowedWithoutAttrs map[string]struct{} ++ ++ setOfElementsToSkipContent map[string]struct{} ++} ++ ++type attrPolicy struct { ++ ++ // optional pattern to match, when not nil the regexp needs to match ++ // otherwise the attribute is removed ++ regexp *regexp.Regexp ++} ++ ++type attrPolicyBuilder struct { ++ p *Policy ++ ++ attrNames []string ++ regexp *regexp.Regexp ++ allowEmpty bool ++} ++ ++type urlPolicy func(url *url.URL) (allowUrl bool) ++ ++// init initializes the maps if this has not been done already ++func (p *Policy) init() { ++ if !p.initialized { ++ p.elsAndAttrs = make(map[string]map[string]attrPolicy) ++ p.globalAttrs = make(map[string]attrPolicy) ++ p.allowURLSchemes = make(map[string]urlPolicy) ++ p.setOfElementsAllowedWithoutAttrs = make(map[string]struct{}) ++ p.setOfElementsToSkipContent = make(map[string]struct{}) ++ p.initialized = true ++ } ++} ++ ++// NewPolicy returns a blank policy with nothing whitelisted or permitted. This ++// is the recommended way to start building a policy and you should now use ++// AllowAttrs() and/or AllowElements() to construct the whitelist of HTML ++// elements and attributes. ++func NewPolicy() *Policy { ++ ++ p := Policy{} ++ ++ p.addDefaultElementsWithoutAttrs() ++ p.addDefaultSkipElementContent() ++ ++ return &p ++} ++ ++// AllowAttrs takes a range of HTML attribute names and returns an ++// attribute policy builder that allows you to specify the pattern and scope of ++// the whitelisted attribute. ++// ++// The attribute policy is only added to the core policy when either Globally() ++// or OnElements(...) are called. ++func (p *Policy) AllowAttrs(attrNames ...string) *attrPolicyBuilder { ++ ++ p.init() ++ ++ abp := attrPolicyBuilder{ ++ p: p, ++ allowEmpty: false, ++ } ++ ++ for _, attrName := range attrNames { ++ abp.attrNames = append(abp.attrNames, strings.ToLower(attrName)) ++ } ++ ++ return &abp ++} ++ ++// AllowDataAttributes whitelists all data attributes. We can't specify the name ++// of each attribute exactly as they are customized. ++// ++// NOTE: These values are not sanitized and applications that evaluate or process ++// them without checking and verification of the input may be at risk if this option ++// is enabled. This is a 'caveat emptor' option and the person enabling this option ++// needs to fully understand the potential impact with regards to whatever application ++// will be consuming the sanitized HTML afterwards, i.e. if you know you put a link in a ++// data attribute and use that to automatically load some new window then you're giving ++// the author of a HTML fragment the means to open a malicious destination automatically. ++// Use with care! ++func (p *Policy) AllowDataAttributes() { ++ p.allowDataAttributes = true ++} ++ ++// AllowNoAttrs says that attributes on element are optional. ++// ++// The attribute policy is only added to the core policy when OnElements(...) ++// are called. ++func (p *Policy) AllowNoAttrs() *attrPolicyBuilder { ++ ++ p.init() ++ ++ abp := attrPolicyBuilder{ ++ p: p, ++ allowEmpty: true, ++ } ++ return &abp ++} ++ ++// AllowNoAttrs says that attributes on element are optional. ++// ++// The attribute policy is only added to the core policy when OnElements(...) ++// are called. ++func (abp *attrPolicyBuilder) AllowNoAttrs() *attrPolicyBuilder { ++ ++ abp.allowEmpty = true ++ ++ return abp ++} ++ ++// Matching allows a regular expression to be applied to a nascent attribute ++// policy, and returns the attribute policy. Calling this more than once will ++// replace the existing regexp. ++func (abp *attrPolicyBuilder) Matching(regex *regexp.Regexp) *attrPolicyBuilder { ++ ++ abp.regexp = regex ++ ++ return abp ++} ++ ++// OnElements will bind an attribute policy to a given range of HTML elements ++// and return the updated policy ++func (abp *attrPolicyBuilder) OnElements(elements ...string) *Policy { ++ ++ for _, element := range elements { ++ element = strings.ToLower(element) ++ ++ for _, attr := range abp.attrNames { ++ ++ if _, ok := abp.p.elsAndAttrs[element]; !ok { ++ abp.p.elsAndAttrs[element] = make(map[string]attrPolicy) ++ } ++ ++ ap := attrPolicy{} ++ if abp.regexp != nil { ++ ap.regexp = abp.regexp ++ } ++ ++ abp.p.elsAndAttrs[element][attr] = ap ++ } ++ ++ if abp.allowEmpty { ++ abp.p.setOfElementsAllowedWithoutAttrs[element] = struct{}{} ++ ++ if _, ok := abp.p.elsAndAttrs[element]; !ok { ++ abp.p.elsAndAttrs[element] = make(map[string]attrPolicy) ++ } ++ } ++ } ++ ++ return abp.p ++} ++ ++// Globally will bind an attribute policy to all HTML elements and return the ++// updated policy ++func (abp *attrPolicyBuilder) Globally() *Policy { ++ ++ for _, attr := range abp.attrNames { ++ if _, ok := abp.p.globalAttrs[attr]; !ok { ++ abp.p.globalAttrs[attr] = attrPolicy{} ++ } ++ ++ ap := attrPolicy{} ++ if abp.regexp != nil { ++ ap.regexp = abp.regexp ++ } ++ ++ abp.p.globalAttrs[attr] = ap ++ } ++ ++ return abp.p ++} ++ ++// AllowElements will append HTML elements to the whitelist without applying an ++// attribute policy to those elements (the elements are permitted ++// sans-attributes) ++func (p *Policy) AllowElements(names ...string) *Policy { ++ p.init() ++ ++ for _, element := range names { ++ element = strings.ToLower(element) ++ ++ if _, ok := p.elsAndAttrs[element]; !ok { ++ p.elsAndAttrs[element] = make(map[string]attrPolicy) ++ } ++ } ++ ++ return p ++} ++ ++// RequireNoFollowOnLinks will result in all tags having a rel="nofollow" ++// added to them if one does not already exist ++// ++// Note: This requires p.RequireParseableURLs(true) and will enable it. ++func (p *Policy) RequireNoFollowOnLinks(require bool) *Policy { ++ ++ p.requireNoFollow = require ++ p.requireParseableURLs = true ++ ++ return p ++} ++ ++// RequireNoFollowOnFullyQualifiedLinks will result in all tags that point ++// to a non-local destination (i.e. starts with a protocol and has a host) ++// having a rel="nofollow" added to them if one does not already exist ++// ++// Note: This requires p.RequireParseableURLs(true) and will enable it. ++func (p *Policy) RequireNoFollowOnFullyQualifiedLinks(require bool) *Policy { ++ ++ p.requireNoFollowFullyQualifiedLinks = require ++ p.requireParseableURLs = true ++ ++ return p ++} ++ ++// AddTargetBlankToFullyQualifiedLinks will result in all tags that point ++// to a non-local destination (i.e. starts with a protocol and has a host) ++// having a target="_blank" added to them if one does not already exist ++// ++// Note: This requires p.RequireParseableURLs(true) and will enable it. ++func (p *Policy) AddTargetBlankToFullyQualifiedLinks(require bool) *Policy { ++ ++ p.addTargetBlankToFullyQualifiedLinks = require ++ p.requireParseableURLs = true ++ ++ return p ++} ++ ++// RequireParseableURLs will result in all URLs requiring that they be parseable ++// by "net/url" url.Parse() ++// This applies to: ++// - a.href ++// - area.href ++// - blockquote.cite ++// - img.src ++// - link.href ++// - script.src ++func (p *Policy) RequireParseableURLs(require bool) *Policy { ++ ++ p.requireParseableURLs = require ++ ++ return p ++} ++ ++// AllowRelativeURLs enables RequireParseableURLs and then permits URLs that ++// are parseable, have no schema information and url.IsAbs() returns false ++// This permits local URLs ++func (p *Policy) AllowRelativeURLs(require bool) *Policy { ++ ++ p.RequireParseableURLs(true) ++ p.allowRelativeURLs = require ++ ++ return p ++} ++ ++// AllowURLSchemes will append URL schemes to the whitelist ++// Example: p.AllowURLSchemes("mailto", "http", "https") ++func (p *Policy) AllowURLSchemes(schemes ...string) *Policy { ++ p.init() ++ ++ p.RequireParseableURLs(true) ++ ++ for _, scheme := range schemes { ++ scheme = strings.ToLower(scheme) ++ ++ // Allow all URLs with matching scheme. ++ p.allowURLSchemes[scheme] = nil ++ } ++ ++ return p ++} ++ ++// AllowURLSchemeWithCustomPolicy will append URL schemes with ++// a custom URL policy to the whitelist. ++// Only the URLs with matching schema and urlPolicy(url) ++// returning true will be allowed. ++func (p *Policy) AllowURLSchemeWithCustomPolicy( ++ scheme string, ++ urlPolicy func(url *url.URL) (allowUrl bool), ++) *Policy { ++ ++ p.init() ++ ++ p.RequireParseableURLs(true) ++ ++ scheme = strings.ToLower(scheme) ++ ++ p.allowURLSchemes[scheme] = urlPolicy ++ ++ return p ++} ++ ++// AddSpaceWhenStrippingTag states whether to add a single space " " when ++// removing tags that are not whitelisted by the policy. ++// ++// This is useful if you expect to strip tags in dense markup and may lose the ++// value of whitespace. ++// ++// For example: "

Hello

World

"" would be sanitized to "HelloWorld" ++// with the default value of false, but you may wish to sanitize this to ++// " Hello World " by setting AddSpaceWhenStrippingTag to true as this would ++// retain the intent of the text. ++func (p *Policy) AddSpaceWhenStrippingTag(allow bool) *Policy { ++ ++ p.addSpaces = allow ++ ++ return p ++} ++ ++// SkipElementsContent adds the HTML elements whose tags is needed to be removed ++// with its content. ++func (p *Policy) SkipElementsContent(names ...string) *Policy { ++ ++ p.init() ++ ++ for _, element := range names { ++ element = strings.ToLower(element) ++ ++ if _, ok := p.setOfElementsToSkipContent[element]; !ok { ++ p.setOfElementsToSkipContent[element] = struct{}{} ++ } ++ } ++ ++ return p ++} ++ ++// AllowElementsContent marks the HTML elements whose content should be ++// retained after removing the tag. ++func (p *Policy) AllowElementsContent(names ...string) *Policy { ++ ++ p.init() ++ ++ for _, element := range names { ++ delete(p.setOfElementsToSkipContent, strings.ToLower(element)) ++ } ++ ++ return p ++} ++ ++// addDefaultElementsWithoutAttrs adds the HTML elements that we know are valid ++// without any attributes to an internal map. ++// i.e. we know that
is valid, but isn't valid as the "dir" attr ++// is mandatory ++func (p *Policy) addDefaultElementsWithoutAttrs() { ++ p.init() ++ ++ p.setOfElementsAllowedWithoutAttrs["abbr"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["acronym"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["address"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["article"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["aside"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["audio"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["b"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["bdi"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["blockquote"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["body"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["br"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["button"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["canvas"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["caption"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["center"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["cite"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["code"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["col"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["colgroup"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["datalist"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["dd"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["del"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["details"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["dfn"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["div"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["dl"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["dt"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["em"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["fieldset"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["figcaption"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["figure"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["footer"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["h1"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["h2"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["h3"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["h4"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["h5"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["h6"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["head"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["header"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["hgroup"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["hr"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["html"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["i"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["ins"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["kbd"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["li"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["mark"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["marquee"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["nav"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["ol"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["optgroup"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["option"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["p"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["pre"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["q"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["rp"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["rt"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["ruby"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["s"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["samp"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["script"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["section"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["select"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["small"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["span"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["strike"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["strong"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["style"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["sub"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["summary"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["sup"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["svg"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["table"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["tbody"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["td"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["textarea"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["tfoot"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["th"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["thead"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["title"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["time"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["tr"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["tt"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["u"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["ul"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["var"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["video"] = struct{}{} ++ p.setOfElementsAllowedWithoutAttrs["wbr"] = struct{}{} ++ ++} ++ ++// addDefaultSkipElementContent adds the HTML elements that we should skip ++// rendering the character content of, if the element itself is not allowed. ++// This is all character data that the end user would not normally see. ++// i.e. if we exclude a tag. ++func (p *Policy) addDefaultSkipElementContent() { ++ p.init() ++ ++ p.setOfElementsToSkipContent["frame"] = struct{}{} ++ p.setOfElementsToSkipContent["frameset"] = struct{}{} ++ p.setOfElementsToSkipContent["iframe"] = struct{}{} ++ p.setOfElementsToSkipContent["noembed"] = struct{}{} ++ p.setOfElementsToSkipContent["noframes"] = struct{}{} ++ p.setOfElementsToSkipContent["noscript"] = struct{}{} ++ p.setOfElementsToSkipContent["nostyle"] = struct{}{} ++ p.setOfElementsToSkipContent["object"] = struct{}{} ++ p.setOfElementsToSkipContent["script"] = struct{}{} ++ p.setOfElementsToSkipContent["style"] = struct{}{} ++ p.setOfElementsToSkipContent["title"] = struct{}{} ++} +diff --git a/vendor/github.com/microcosm-cc/bluemonday/sanitize.go b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go +new file mode 100644 +index 00000000..65ed89b7 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go +@@ -0,0 +1,581 @@ ++// Copyright (c) 2014, David Kitchen ++// ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are met: ++// ++// * Redistributions of source code must retain the above copyright notice, this ++// list of conditions and the following disclaimer. ++// ++// * Redistributions in binary form must reproduce the above copyright notice, ++// this list of conditions and the following disclaimer in the documentation ++// and/or other materials provided with the distribution. ++// ++// * Neither the name of the organisation (Microcosm) nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++package bluemonday ++ ++import ( ++ "bytes" ++ "io" ++ "net/url" ++ "regexp" ++ "strings" ++ ++ "golang.org/x/net/html" ++) ++ ++var ( ++ dataAttribute = regexp.MustCompile("^data-.+") ++ dataAttributeXMLPrefix = regexp.MustCompile("^xml.+") ++ dataAttributeInvalidChars = regexp.MustCompile("[A-Z;]+") ++) ++ ++// Sanitize takes a string that contains a HTML fragment or document and applies ++// the given policy whitelist. ++// ++// It returns a HTML string that has been sanitized by the policy or an empty ++// string if an error has occurred (most likely as a consequence of extremely ++// malformed input) ++func (p *Policy) Sanitize(s string) string { ++ if strings.TrimSpace(s) == "" { ++ return s ++ } ++ ++ return p.sanitize(strings.NewReader(s)).String() ++} ++ ++// SanitizeBytes takes a []byte that contains a HTML fragment or document and applies ++// the given policy whitelist. ++// ++// It returns a []byte containing the HTML that has been sanitized by the policy ++// or an empty []byte if an error has occurred (most likely as a consequence of ++// extremely malformed input) ++func (p *Policy) SanitizeBytes(b []byte) []byte { ++ if len(bytes.TrimSpace(b)) == 0 { ++ return b ++ } ++ ++ return p.sanitize(bytes.NewReader(b)).Bytes() ++} ++ ++// SanitizeReader takes an io.Reader that contains a HTML fragment or document ++// and applies the given policy whitelist. ++// ++// It returns a bytes.Buffer containing the HTML that has been sanitized by the ++// policy. Errors during sanitization will merely return an empty result. ++func (p *Policy) SanitizeReader(r io.Reader) *bytes.Buffer { ++ return p.sanitize(r) ++} ++ ++// Performs the actual sanitization process. ++func (p *Policy) sanitize(r io.Reader) *bytes.Buffer { ++ ++ // It is possible that the developer has created the policy via: ++ // p := bluemonday.Policy{} ++ // rather than: ++ // p := bluemonday.NewPolicy() ++ // If this is the case, and if they haven't yet triggered an action that ++ // would initiliaze the maps, then we need to do that. ++ p.init() ++ ++ var ( ++ buff bytes.Buffer ++ skipElementContent bool ++ skippingElementsCount int64 ++ skipClosingTag bool ++ closingTagToSkipStack []string ++ mostRecentlyStartedToken string ++ ) ++ ++ tokenizer := html.NewTokenizer(r) ++ for { ++ if tokenizer.Next() == html.ErrorToken { ++ err := tokenizer.Err() ++ if err == io.EOF { ++ // End of input means end of processing ++ return &buff ++ } ++ ++ // Raw tokenizer error ++ return &bytes.Buffer{} ++ } ++ ++ token := tokenizer.Token() ++ switch token.Type { ++ case html.DoctypeToken: ++ ++ // DocType is not handled as there is no safe parsing mechanism ++ // provided by golang.org/x/net/html for the content, and this can ++ // be misused to insert HTML tags that are not then sanitized ++ // ++ // One might wish to recursively sanitize here using the same policy ++ // but I will need to do some further testing before considering ++ // this. ++ ++ case html.CommentToken: ++ ++ // Comments are ignored by default ++ ++ case html.StartTagToken: ++ ++ mostRecentlyStartedToken = token.Data ++ ++ aps, ok := p.elsAndAttrs[token.Data] ++ if !ok { ++ if _, ok := p.setOfElementsToSkipContent[token.Data]; ok { ++ skipElementContent = true ++ skippingElementsCount++ ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if len(token.Attr) != 0 { ++ token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) ++ } ++ ++ if len(token.Attr) == 0 { ++ if !p.allowNoAttrs(token.Data) { ++ skipClosingTag = true ++ closingTagToSkipStack = append(closingTagToSkipStack, token.Data) ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.EndTagToken: ++ ++ if mostRecentlyStartedToken == token.Data { ++ mostRecentlyStartedToken = "" ++ } ++ ++ if skipClosingTag && closingTagToSkipStack[len(closingTagToSkipStack)-1] == token.Data { ++ closingTagToSkipStack = closingTagToSkipStack[:len(closingTagToSkipStack)-1] ++ if len(closingTagToSkipStack) == 0 { ++ skipClosingTag = false ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if _, ok := p.elsAndAttrs[token.Data]; !ok { ++ if _, ok := p.setOfElementsToSkipContent[token.Data]; ok { ++ skippingElementsCount-- ++ if skippingElementsCount == 0 { ++ skipElementContent = false ++ } ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.SelfClosingTagToken: ++ ++ aps, ok := p.elsAndAttrs[token.Data] ++ if !ok { ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if len(token.Attr) != 0 { ++ token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) ++ } ++ ++ if len(token.Attr) == 0 && !p.allowNoAttrs(token.Data) { ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.TextToken: ++ ++ if !skipElementContent { ++ switch mostRecentlyStartedToken { ++ case "script": ++ // not encouraged, but if a policy allows JavaScript we ++ // should not HTML escape it as that would break the output ++ buff.WriteString(token.Data) ++ case "style": ++ // not encouraged, but if a policy allows CSS styles we ++ // should not HTML escape it as that would break the output ++ buff.WriteString(token.Data) ++ default: ++ // HTML escape the text ++ buff.WriteString(token.String()) ++ } ++ } ++ default: ++ // A token that didn't exist in the html package when we wrote this ++ return &bytes.Buffer{} ++ } ++ } ++} ++ ++// sanitizeAttrs takes a set of element attribute policies and the global ++// attribute policies and applies them to the []html.Attribute returning a set ++// of html.Attributes that match the policies ++func (p *Policy) sanitizeAttrs( ++ elementName string, ++ attrs []html.Attribute, ++ aps map[string]attrPolicy, ++) []html.Attribute { ++ ++ if len(attrs) == 0 { ++ return attrs ++ } ++ ++ // Builds a new attribute slice based on the whether the attribute has been ++ // whitelisted explicitly or globally. ++ cleanAttrs := []html.Attribute{} ++ for _, htmlAttr := range attrs { ++ if p.allowDataAttributes { ++ // If we see a data attribute, let it through. ++ if isDataAttribute(htmlAttr.Key) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } ++ // Is there an element specific attribute policy that applies? ++ if ap, ok := aps[htmlAttr.Key]; ok { ++ if ap.regexp != nil { ++ if ap.regexp.MatchString(htmlAttr.Val) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } else { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } ++ ++ // Is there a global attribute policy that applies? ++ if ap, ok := p.globalAttrs[htmlAttr.Key]; ok { ++ ++ if ap.regexp != nil { ++ if ap.regexp.MatchString(htmlAttr.Val) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ } ++ } else { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ } ++ } ++ } ++ ++ if len(cleanAttrs) == 0 { ++ // If nothing was allowed, let's get out of here ++ return cleanAttrs ++ } ++ // cleanAttrs now contains the attributes that are permitted ++ ++ if linkable(elementName) { ++ if p.requireParseableURLs { ++ // Ensure URLs are parseable: ++ // - a.href ++ // - area.href ++ // - link.href ++ // - blockquote.cite ++ // - q.cite ++ // - img.src ++ // - script.src ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ switch elementName { ++ case "a", "area", "link": ++ if htmlAttr.Key == "href" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ case "blockquote", "q": ++ if htmlAttr.Key == "cite" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ case "img", "script": ++ if htmlAttr.Key == "src" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ default: ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ cleanAttrs = tmpAttrs ++ } ++ ++ if (p.requireNoFollow || ++ p.requireNoFollowFullyQualifiedLinks || ++ p.addTargetBlankToFullyQualifiedLinks) && ++ len(cleanAttrs) > 0 { ++ ++ // Add rel="nofollow" if a "href" exists ++ switch elementName { ++ case "a", "area", "link": ++ var hrefFound bool ++ var externalLink bool ++ for _, htmlAttr := range cleanAttrs { ++ if htmlAttr.Key == "href" { ++ hrefFound = true ++ ++ u, err := url.Parse(htmlAttr.Val) ++ if err != nil { ++ continue ++ } ++ if u.Host != "" { ++ externalLink = true ++ } ++ ++ continue ++ } ++ } ++ ++ if hrefFound { ++ var ( ++ noFollowFound bool ++ targetBlankFound bool ++ ) ++ ++ addNoFollow := (p.requireNoFollow || ++ externalLink && p.requireNoFollowFullyQualifiedLinks) ++ ++ addTargetBlank := (externalLink && ++ p.addTargetBlankToFullyQualifiedLinks) ++ ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ ++ var appended bool ++ if htmlAttr.Key == "rel" && addNoFollow { ++ ++ if strings.Contains(htmlAttr.Val, "nofollow") { ++ noFollowFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } else { ++ htmlAttr.Val += " nofollow" ++ noFollowFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } ++ } ++ ++ if elementName == "a" && htmlAttr.Key == "target" { ++ if htmlAttr.Val == "_blank" { ++ targetBlankFound = true ++ } ++ if addTargetBlank && !targetBlankFound { ++ htmlAttr.Val = "_blank" ++ targetBlankFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } ++ } ++ ++ if !appended { ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ if noFollowFound || targetBlankFound { ++ cleanAttrs = tmpAttrs ++ } ++ ++ if addNoFollow && !noFollowFound { ++ rel := html.Attribute{} ++ rel.Key = "rel" ++ rel.Val = "nofollow" ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ if elementName == "a" && addTargetBlank && !targetBlankFound { ++ rel := html.Attribute{} ++ rel.Key = "target" ++ rel.Val = "_blank" ++ targetBlankFound = true ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ if targetBlankFound { ++ // target="_blank" has a security risk that allows the ++ // opened window/tab to issue JavaScript calls against ++ // window.opener, which in effect allow the destination ++ // of the link to control the source: ++ // https://dev.to/ben/the-targetblank-vulnerability-by-example ++ // ++ // To mitigate this risk, we need to add a specific rel ++ // attribute if it is not already present. ++ // rel="noopener" ++ // ++ // Unfortunately this is processing the rel twice (we ++ // already looked at it earlier ^^) as we cannot be sure ++ // of the ordering of the href and rel, and whether we ++ // have fully satisfied that we need to do this. This ++ // double processing only happens *if* target="_blank" ++ // is true. ++ var noOpenerAdded bool ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ var appended bool ++ if htmlAttr.Key == "rel" { ++ if strings.Contains(htmlAttr.Val, "noopener") { ++ noOpenerAdded = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } else { ++ htmlAttr.Val += " noopener" ++ noOpenerAdded = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ ++ appended = true ++ } ++ if !appended { ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ if noOpenerAdded { ++ cleanAttrs = tmpAttrs ++ } else { ++ // rel attr was not found, or else noopener would ++ // have been added already ++ rel := html.Attribute{} ++ rel.Key = "rel" ++ rel.Val = "noopener" ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ } ++ } ++ default: ++ } ++ } ++ } ++ ++ return cleanAttrs ++} ++ ++func (p *Policy) allowNoAttrs(elementName string) bool { ++ _, ok := p.setOfElementsAllowedWithoutAttrs[elementName] ++ return ok ++} ++ ++func (p *Policy) validURL(rawurl string) (string, bool) { ++ if p.requireParseableURLs { ++ // URLs are valid if when space is trimmed the URL is valid ++ rawurl = strings.TrimSpace(rawurl) ++ ++ // URLs cannot contain whitespace, unless it is a data-uri ++ if (strings.Contains(rawurl, " ") || ++ strings.Contains(rawurl, "\t") || ++ strings.Contains(rawurl, "\n")) && ++ !strings.HasPrefix(rawurl, `data:`) { ++ return "", false ++ } ++ ++ // URLs are valid if they parse ++ u, err := url.Parse(rawurl) ++ if err != nil { ++ return "", false ++ } ++ ++ if u.Scheme != "" { ++ ++ urlPolicy, ok := p.allowURLSchemes[u.Scheme] ++ if !ok { ++ return "", false ++ ++ } ++ ++ if urlPolicy == nil || urlPolicy(u) == true { ++ return u.String(), true ++ } ++ ++ return "", false ++ } ++ ++ if p.allowRelativeURLs { ++ if u.String() != "" { ++ return u.String(), true ++ } ++ } ++ ++ return "", false ++ } ++ ++ return rawurl, true ++} ++ ++func linkable(elementName string) bool { ++ switch elementName { ++ case "a", "area", "blockquote", "img", "link", "script": ++ return true ++ default: ++ return false ++ } ++} ++ ++func isDataAttribute(val string) bool { ++ if !dataAttribute.MatchString(val) { ++ return false ++ } ++ rest := strings.Split(val, "data-") ++ if len(rest) == 1 { ++ return false ++ } ++ // data-xml* is invalid. ++ if dataAttributeXMLPrefix.MatchString(rest[1]) { ++ return false ++ } ++ // no uppercase or semi-colons allowed. ++ if dataAttributeInvalidChars.MatchString(rest[1]) { ++ return false ++ } ++ return true ++} +diff --git a/vendor/modules.txt b/vendor/modules.txt +index 0bae0d5d..ff6a5d78 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -49,6 +49,8 @@ github.com/lib/pq/oid + github.com/lib/pq/scram + # github.com/mb0/diff v0.0.0-20131118162322-d8d9a906c24d + github.com/mb0/diff ++# github.com/microcosm-cc/bluemonday v1.0.2 ++github.com/microcosm-cc/bluemonday + # github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d + github.com/nu7hatch/gouuid + # github.com/pkg/errors v0.8.0 diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index a8f9ad8a9126..18952d01c91d 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b"; }; - modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; + vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h"; outputs = [ "out" "index" ]; @@ -25,4 +25,4 @@ buildGoModule { license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index ff59ad53ed1c..2b474d818ad2 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: +{ rsync, buildGoModule, fetchFromGitHub, lib, runCommand, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; @@ -10,14 +10,30 @@ buildGoModule rec { rev = version; sha256 = "f01593509ccece063acd47002c4fc52261fbbbcdbf14b088d813b7d8e38fcca8"; }; + patches = [ ./gomod.patch ]; - modSha256 = - "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78"; + deleteVendor = true; buildPhase = '' - make build${lib.optionalString enableStatic "-static"} + make -e build${lib.optionalString enableStatic "-static"} ''; + lxd = fetchFromGitHub { + owner = "lxc"; + repo = "lxd"; + rev = "41efd98813f3b42f1752ff6c2c7569a054924623"; + sha256 = "02vnvjjkzl7b0i2cn03f1lb3jgj5rd3wdkii4pqi9bvmhzszg0l2"; + }; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/lxc/lxd + cp -r --reflink=auto ${lxd} vendor/github.com/lxc/lxd + ''; + }); + + vendorSha256 = "1pd0zrjwpw6yv2s86a818yy2ma2fkazd3sb2h6zfp9mvyixgxgri"; + installPhase = '' mkdir -p $out/bin cp bin/gobetween $out/bin diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/servers/gobetween/gomod.patch new file mode 100644 index 000000000000..98181e3fe794 --- /dev/null +++ b/pkgs/servers/gobetween/gomod.patch @@ -0,0 +1,21 @@ +diff --git a/go.mod b/go.mod +index 536631a..f91e862 100644 +--- a/go.mod ++++ b/go.mod +@@ -7,7 +7,7 @@ require ( + github.com/burntsushi/toml v0.3.1 + github.com/elgs/gojq v0.0.0-20160421194050-81fa9a608a13 + github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect +- github.com/flosch/pongo2 v0.0.0-20181225140029-79872a7b2769 // indirect ++ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect + github.com/fsouza/go-dockerclient v1.3.6 + github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a + github.com/gin-gonic/gin v1.3.0 +@@ -20,7 +20,6 @@ require ( + github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect + github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect + github.com/juju/schema v0.0.0-20181210140654-64a6158e9071 // indirect +- github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect + github.com/juju/webbrowser v0.0.0-20180907093207-efb9432b2bcb // indirect + github.com/julienschmidt/httprouter v1.2.0 // indirect + github.com/lxc/lxd v0.0.0-20190314233831-41efd98813f3 diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 35c6e1452437..3b9ed15a849c 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "03wxlras2akk2ig8sxzs89nvbc6zr2kbcmjlqldjdfhs1rcg82ra"; }; - modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; + vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; meta = with lib; { description = "The RPKI-to-Router server used at Cloudflare"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ petabyteboy ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 8c358154e8c9..47f5925edfcd 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { sha256 = import ./source-sha.nix; }; - modSha256 = import ./mod-sha.nix; + vendorSha256 = "1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3"; postPatch = '' substituteInPlace app.go \ diff --git a/pkgs/servers/gotify/mod-sha.nix b/pkgs/servers/gotify/mod-sha.nix deleted file mode 100644 index f115be8e1a73..000000000000 --- a/pkgs/servers/gotify/mod-sha.nix +++ /dev/null @@ -1 +0,0 @@ -"0zpdbj8a0akhzi1ian8zs6y7ymhlpcfy13q64xdlwc5w0286554r" \ No newline at end of file diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index f19ffe12f5d9..a4d8d147fda6 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -10,7 +10,7 @@ buildGoModule rec { goPackagePath = "github.com/hasura/graphql-engine/cli"; subPackages = [ "cmd/hasura" ]; - modSha256 = "0bpb9r0n8n8c1p8sas3qanhvqw45rq8kygb4dmkfhj3d9vlgn6d2"; + vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a"; buildFlagsArray = [''-ldflags= -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} @@ -30,4 +30,4 @@ buildGoModule rec { inherit (hasura-graphql-engine.meta) license homepage maintainers; description = "Hasura GraphQL Engine CLI"; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 21caebec0f37..9203f405a753 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - modSha256 = "02pj8ryis89dl4wjp2mvx6h5d0xdvskxdxiwarg7q0x23m9r7kpg"; + vendorSha256 = "069if1ifsmdn5hrwybiifhnq6xzmdccq85mzi9v98iii18pzfwqx"; nativeBuildInputs = [ pkg-config ]; @@ -27,4 +27,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ paluh ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 1f39278de625..7f1868af4c35 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "1.17.1"; goPackagePath = "github.com/42wim/matterbridge"; - modSha256 = "1mqp8dlwa4p70iv9ksq3pxx5zbxdh56xyksvd98zk0vkrz4f1rij"; + vendorSha256 = null; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index c0d01855be01..dea3d7b1b238 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,5 +1,13 @@ { stdenv, buildGoModule, fetchFromGitHub }: +let +webp = fetchFromGitHub { + owner = "chai2010"; + repo = "webp"; + rev = "19c584e49a98c31e2138c82fd0108435cd80d182"; + sha256 = "1bqf1ifsfw5dwvnc9vl3dhp775qv5hgl34219lvnja0bj6pq5zks"; +}; +in buildGoModule { pname = "mautrix-whatsapp-unstable"; version = "2020-04-21-1"; @@ -11,7 +19,14 @@ buildGoModule { sha256 = "1gayjyh0x0axc1xak38zkdhvx6fy8pwlniqsirqy2mwcgkkll9i5"; }; - modSha256 = "1pddabyyz6q1snx9j7yv7dchasqa1y8nbpb5zrwmrpnwpns8kxl7"; + vendorSha256 = "0j397zyjs7v5q2jjd3l0wz4lh1fh45whgxjp7cwgc332ch9j2010"; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/chai2010/webp + cp -r --reflink=auto ${webp} vendor/github.com/chai2010/webp + ''; + }); meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; @@ -19,4 +34,4 @@ buildGoModule { license = licenses.agpl3; maintainers = with maintainers; [ vskilet ma27 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 8b30d7dbbc88..9f9796b3a5e6 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0yyq5j82rcl8yhn2jg8sjfxii6kzbrbmxvb05yiwv7p0q42ag5rn"; }; - modSha256 = "1g5vwllxpiy4qlfhn3v5k6sn4g4qpbv0hpg32y1vi2q342lag116"; + vendorSha256 = "15yx5nkyf424v42glg3cx0gkqckdfv1xn25570s9cwf8zid0zlxd"; subPackages = [ "." ]; @@ -28,4 +28,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index b738e36cf89a..1d6bb7198e5b 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { -X main.version=${version} ''; - modSha256 = "164bwqg996097db399j7lar6gj9xpshjdmyapvzg7zh655xlkf3d"; + vendorSha256 = null; meta = with lib; { description = "DigitalOcean droplet system metrics agent"; @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ yvt ]; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 64966e183fea..d701a7ca001e 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd"; }; - modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi"; + vendorSha256 = "1km3ldqz35lpkglp9n332vxr38xxfqyij1fi2qq0agyyydbvakj5"; subPackages = [ "cmd/mtail" ]; preBuild = '' @@ -27,4 +27,4 @@ buildGoModule rec { homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index c8013e6bc15c..43c63e24dfcb 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh"; + vendorSha256 = "1dqpa180pbdi2gcmp991d4cry560mx5rm5l9x065s9n9gnd38hvl"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ma27 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 12341eee911e..0c357a768b55 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "3b33400d24abcfdc07dc31c15ca5ba7b82de444f"; }; - modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07"; + vendorSha256 = "0i5x4d3ra0s41knmybbg8gnjxgraxkid6y3gfkjwa65xcbp7hr7q"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 03656470b92e..640730e3ca00 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1viiiyvhpr7cnf8ykaaq4fzgg9xvn4hnlhv7cagy3jkjlmz60947"; }; - modSha256 = "1vb720axjziiqcba4bdi528r6mc97ci0pfsk0ny50isrkh0s3jzz"; + vendorSha256 = "1h9iz3sbz02hb8827hcssqlfg2ag3ymq38siffw9wzajslzhp9sx"; nativeBuildInputs = [ makeWrapper ]; @@ -28,4 +28,4 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index cef5367159e1..d7a1296a7daa 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -18,7 +18,7 @@ let inherit subPackages postInstall; - modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw"; + vendorSha256 = "03lkra5vf07zicd2aipvmkrda56ys5swwj6lq5hnp324ndajfcya"; buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; @@ -66,4 +66,4 @@ in pname = "sensu-go-agent"; subPackages = [ "cmd/sensu-agent" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index ab94971aa3cb..b12ad4dd4671 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "17lzz0f9vzyfwr3kgwg6i6361hqzq54jnaaw9rdc132xppdx03nr"; }; - modSha256 = "1q7il1x1pfyz15z23cs0kk7zyacn6b3y28b1q52bqi30l1x8bdbp"; + vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} @@ -31,4 +31,4 @@ buildGoModule rec { homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; maintainers = with maintainers; [ mic92 roblabla foxit64 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index a6122b317535..227085184298 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; }; - modSha256 = "0c8gc4qzdazxxnabfms63df8vlf2iy6iy0jrm710x76m4vm6mrbj"; + vendorSha256 = "126rghnyjpykvjg9sr4kwpskc13qqafxgfn9ffykwc4jjz8vc07q"; subPackages = "cmd/thanos"; @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ basvandijk ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index aa04bcaed9f8..4bddd77248a6 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "111n36xifmd644xp80imqxx61nlap6fdwx1di2qphlqb43z99jrq"; }; - modSha256 = "07v4ijblvl2zq049fdz5vdfhk6d3phrsajhnhwl46x02dbdzgj13"; + vendorSha256 = "097x3z1fhdl5s3ni2qzbqxqr60l6lqcrbikq20fs052dp287q0sp"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -23,4 +23,4 @@ buildGoModule rec { homepage = "https://influxdata.com/"; maintainers = with maintainers; [ offline zimbatm ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 4015e2097ee0..2af0f149e7d8 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - modSha256 = "1fx830dif9cq2rvigdbqbc3vmmq01ywj9b095adbrwddvay8m8si"; + vendorSha256 = "1kjh252p91yxq5mi0igamkwlsr50lij24wsp2ilgz6ksv3ijzfr1"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ danbst ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 24a8aa66151a..9f0a8de4ef68 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -18,7 +18,14 @@ buildGoModule rec { CGO_ENABLED = 0; goPackagePath = "tailscale.com"; - modSha256 = "1xgdhbck3pkix10lfshzdszrv6d3p0hbx8jdjvswz7jjd0vzm4x1"; + overrideModAttrs = (_: { + preBuild = '' + rm ipn/e2e_test.go + rm control/controlclient/auto_test.go + rm control/controlclient/direct_test.go + ''; + }); + vendorSha256 = "1v90lbwgrc2m4kvpglf2jykrm8rry3pbhqqbc3mcysrzmqlw84yl"; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; postInstall = '' @@ -34,4 +41,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ danderson mbaillie ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 40b85fc949e1..db3100619274 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; }; - modSha256 = "17imp24abfgh75g8161daknzqzk2m19q9d1mij6487046lk75hqz"; + vendorSha256 = "0rbwp0cxqfv4v5sii6kavdj73a0q0l4fnvxincvyy698qzx716kf"; subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ vdemeester ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index dd4cdc08287b..dbea567b7e1e 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "shiori"; version = "1.5.0"; - modSha256 = "1z6q5lv0j433p8lc3nxlw1rds5x1kvs1vzl63jf3disxw7ppyai3"; + vendorSha256 = "1ik5faysc880kz7nymvbmjj006l1fsqfy76036szwzg314v78643"; src = fetchFromGitHub { owner = "go-shiori"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ minijackson ]; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 4b9e4817ee8d..2aa23cd063e8 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0lz9lf1swrn67kymcp2wh67lh3c0ifqm9035gpkd3zynlq3wzqfm"; }; - modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A friendly and expressive command shell"; @@ -36,4 +36,4 @@ buildGoModule rec { passthru = { shellPath = "/bin/elvish"; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index cc4726a3cb41..385fb97b9137 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0m7c879b3f402av20jsybq2dhhckbknlvn2n1csp7xmcz4zcyn1n"; }; - modSha256 = "0yny1p8vll1wdqdlwyxf9m4kd5njdm7nq527blqqa680zf2k4h8b"; + vendorSha256 = "072kxr68p9f58w2q98fjcn4wzd5szy5l5sz8sh4ssapljvic2lam"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 worldofpeace ]; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index f839cf7cf2ed..47f590a78f28 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; + vendorSha256 = "13rc1afds5xg30faqz35haha4kxg73b5nvjirbrkc6kna0vhb54z"; goPackagePath = "github.com/b4b4r07/history"; postInstall = '' @@ -33,4 +33,4 @@ buildGoModule rec { passthru.tests = { zsh-history-shell-integration = nixosTests.zsh-history; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 48a1de61cd80..3163ab4dfcd4 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg"; }; - modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9"; + vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7"; subPackages = [ "." ]; # set the version. see: aws-vault's Makefile @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index fda773b48cd7..372d287cbd2f 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -1,9 +1,15 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: buildGoModule rec { pname = "awsweeper"; version = "0.7.0"; + # Requires go generate to be run with mockgen, but doesn't check in the results. + patches = fetchurl { + url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch"; + sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl"; + }; + src = fetchFromGitHub { owner = "cloudetc"; repo = pname; @@ -11,7 +17,7 @@ buildGoModule rec { sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28"; }; - modSha256 = "07zz6wf9cq3wylihi9fx0rd85iybnq5z5c9gqw1lhpvqcrad4491"; + vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp"; meta = with lib; { description = "A tool to clean out your AWS account"; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index c1c46da41b75..ecafb1397823 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n"; }; - modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A tool for managing secrets on Google Cloud"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 5474cb254298..86873d905149 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4"; }; - modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83"; + vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94"; meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 3f4d00736ad9..2562dc45fa8f 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "14dh9iv2g138rivvfk135m3l90kk6c1ln1iqxhbi7s99h1jixbqw"; }; - modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; + vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a"; nativeBuildInputs = [ makeWrapper ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 233538083e94..18fb37aa41c0 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xlr7hsncih4nzydi6sphp7j7k82cbhmi7jb0sd954i8kzl3sc1q"; }; - modSha256 = "0iw5za1fc9hsbc3fhhj3l276064vfdjqsad9c3c54y7b9rjgcqrv"; + vendorSha256 = "14d9hl01z7ixp1wa8kp1zs0z1p3pvz6hkp49z582nqllpb2xjmkx"; subPackages = [ "cmd/eksctl" ]; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 96c49b58d0b0..8e79959ba373 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1fypc6yjnhlpk7zhb2lvah2ikh2zji9sll55rqjbr3i4j02h484z"; }; - modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; + vendorSha256 = "0c4g1zr0wl118g41hqri0vwvfin39yvgs214w3spw8ggjcj6bzph"; buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w @@ -25,4 +25,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ suvash ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 05cab814ecfb..025afe25e87a 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-hjH1TBw6GHYNI9JSBOzdyEtJmp8NhlwNYydGZwsjAg0="; }; - modSha256 = "sha256-+PJRaDdZqVO6D9SXojlr8JXn++pL18HOHFdaiUEalw8="; + vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp"; subPackages = [ "cmd/lego" ]; buildFlagsArray = [ diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index 37766a907219..3c736258cbb6 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1cr5j2z2ynj1hwkjzi5amcg59vmgazsci41v6vpsj119g7psjmzm"; }; - modSha256 = "1a95kfy8w952269x4llbl0afyxr5fjkg30mxsn81zdh5wr8gabwh"; + vendorSha256 = "108yjymp64iqx1b2wqjbkmbm2w199wq46g7hrmqhcziv6f4aqljp"; subPackages = [ "cmd/${pname}" ]; @@ -29,5 +29,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; -} - +} \ No newline at end of file diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index ad67f7ce880d..2f2541c41cbd 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1hslhs9i4wib6c74gdq9yail958ff1y11pymjww2xr84wkwd9v7i"; }; - modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm"; + vendorSha256 = "0jjr33k27k6h27sa01ipz0aydch3i9klknqb3yq8f048zkb54gv8"; buildInputs = [ brotli ]; @@ -31,4 +31,4 @@ buildGoModule rec { description = "An archival restoration tool for PostgreSQL"; maintainers = [ stdenv.lib.maintainers.ocharles ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 3371b7956237..81ca4d946285 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "02ry066psvlqdyhimci7nskw4sfb70dw5z7ag7s7rz36gmx1vnmr"; }; - modSha256 = "1ag9lx8xcp2z9lrg404914zin45n8f4s08365yk71q5vyiwxjj3i"; + vendorSha256 = "1hjzpg3q4znvgzk0wbl8rq6cq877xxdsf950bcsks92cs8386847"; meta = with stdenv.lib; { description = "Terminal multiplexer inspired by i3"; @@ -21,4 +21,4 @@ buildGoModule rec { # TODO: fix modules build on darwin broken = stdenv.isDarwin; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 96e33e0de244..75b10bc32ca7 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw"; }; - modSha256 = "147bbhbcf81i6vyiv9q8abx5qw44fx3qw5v5f6zjnkfajdqlvbsx"; + vendorSha256 = "1za47n08iamhfl4ky928rixgadflmz86vnmnwbczd167bdndh5rq"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 8d84adbddada..5146e25da501 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1lf5fbzplyc1mpdqgfwbrn8m5568vhjf48580fvvfgbhz6zcil8n"; }; - modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; + vendorSha256 = "18jw4z0lcrh00yjr3qdkgvlrpfwqbsm0ncz7fp1h72pzkh41byv7"; nativeBuildInputs = [ makeWrapper ]; @@ -27,4 +27,4 @@ buildGoModule rec { description = "A simple clipboard manager for Wayland"; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 0329c1bc4a69..f3f89d0a667a 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; }; - modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; + vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; meta = with stdenv.lib; { description = "TUI Client for Docker"; @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aethelz ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d5c75a1e8a7a..e875dd77b02b 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; }; - modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; + vendorSha256 = "1c2iz28hjrw9rig9a6r27wd8clycdhi8fgs3da91c63w4qi140zm"; outputs = [ "out" "man" ]; @@ -63,4 +63,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ma27 ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index d4daa64facb3..cd50271a2e60 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "131gs6xzfggnrzq5jgyky23zvcmhx3q3hd17xvqxd02s2i9x1mg4"; }; - modSha256 = "1lrsg33zd7m24za2gv407hz02n3lmz9qljfk82whlj44hx7kim1z"; + vendorSha256 = "1lhhsf944gm1p6qxn05g2s3hdnra5dggj7pdrdq6qr6r2xg7f5qh"; postInstall = '' mv $out/bin/cli $out/bin/gotify @@ -23,4 +23,4 @@ buildGoModule rec { description = "A command line interface for pushing messages to gotify/server."; maintainers = with maintainers; [ ma27 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 0a8f10fa85d5..46d75e5086e8 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; }; - modSha256 = "0jz8v4rnwm5zbxxp49kv96wm4lack6prwyhcrqwsrm79dr9yjcxf"; + vendorSha256 = "04qpxl4j6v6w25i7r6wghd9xi7jzpy7dynhs9ni35wflq0rlczax"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b1edabad6849..8627003db5f9 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0kl9yrgph1i0jbxhlg3k0411436w80xw1s8dzd7v7h2raygkb4is"; }; - modSha256 = "1c6c6qg8yrhdhqsnqj3jw3x2hi8vrhfm47cp9xlkfnjfrz3nk6jp"; + vendorSha256 = "1zb2z3c2w4gnq9cjczg1y7r7jg4mlrm2hsb12dqd9w8mh44rvr37"; nativeBuildInputs = [ installShellFiles ]; @@ -47,4 +47,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix index c34e934fba48..c92b4ad42e1b 100644 --- a/pkgs/tools/misc/libgen-cli/default.nix +++ b/pkgs/tools/misc/libgen-cli/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "1lfsnyzin2dqhwhz6phms6yipli88sqiw55ls18dfv7bvx30sqlp"; }; - modSha256 = "1k16zjb7p65g72hr9vsk38jhpsy1yclm7fjgq47qy6jwjd44w1bi"; + vendorSha256 = "1j45h8p13xfz0qy1nrddlx1xzbr5vqxd3q76hbb0v60636izfk0r"; subPackages = [ "." ]; @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ zaninime ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 8940fef2a0dd..d1716d95caf2 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ykzrxlllip4wvhd9rja5bcr2m72695fjj2q1scwn8ri6jcgfa19"; }; - modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; + vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix index a4fe58fb1075..e50960d063cf 100644 --- a/pkgs/tools/misc/neo-cowsay/default.nix +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; }; - modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq"; + vendorSha256 = "1clar59x2dvn7yj4fbylby9nrzy8kdixi48hkbmrv8g5l8n0wdl2"; subPackages = [ "cmd/cowsay" "cmd/cowthink" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = with licenses; [artistic1 /* or */ gpl3]; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix index fbeba0ff1bdc..6fe2e814fa4d 100644 --- a/pkgs/tools/misc/pg_flame/default.nix +++ b/pkgs/tools/misc/pg_flame/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1a03vxqnga83mhjp7pkl0klhkyfaby7ncbwm45xbl8c7s6zwhnw2"; }; - modSha256 = "0j7qpvji546z0cfjijdd66l0vsl0jmny6i1n9fsjqjgjpwg26naq"; + vendorSha256 = "1rkx20winh66y2m7i7q13jpr83044i2d1pfd5p5l5kkpsix5mra5"; meta = with lib; { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index fbd32cf876da..edcc2cfc2bf2 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0p8ck4s5jj53nc638darhwbylcsslfmfz72bwy6wxby9iqi9kq6b"; }; - modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; + vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2"; meta = with stdenv.lib; { homepage = "https://pgcenter.org/"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 632ba452ff97..c78aa6a53156 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0f7pjagr3zcqmbhmk446j6n7nanyhvyq4rn68f5wljl9g68ni7sj"; }; - modSha256 = "13a969yki47gw4b3mwhsgl0x53xylmflsykcs63f8pmigckw7jac"; + vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 1a244cd41039..eeb392606edd 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d"; }; - modSha256 = "0r062nka72ah2nb2gf8dfrrj4sxadkykcqjzkp4c9vwk93mhw41k"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + vendorSha256 = "1f780vhxw0brvnr8hhah4sf6ms8spar29rqmy1kcqf9m75n94g56"; subPackages = [ "cmd/pistol" ]; @@ -30,4 +29,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 077116767c3b..33ab2bbc7297 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "135j18d53nhg6adjd2hax067c5f1py9fyprzfcr3plsxnaki2hrx"; }; - modSha256 = "0mz1qrwar9cgrhrgw4z3gwhjj62bnfnn59ji31zkyvwlc1mqh9an"; + vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; meta = with stdenv.lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; @@ -19,4 +19,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix index 1e3378305d99..f0f9cf4cee85 100644 --- a/pkgs/tools/misc/up/default.nix +++ b/pkgs/tools/misc/up/default.nix @@ -4,6 +4,8 @@ buildGoModule rec { pname = "up"; version = "0.3.2"; + patches = [ ./gomod.patch ]; + src = fetchFromGitHub { owner = "akavel"; repo = "up"; @@ -11,7 +13,7 @@ buildGoModule rec { sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if"; }; - modSha256 = "0nfs190rzabphhhyacypz3ic5c4ajlqpx9jiiincs0vxfkmfwnjd"; + vendorSha256 = "1h3w4i7dyh6yagqmdclvflfq6fx0z880jdnpf28assv7fxd9rjsx"; meta = with lib; { description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; @@ -19,4 +21,4 @@ buildGoModule rec { maintainers = with maintainers; [ ma27 ]; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/up/gomod.patch b/pkgs/tools/misc/up/gomod.patch new file mode 100644 index 000000000000..f894f14d21f1 --- /dev/null +++ b/pkgs/tools/misc/up/gomod.patch @@ -0,0 +1,23 @@ +diff --git a/go.mod b/go.mod +index ecbfe90..56a1409 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,11 +1,14 @@ + module github.com/akavel/up + ++go 1.14 ++ + require ( +- github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 ++ github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect + github.com/gdamore/tcell v0.0.0-20180924055237-493f3b46b3c2 +- github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 ++ github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 // indirect + github.com/mattn/go-isatty v0.0.3 +- github.com/mattn/go-runewidth v0.0.2 ++ github.com/mattn/go-runewidth v0.0.2 // indirect + github.com/spf13/pflag v1.0.3 +- golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 ++ golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect ++ golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 // indirect + ) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 116b0b253062..1a2cf5026515 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "05rh61dx4f9kv5p8sahhwwiyivwq438fl30j9d97i4sagvb5jvvm"; }; - modSha256 = "1k7yd2lh6hwz3qm6ywrlr1qw0asqwdgrpj594v1gvav426yqyr6s"; + vendorSha256 = "1f8za3z5pv1pznbd91fk5j4y8qg93qk5zvnchjl7inyirciawdf6"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 6156f43b04b8..be1df3394396 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj"; }; - modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; + vendorSha256 = "1m5jaqf5jrib415k0i7w6rf5bjjwfn572wk94jwfpwjcbbvh8fck"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ hugoreeves ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index f9c1ee4bc315..af21e9d4fef5 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; goPackagePath = "github.com/Dreamacro/clash"; - modSha256 = "113ynl1f01ihmbc376rb421rrjlxxbc8p9fhxrvpxcsm10rjky8w"; + vendorSha256 = "0nh3cn31p7yhnhjzqp84dnhzy3hag253bjp70w8q03lw7mkhdgz3"; buildFlagsArray = [ "-ldflags=" @@ -26,4 +26,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 2fb2cb79ff48..eef345c8db65 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1r9kvz1ylrnfc7y5c4knqhx6xngh1p8j1axb8bd7h7p51c4i7jz2"; }; - modSha256 = "00xisa4l90f0digb1jfd2w616r080m7yp01y1rb83r8k147z5d2v"; + vendorSha256 = "0ncwf197dx6mqzg69mnyp0iyad585izmydm0yj8ikd0y8ngpx7a3"; buildFlagsArray = '' -ldflags= @@ -19,6 +19,8 @@ buildGoModule rec { -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; + deleteVendor = true; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index a0ee38031390..ba31e13c8926 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0kwpn1nv93f8swzc70j8srddqz7qb33pxc9nhqrd92jhcl4cc7iv"; }; - modSha256 = "1wcnf3sd4hkfm38q2z03ixys1hbscay5rsac49ng4kabqjh7rxhg"; + vendorSha256 = "1vl5yz3z5z30rxnnxy74g2m5025vbisqyv31nc21kxdfrdqrwp6c"; subPackages = [ "." ]; @@ -34,4 +34,4 @@ buildGoModule rec { - Does not require a server or port-forwarding ''; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index 179181fc49c1..cb1cf8d97faf 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "09v8alrbw6qva3q3bcqxnyjm7svagfxqvhdff7cqf5pbmkxnhln9"; }; - modSha256 = "18nwq99vv3nbdwfilfn8v64mn58jviwybi93li0lcg7779nxab3d"; + vendorSha256 = "1mxgf004czf65a2mv99gfp27g98xhllmfcz4ynfv66nfkbfz6a8n"; meta = with lib; { description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ma27 ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 3877e6f0e1ac..a2b4f40f5a27 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0nsj75aw5dym1pzn18p6fzh17vcryz1xs4xly6ga79dkpyijr9j8"; }; - modSha256 = "1m8565hkn981b6xld8jyrbxay48ww8lzr94kgakx0rg5548kd7v5"; + vendorSha256 = null; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 438740600c7b..588f8a8c1cbf 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1z914p20n3i1bf4hx5iq2fylx1s49knb70cbg53ji2n7nrm1q33r"; }; - modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; + vendorSha256 = "0pi661mb5vwj16wwxnyx9b0ic7gzby6qfs3y4w00agn6sn5nahx2"; subPackages = [ "cmd/frpc" "cmd/frps" ]; @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index 58e698ed7081..6bae95298fe2 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0dcah6bamjqyp9354qrd1cykdr5k5l93hh7qcy5b4nkag9531gl0"; }; - modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; + vendorSha256 = "0m9nn8x0ji0n9v3d5w5z3grwv0zh8ijvh92jqjpcfv4bcjr5vsjr"; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ pradyuman ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index d65d5c9e3235..8ed6ecbbf26d 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv"; }; - modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; + vendorSha256 = null; meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 0649eb021720..4e81321dc627 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ff2fyr3787zp0lpgbph064am33py2wzjikzmxd3zwp3y0dic770"; }; - modSha256 = "1bcz7jchfnglypr2md9hhqbvcbghic2yp6njdrx3m5nqhylypzfx"; + vendorSha256 = "0nfcxz47v5gl0wih59xarhz82nd8wy61c3ijvg2v08ipk29zivcc"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index ec94fc97997a..69fc3e7a8b00 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xrki9w83b4b3l5adq1rxz374f124wf388sdyvy7ngc3b04k7qlb"; }; - modSha256 = "0v45ikw0bl00412krg4v6sr9bggvsrvl0h6clihkh4mdfz6kwa47"; + vendorSha256 = "094mn1r69c40w7k3lsggjh0dpws9l0j7mgiyjy1lpblkvkyk2azm"; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; @@ -40,4 +40,4 @@ buildGoModule rec { platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 02820c0a74fd..784c6d5c638e 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "05aqmw8x8s0yqyqmdj5zcsq06gsbcmrlcd52gaqm20m1pg9503ad"; }; - modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; + vendorSha256 = "0h3gjxv26pc6cysvy1hny2f4abw6i847dk8fx0m113ixx9qghk87"; meta = with lib; { description = "A pluggable transport proxy"; @@ -18,4 +18,4 @@ buildGoModule rec { repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index bc8ec7da1698..60d2a0986b16 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a"; }; - modSha256 = "1waqaglm6f9zy5296z309ppkck2vmydhk9gjnxrgzmhqld5lcq4f"; + vendorSha256 = "08n3m6fkwh8jmmzky3ygij4gxlcqidqk5ywi8ki8bkyzzs2lqaw7"; subPackages = [ "cmd/pixiecore" ]; meta = { @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; platforms = stdenv.lib.platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index f2ae143e1b9e..f4cc57c9c8b2 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; buildFlags = [ "--tags" "release" ]; @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 90b16e37ed78..97f9b141767b 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "17p7khfiv5aflpl4imbqp8v7gignd6v6a7g80xlnzgix5ismh84l"; }; - modSha256 = "1sdjzj52gkqk51ml29hijzv64clmi38km5z7j7paf28dla2brfxq"; + vendorSha256 = "1vhd3s6yxfhirgipxcy0rh8sk55cdzirr8n8r31sijgyak92mq0l"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index ea1ef86f979b..7933cad687a2 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; + vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7"; postFixup = '' wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} @@ -31,4 +31,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ winpat elseym ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/v2ray/generic.nix b/pkgs/tools/networking/v2ray/generic.nix index bf6e6cd55ae2..e4831f5dced7 100644 --- a/pkgs/tools/networking/v2ray/generic.nix +++ b/pkgs/tools/networking/v2ray/generic.nix @@ -13,7 +13,7 @@ let pname = "v2ray-core"; inherit version src; - modSha256 = "11gsncy3449a7y6w6pr7acqabyj2q2a1q52f8fcl5cdz1vjbmmxi"; + vendorSha256 = "1lh8382gyss01frq4gxyx9p26p5m8f158qfw55sy5wb7ddrafcc2"; buildPhase = '' runHook preBuild @@ -47,4 +47,4 @@ in runCommand "v2ray-${version}" { makeWrapper "$file" "$out/bin/$(basename "$file")" \ --set-default V2RAY_LOCATION_ASSET ${assetsDrv} done -'' +'' \ No newline at end of file diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index d8c8c429ef98..438d620d2b58 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; }; - modSha256 = "1ffp7q7kbkm1312sz6xnpc7342iczy9vj3m76lflirr1ljmw0dnb"; + vendorSha256 = "09xv2p9rydnsb185x61fxhyjqx41wz285c1gdd47ad3s08ay1qc7"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to @@ -37,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ ehmry gazally lassulus ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 54435b76947a..ce155b72fc39 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { }) ]; - modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; + vendorSha256 = "1sh9mx3lc28fzvc1yrhz58rlbaac7aq1dqyvxwj98vld3kigpv1z"; meta = with stdenv.lib; { homepage = "https://mynewt.apache.org/"; @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = with maintainers; [ pjones ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 0b5f5edf3992..b1a44d7458b0 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0zl8xf74k5is8rxbirrqb5cnfgrlppr1gchfqm31305mnpicr92s"; }; - modSha256 = "14izjwadl4ify0wrz0yinqvayar79h0pxxqj5n69a5dgbx09fp0l"; + vendorSha256 = "07xg8cm7pqpnb96drcmzk7rj2dhfn4pd8vr2a7nxqizd3qk6d5bf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index c8b4f069f795..c3756b545e3e 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "age"; version = "unstable-2020-03-25"; goPackagePath = "github.com/FiloSottile/age"; - modSha256 = "00yhn1894ni8bvkqm1vr0rqkky52pkhvdzbi2sqx3czlgb5ibw3h"; + vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; subPackages = [ "cmd/age" @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ tazjin ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 0560f91b22b7..8acb5fb9f83b 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "18hwz9m16pxlb7wp78iqmdi0kimrx3h05fs0zhzm8qhzancq8alf"; }; - modSha256 = "1qhmrjb3fvw6maxrl7hb3bizrw6szhwx6s2g59p5pj3dz4x8jajn"; + vendorSha256 = "1j272w0zdndcz4fmh9fzbk2q8wmyfi70vn0p6d8cg0r0l231sbyx"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ y0no ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index a02d04e1333e..2dd03bc465d9 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - modSha256 = "13yw7idgw8l48yvm4jjha0kbx6q22m2zp13y006mikavynqsr5kj"; + vendorSha256 = "1wcbn0ip596f2dp68y6jmxgv20l0dgrcxg5cwclkawigj05416zj"; postPatch = '' # Because this Makefile will be installed to be used by the user, patch @@ -51,4 +51,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs infinisil ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index c3426bee965b..8b8085511495 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "0q8ighqykh8qyvidnm6az6dc9mp32bbmhkmkqzl1ybbw6paa8pym"; }; - modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; + vendorSha256 = "0kr9i2nm5csf3070hwaiss137pfa3088xbw2zigp7aqb2naky036"; meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ pamplemousse ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index a16701f48ea8..7eec1b5e4bca 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { sha256 = "19xhyyd76r17rwn6s8xgfjnyi7kywagy0i4anqws40w79j3qb1p0"; }; - modSha256 = "0zr4ihpcclw5pfhcdrd4n4qb3i3djcwyvwr4m2kpn99icp55bml8"; + vendorSha256 = "1wn20bh7ma4pblsf6qnlbz5bx4p9apig3d1yz7cpsqv4z3w07baw"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; @@ -61,4 +61,4 @@ buildGoModule rec { well, providing a stellar user experience and a sane, simple interface. ''; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 4373abdb9a4b..42845705ff6b 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -11,7 +11,20 @@ buildGoModule rec { sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc"; }; - modSha256 = "1kcj5065yy52p1jy4fad5lsz3y4spqc40k1qsirm53qqixhrhvag"; + hid = fetchFromGitHub { + owner = "karalabe"; + repo = "hid"; + rev = "9c14560f9ee858c43f40b5cd01392b167aacf4e8"; + sha256 = "0xc7b8mwha64j7l2fr2g5zy8pz7cqi0vrxx60gii52b6ii31xncx"; + }; + + vendorSha256 = "0mns5clykvj33krf29yjh8lkf05nih42ka5ji7miq0iaikqyyc78"; + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${hid}/libusb vendor/github.com/karalabe/hid + cp -r --reflink=auto ${hid}/hidapi vendor/github.com/karalabe/hid + ''; + }); subPackages = [ "." "cmd/saml2aws" ]; @@ -26,4 +39,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 8aa2e219e7df..55dde8438c8a 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1515bk0fl0pvdkp402l51gdg63bmqlh89sglss6prc1qqvv5v2xy"; }; - modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y"; + vendorSha256 = "0yryc799k4563wy53z7amraj89cyprklj0lfv207530hwv5i5gm6"; meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mpl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 4f492def1624..1c46caaf9324 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0y72l65xgfqrgghzbm1zcy776l5m31z0gn6vfr689zyi3k3f4kh8"; }; - modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; + vendorSha256 = "1x4li44vg0l1x205v9a971cgphplxhsrn59q97gmj9cfy4m7jdfw"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ apeyroux marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 44ef60c70f38..2964efd067d9 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "01a2y2604dh2zfy5f2fxr306id0fbq0df91fpz2m8w7rpaszd6xr"; }; - modSha256 = "1gbpxq2vyshln97gij5y9qsjyf3mkwfqwwhikc0cck3mnwiv87dd"; + vendorSha256 = "1ais548gii4q7xzysnw2ykjxyzb7azszsqdlp9hgiwp0bax9nj2n"; meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index bc2adb22c4fa..fe0138783d3b 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0mph3bqfjnw3yf0a6ml3ccmkr1shviwvvq4d04ky4gppfy6z51jy"; }; - modSha256 = "1fzsm85c31vkdw80kijxmjhk8jyhjz8b21npgks2qrnizhm6iaf8"; + vendorSha256 = "1500vim2lmkkls758pwhlx3piqbw6ap0nnhdwz9pcxih4s4as2nk"; outputs = [ "out" "man"]; postInstall = '' @@ -37,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ sondr3 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index cada1eb65c3c..2e397da8a817 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b"; }; - modSha256 = "1386qhk1yr47h7qv15k0abc8mfif96pqapw0v4wrf3pl1z9mzl2n"; + vendorSha256 = "1pw9pb3rdjzf2dx1p1jiqxs7qhlpjki7fy74nyxza5wzrv4317sj"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.gpl3; maintainers = [ maintainers.lethalman ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index fd06129acfae..74a5c87a760e 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = true; - modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; meta = with stdenv.lib; { description = "Small utility to create JSON objects"; @@ -24,5 +24,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; -} - +} \ No newline at end of file diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index cad595079037..ab96392a95d0 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8"; }; - modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z"; + vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8"; subPackages = ["cmd/shfmt"]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -25,4 +25,4 @@ buildGoModule rec { ''; license = licenses.bsd3; }; -} +} \ No newline at end of file From cdb8539006c57050f546971250d38c837c6f8ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 11 May 2020 07:04:58 +0100 Subject: [PATCH 078/310] jx: 2.1.31 -> 2.1.31 --- .../jx/3321-fix-location-of-thrift.patch | 36 ---- .../networking/cluster/jx/default.nix | 13 +- .../networking/cluster/jx/gomod.patch | 186 ------------------ 3 files changed, 4 insertions(+), 231 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch delete mode 100644 pkgs/applications/networking/cluster/jx/gomod.patch diff --git a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch b/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch deleted file mode 100644 index 223d6c6c2477..000000000000 --- a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 40b8eaacb3a24c466c17c8a65938330d5805b112 Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" -Date: Fri, 8 Mar 2019 14:10:11 -0800 -Subject: [PATCH] chore: fix the location of thrift - -Thrift is no longer available at the git.apache.org and it's now -distributed on GitHub at github.com/apache/thrift. - -fixes #3320 ---- - go.mod | 2 ++ - go.sum | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/go.mod b/go.mod -index 04bcc84cc..e26c4cf1d 100644 ---- a/go.mod -+++ b/go.mod -@@ -184,3 +184,5 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d - replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - - replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible -+ -+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 -diff --git a/go.sum b/go.sum -index c9fdf8768..6ed69e69d 100644 ---- a/go.sum -+++ b/go.sum -@@ -87,6 +87,7 @@ github.com/antham/chyle v1.4.0/go.mod h1:D94Z4aE/ECudyNoTHwkhqu77mjGPZtfPG8dNoeI - github.com/antham/envh v1.2.0/go.mod h1:ocIRPHuwwjyBVBtuUJOJc2TYzGg+d23xSAZexl4y9hQ= - github.com/antham/strumt v0.0.0-20171215230529-6776189777d3/go.mod h1:sE7EYIUE0nQzPiv5zQAmw2aVkei0j2xmb4gTIIqSFSI= - github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= -+github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= - github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= - github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= - github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index e2c0b663befa..df39e5d86768 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,22 +1,17 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "jx"; - version = "1.3.967"; + pname = "jx"; + version = "2.1.31"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0a25m7sz134kch21bg6l86kvwl4cg6babqf57kqidq6kid1zgdaq"; + sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn"; }; - patches = [ - # https://github.com/jenkins-x/jx/pull/3321 - ./3321-fix-location-of-thrift.patch - ]; - - modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; + vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s"; subPackages = [ "cmd/jx" ]; diff --git a/pkgs/applications/networking/cluster/jx/gomod.patch b/pkgs/applications/networking/cluster/jx/gomod.patch deleted file mode 100644 index 0116d45955dc..000000000000 --- a/pkgs/applications/networking/cluster/jx/gomod.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/go.mod b/go.mod -index cd54a606e..a78b23286 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,5 +1,7 @@ - module github.com/jenkins-x/jx - -+go 1.14 -+ - require ( - code.gitea.io/sdk v0.0.0-20180702024448-79a281c4e34a - github.com/Azure/draft v0.15.0 -@@ -7,7 +9,6 @@ require ( - github.com/IBM-Cloud/bluemix-go v0.0.0-20181008063305-d718d474c7c2 - github.com/Jeffail/gabs v1.1.1 - github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e -- github.com/Masterminds/semver v1.4.2 // indirect - github.com/Netflix/go-expect v0.0.0-20180814212900-124a37274874 - github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect - github.com/Pallinder/go-randomdata v0.0.0-20180616180521-15df0648130a -@@ -20,7 +21,7 @@ require ( - github.com/andygrunwald/go-gerrit v0.0.0-20181026193842-43cfd7a94eb4 - github.com/andygrunwald/go-jira v1.5.0 - github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect -- github.com/antham/chyle v1.4.0 -+ github.com/antham/chyle v1.9.0 - github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect - github.com/armon/go-radix v1.0.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect -@@ -36,21 +37,18 @@ require ( - github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f - github.com/codeship/codeship-go v0.0.0-20180717142545-7793ca823354 - github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect -- github.com/cpuguy83/go-md2man v1.0.8 // indirect - github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect - github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c - github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect - github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45 // indirect - github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect - github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect -- github.com/emicklei/go-restful v2.8.0+incompatible -- github.com/emirpasic/gods v1.9.0 // indirect -- github.com/fatih/color v1.7.0 -+ github.com/emicklei/go-restful v2.8.0+incompatible // indirect -+ github.com/fatih/color v1.9.0 - github.com/fatih/structs v1.0.0 - github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect - github.com/gfleury/go-bitbucket-v1 v0.0.0-20190216152406-3a732135aa4d - github.com/ghodss/yaml v1.0.0 -- github.com/gliderlabs/ssh v0.1.1 // indirect - github.com/go-ldap/ldap v3.0.1+incompatible // indirect - github.com/go-ole/go-ole v1.2.1 // indirect - github.com/go-openapi/jsonreference v0.17.0 -@@ -59,9 +57,9 @@ require ( - github.com/gobwas/glob v0.2.3 // indirect - github.com/gocql/gocql v0.0.0-20190126123547-8516aabb0f99 // indirect - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b -- github.com/golang/protobuf v1.2.0 -+ github.com/golang/protobuf v1.3.1 - github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect -- github.com/google/go-cmp v0.2.0 -+ github.com/google/go-cmp v0.3.0 - github.com/google/go-containerregistry v0.0.0-20190317040536-ebbba8469d06 // indirect - github.com/google/go-github v17.0.0+incompatible - github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect -@@ -79,15 +77,15 @@ require ( - github.com/hashicorp/go-sockaddr v1.0.0 // indirect - github.com/hashicorp/go-uuid v1.0.1 // indirect - github.com/hashicorp/go-version v0.0.0-20180716215031-270f2f71b1ee -- github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce -+ github.com/hashicorp/hcl v1.0.0 - github.com/hashicorp/vault v0.11.4 - github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20190115203747-edbfe287c5d9 // indirect -- github.com/heptio/sonobuoy v0.12.0 -+ github.com/heptio/sonobuoy v0.18.1 - github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c - github.com/hpcloud/tail v1.0.0 - github.com/iancoleman/orderedmap v0.0.0-20181121102841-22c6ecc9fe13 - github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 // indirect -- github.com/imdario/mergo v0.3.6 -+ github.com/imdario/mergo v0.3.8 - github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect - github.com/jbrukh/bayesian v0.0.0-20161210175230-bf3f261f9a9c // indirect - github.com/jefferai/jsonx v1.0.0 // indirect -@@ -95,14 +93,12 @@ require ( - github.com/jenkins-x/golang-jenkins v0.0.0-20180919102630-65b83ad42314 - github.com/jetstack/cert-manager v0.5.2 - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect -- github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55 // indirect - github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a // indirect - github.com/knative/build v0.5.0 - github.com/knative/build-pipeline v0.1.0 // indirect - github.com/knative/pkg v0.0.0-20190402181056-ff46edef0ae5 - github.com/knative/serving v0.5.0 - github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect -- github.com/kr/pty v1.1.2 // indirect - github.com/kubernetes/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect - github.com/kubernetes/kube-openapi v0.0.0-20190320154901-5e45bb682580 // indirect - github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect -@@ -114,9 +110,8 @@ require ( - github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect - github.com/mholt/archiver v3.1.1+incompatible - github.com/mitchellh/copystructure v1.0.0 // indirect -- github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 // indirect - github.com/mitchellh/go-testing-interface v1.0.0 // indirect -- github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 -+ github.com/mitchellh/mapstructure v1.1.2 - github.com/nlopes/slack v0.0.0-20180721202243-347a74b1ea30 - github.com/nwaples/rardecode v1.0.0 // indirect - github.com/onsi/ginkgo v1.6.0 -@@ -130,55 +125,48 @@ require ( - github.com/petergtz/pegomock v2.2.0+incompatible - github.com/pierrec/lz4 v2.0.5+incompatible // indirect - github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15 -- github.com/pkg/errors v0.8.0 -- github.com/prometheus/common v0.2.0 // indirect -+ github.com/pkg/errors v0.8.1 - github.com/rodaine/hclencoder v0.0.0-20180926060551-0680c4321930 -- github.com/russross/blackfriday v1.5.1 -- github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 -+ github.com/russross/blackfriday v1.5.2 -+ github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 // indirect - github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5 - github.com/sergi/go-diff v1.0.0 // indirect - github.com/sethvargo/go-password v0.1.2 - github.com/shirou/gopsutil v0.0.0-20180901134234-eb1f1ab16f2e - github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect -- github.com/sirupsen/logrus v1.4.1 -- github.com/spf13/cobra v0.0.3 -- github.com/spf13/pflag v1.0.3 -- github.com/src-d/gcfg v1.3.0 // indirect -+ github.com/sirupsen/logrus v1.4.2 -+ github.com/spf13/cobra v0.0.7 -+ github.com/spf13/pflag v1.0.5 - github.com/stoewer/go-strcase v1.0.1 - github.com/stretchr/objx v0.2.0 // indirect -- github.com/stretchr/testify v1.3.0 -+ github.com/stretchr/testify v1.4.0 - github.com/tektoncd/pipeline v0.0.0-20190327171839-7c43fbae2816 - github.com/trivago/tgo v1.0.1 // indirect - github.com/ulikunitz/xz v0.5.6 // indirect - github.com/wbrefvem/go-bitbucket v0.0.0-20190128183802-fc08fd046abb - github.com/xanzy/go-gitlab v0.0.0-20180814191223-f3bc634ab936 -- github.com/xanzy/ssh-agent v0.2.0 // indirect - github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - gocloud.dev v0.9.0 - golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c // indirect -- golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect - golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 // indirect -- golang.org/x/net v0.0.0-20181201002055-351d144fa1fc // indirect - golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 -- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 -- golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 -+ golang.org/x/sync v0.0.0-20190423024810-112230192c58 -+ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e - google.golang.org/api v0.1.0 // indirect - google.golang.org/genproto v0.0.0-20190219182410-082222b4a5c5 // indirect - gopkg.in/AlecAivazis/survey.v1 v1.6.2 - gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect - gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect -- gopkg.in/src-d/go-billy.v4 v4.2.0 // indirect -- gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 // indirect -- gopkg.in/src-d/go-git.v4 v4.5.0 -+ gopkg.in/src-d/go-git.v4 v4.13.1 - gopkg.in/warnings.v0 v0.1.2 // indirect -- gopkg.in/yaml.v2 v2.2.1 -+ gopkg.in/yaml.v2 v2.2.2 - gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20190126160303-ccdd560a045f - k8s.io/apiextensions-apiserver v0.0.0-20181128195303-1f84094d7e8e - k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - k8s.io/client-go v9.0.0+incompatible -- k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da -- k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 -+ k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect -+ k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 // indirect - k8s.io/helm v2.7.2+incompatible - k8s.io/klog v0.2.0 // indirect - k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 -@@ -197,6 +185,4 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d - - replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - --replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible -- - replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 From e6907df0618b496c844c190e0fccdb55462f1a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 11 May 2020 08:03:30 +0100 Subject: [PATCH 079/310] ipfs: switch to vendored tarball --- pkgs/applications/networking/ipfs/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 1f8838e4c29b..5aa270aa8f0f 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,29 +1,30 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ stdenv, buildGoModule, fetchurl, nixosTests }: buildGoModule rec { pname = "ipfs"; version = "0.5.1"; rev = "v${version}"; - src = fetchFromGitHub { - owner = "ipfs"; - repo = "go-ipfs"; - inherit rev; - sha256 = "11l55hlbixv1i25d3n216pkrwgcgac99fa88lyy3dailvminqxw7"; + # go-ipfs makes changes to it's source tarball that don't match the git source. + src = fetchurl { + url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; + sha256 = "0lpilycjbc1g9adp4d5kryfprixj18hg3235fnivakmv7fy2akkm"; }; - postPatch = '' - rm -rf test/dependencies - patchShebangs plugin/loader/preload.sh + # tarball contains multiple files/directories + postUnpack = '' + mkdir ipfs-src + mv * ipfs-src || true + cd ipfs-src ''; - buildPhase = '' - make install - ''; + sourceRoot = "."; + + subPackages = [ "cmd/ipfs" ]; passthru.tests.ipfs = nixosTests.ipfs; - modSha256 = "13mpva3r6r2amw08g0bdggbxn933jjimngkvzgq1q5dksp4mivfk"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; From 81b7c9368c2381d40b0f6967f2ab633c3e4fc014 Mon Sep 17 00:00:00 2001 From: Hugo Reeves Date: Thu, 14 May 2020 18:41:49 +1200 Subject: [PATCH 080/310] cargo-tarpaulin: init at 0.12.4 --- .../analysis/cargo-tarpaulin/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/analysis/cargo-tarpaulin/default.nix diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix new file mode 100644 index 000000000000..1d880f04dd34 --- /dev/null +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -0,0 +1,30 @@ +{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-tarpaulin"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "xd009642"; + repo = "tarpaulin"; + rev = "${version}"; + sha256 = "0y58800n61s8wmpcpgw5vpywznwwbp0d30fz2z0kjx4mpwmva4g4"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + buildInputs = [ openssl ]; + + cargoSha256 = "12hkzq2xn4g5k94kjirjnnz4dddqg7akxnp3qyfkz092vvp25k9z"; + #checkFlags = [ "--test-threads" "1" ]; + doCheck = false; + + meta = with lib; { + description = "A code coverage tool for Rust projects"; + homepage = "https://github.com/xd009642/tarpaulin"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ hugoreeves ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d04e68dc7336..2dd647e6295d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9115,6 +9115,7 @@ in cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { }; From c167fbb3eaa36a080fdfcb1cae6adbf4b72e6721 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Tue, 28 Apr 2020 16:04:41 +0200 Subject: [PATCH 081/310] obs-studio: use addOpenGLRunpath to enable nvenc --- pkgs/applications/video/obs-studio/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index be2a323943d0..ceee3d022bea 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,6 +1,7 @@ { config, stdenv , mkDerivation , fetchFromGitHub +, addOpenGLRunpath , cmake , fdk_aac , ffmpeg @@ -46,7 +47,7 @@ in mkDerivation rec { sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; buildInputs = [ curl fdk_aac @@ -80,6 +81,10 @@ in mkDerivation rec { --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" ''; + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + addOpenGLRunpath $out/lib/lib*.so + ''; + meta = with stdenv.lib; { description = "Free and open source software for video recording and live streaming"; longDescription = '' From 006e6b052f04b36d79651397725bb3359ac61198 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 30 Apr 2020 09:09:40 +0200 Subject: [PATCH 082/310] cri-o: switch to buildGoModule This is just a cleanup to switch from buildGoPackage to buildGoModule. Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 0851f1f716be..14cac1533990 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,6 +1,6 @@ { stdenv , btrfs-progs -, buildGoPackage +, buildGoModule , fetchFromGitHub , glibc , gpgme @@ -14,21 +14,18 @@ , pkg-config }: -buildGoPackage rec { +buildGoModule rec { pname = "cri-o"; version = "1.18.0"; - goPackagePath = "github.com/cri-o/cri-o"; - src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; - + vendorSha256 = null; outputs = [ "out" "man" ]; - nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ @@ -44,8 +41,6 @@ buildGoPackage rec { BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' - pushd go/src/${goPackagePath} - sed -i '/version.buildDate/d' Makefile make binaries docs BUILDTAGS="$BUILDTAGS" From aade6fc7b002e74629b977f7f44572f6622dc279 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:00 +1000 Subject: [PATCH 083/310] cni-plugins: switch to buildGoModule --- pkgs/applications/networking/cluster/cni/plugins.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 34eb6a8ee28d..6aaf67bd1d18 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "cni-plugins"; version = "0.8.6"; @@ -11,10 +11,10 @@ buildGoPackage rec { sha256 = "0f1cqxjf26sy1c4aw6y7pyd9lrz0vknby4q5j6xj77a1pab9073m"; }; - goPackagePath = "github.com/containernetworking/plugins"; + vendorSha256 = null; buildFlagsArray = [ - "-ldflags=-X ${goPackagePath}/pkg/utils/buildversion.BuildVersion=${version}" + "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${version}" ]; subPackages = [ From 1ad3b685f4c82a4d830b57e493d2247898b5f685 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:01 +1000 Subject: [PATCH 084/310] podman: switch to buildGoModule --- pkgs/applications/virtualization/podman/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index d5c52a8dfe8a..995d571a1922 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pkg-config , installShellFiles -, buildGoPackage +, buildGoModule , gpgme , lvm2 , btrfs-progs @@ -12,7 +12,7 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "podman"; version = "1.9.2"; @@ -23,7 +23,7 @@ buildGoPackage rec { sha256 = "0jvqzn1q52z6aka98d2i3dyn2i8xld7xvmi2zfxgm9g53wdgi2g2"; }; - goPackagePath = "github.com/containers/libpod"; + vendorSha256 = null; outputs = [ "out" "man" ]; @@ -32,7 +32,6 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ]; buildPhase = '' - pushd go/src/${goPackagePath} patchShebangs . ${if stdenv.isDarwin then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" From fbdc10572dd5054b4ce9f5315ccd623a83807acc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:02 +1000 Subject: [PATCH 085/310] buildah: switch to buildGoModule --- pkgs/development/tools/buildah/default.nix | 9 ++---- .../buildah/disable-go-module-mode.patch | 32 ------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/tools/buildah/disable-go-module-mode.patch diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3aab8f24da1e..0171dfc0543c 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,5 +1,5 @@ { stdenv -, buildGoPackage +, buildGoModule , fetchFromGitHub , installShellFiles , pkg-config @@ -11,7 +11,7 @@ , libseccomp }: -buildGoPackage rec { +buildGoModule rec { pname = "buildah"; version = "1.14.9"; @@ -24,15 +24,12 @@ buildGoPackage rec { outputs = [ "out" "man" ]; - goPackagePath = "github.com/containers/buildah"; + vendorSha256 = null; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; - patches = [ ./disable-go-module-mode.patch ]; - buildPhase = '' - pushd go/src/${goPackagePath} make GIT_COMMIT="unknown" make -C docs ''; diff --git a/pkgs/development/tools/buildah/disable-go-module-mode.patch b/pkgs/development/tools/buildah/disable-go-module-mode.patch deleted file mode 100644 index 86ca9132529f..000000000000 --- a/pkgs/development/tools/buildah/disable-go-module-mode.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e2d12e52b3638a320a8d69ea4b392b60f44ea57f Mon Sep 17 00:00:00 2001 -From: Mario Rodas -Date: Wed, 4 Dec 2019 21:07:33 -0500 -Subject: [PATCH] Do not check Go module-mode availability - -Since buildah vendorizes its dependencies we use buildGoPackage which -does not uses Go module-mode. The module-mode check will be true -because nixpkgs uses Go 1.13 by default, and building go modules with -buildGoPackage may lead to inconsistencies. ---- - Makefile | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 07724ce4..6383646e 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,14 +15,8 @@ BUILDAH := buildah - GO := go - GO110 := 1.10 - GOVERSION := $(findstring $(GO110),$(shell go version)) --# test for go module support --ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) --export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor --export GO_TEST=GO111MODULE=on $(GO) test -mod=vendor --else - export GO_BUILD=$(GO) build - export GO_TEST=$(GO) test --endif - - GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed")) - SOURCE_DATE_EPOCH ?= $(if $(shell date +%s),$(shell date +%s),$(error "date failed")) From e56116f752f355ca9dead8983f053783f2516bba Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:03 +1000 Subject: [PATCH 086/310] skopeo: switch to buildGoModule --- pkgs/development/tools/skopeo/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 1d4afc0a4ec2..e9fc9a969a70 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,5 @@ { stdenv -, buildGoPackage +, buildGoModule , fetchFromGitHub , runCommand , gpgme @@ -26,18 +26,18 @@ let defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; - goPackagePath = "github.com/containers/skopeo"; - - vendorPath = "${goPackagePath}/vendor/github.com/containers/image/v5"; + vendorPath = "github.com/containers/skopeo/vendor/github.com/containers/image/v5"; in -buildGoPackage { +buildGoModule { pname = "skopeo"; inherit version; - inherit src goPackagePath; + inherit src; outputs = [ "out" "man" ]; + vendorSha256 = null; + excludedPackages = [ "integration" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; @@ -51,11 +51,8 @@ buildGoPackage { ''; postBuild = '' - # depends on buildGoPackage not changing … - pushd ./go/src/${goPackagePath} make install-docs MANINSTALLDIR="$man/share/man" installShellCompletion --bash completions/bash/skopeo - popd ''; postInstall = stdenv.lib.optionals stdenv.isLinux '' From 64ce60e2b36623286f0bf8bb43aec37e527228f4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:04 +1000 Subject: [PATCH 087/310] cri-tools: switch to buildGoModule --- pkgs/tools/virtualization/cri-tools/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 7254b3d63d97..ef622f055ee6 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,10 +1,10 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub , installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "cri-tools"; version = "1.18.0"; @@ -15,12 +15,11 @@ buildGoPackage rec { sha256 = "06sxjhjpd893fn945c1s4adri2bf7s50ddvcw5pnwb6qndzfljw6"; }; - goPackagePath = "github.com/kubernetes-sigs/cri-tools"; + vendorSha256 = null; nativeBuildInputs = [ installShellFiles ]; buildPhase = '' - pushd go/src/${goPackagePath} make binaries VERSION=${version} ''; From ade7faea7214fbb7d0879804e59b3fb9a61d6268 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 13 May 2020 04:39:18 +0000 Subject: [PATCH 088/310] Revert "Revert "libbfd: fix build"" This reverts commit 237ef3095c7604a36ab231d282fcfce02613130d. Looks like we're trying to bump binutils again? --- .../build-components-separately.patch | 38 ++++++------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch index d3cd0d2131cc..38fa4934a28a 100644 --- a/pkgs/development/tools/misc/binutils/build-components-separately.patch +++ b/pkgs/development/tools/misc/binutils/build-components-separately.patch @@ -1,19 +1,8 @@ -From bc09a9236f67e710d545ac11bcdac7b55dbcc1a0 Mon Sep 17 00:00:00 2001 -From: John Ericson -Date: Thu, 12 Oct 2017 11:16:57 -0400 -Subject: [PATCH] Build components separately - ---- - bfd/configure.ac | 18 +++--------------- - opcodes/Makefile.am | 17 +++++++++++++---- - opcodes/configure.ac | 45 ++++++--------------------------------------- - 3 files changed, 22 insertions(+), 58 deletions(-) - diff --git a/bfd/configure.ac b/bfd/configure.ac -index 9a183c1628..8728837384 100644 +index c5bfbd5d..45ad4c26 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -241,31 +241,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, +@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, LT_LIB_M @@ -33,26 +22,26 @@ index 9a183c1628..8728837384 100644 - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" - fi - - # More hacks to build DLLs on Windows. case "${host}" in + # More hacks to build DLLs on Windows. *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" + SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" ;; - # Hack to build or1k-src on OSX - or1k*-*-darwin*) + # Use built-in libintl on macOS, since it is not provided by libc. + *-*-darwin*) - SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" + SHARED_LIBADD="-liberty -lintl" ;; esac diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am -index 925e7ff651..47b395c195 100644 +index 4f06074a..6836c589 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am -@@ -52,7 +52,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) +@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) endif # This is where bfd.h lives. @@ -61,7 +50,7 @@ index 925e7ff651..47b395c195 100644 BUILD_LIBS = @BUILD_LIBS@ BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ -@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ +@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@ # development.sh is used to determine -Werror default. CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh @@ -70,7 +59,7 @@ index 925e7ff651..47b395c195 100644 disassemble.lo: disassemble.c if am__fastdepCC -@@ -324,12 +324,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c +@@ -322,12 +322,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # old version of libbfd, or to pick up libbfd for the wrong architecture # if host != build. So for building with shared libraries we use a # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. @@ -95,10 +84,10 @@ index 925e7ff651..47b395c195 100644 # the build directory so that we don't have to convert all the # programs that use libopcodes.a simultaneously. This is a hack which diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index b9f5eb8a4f..ef2c2152b7 100644 +index 00be9c88..6e589ae4 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac -@@ -89,6 +89,7 @@ AC_PROG_INSTALL +@@ -86,6 +86,7 @@ AC_PROG_INSTALL AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) ACX_HEADER_STRING @@ -106,7 +95,7 @@ index b9f5eb8a4f..ef2c2152b7 100644 AC_CHECK_DECLS([basename, stpcpy]) -@@ -134,61 +135,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, +@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, LT_LIB_M @@ -173,6 +162,3 @@ index b9f5eb8a4f..ef2c2152b7 100644 ;; esac --- -2.14.2 - From e02ec912c599d9edd8fdf8f49236ffd06825c84f Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 14 May 2020 07:49:17 +0000 Subject: [PATCH 089/310] topgrade: 4.4.0 -> 4.5.0 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 20979a467c0f..529252901a4a 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1n9zcz6arbp3gmn360gv0gs703ii59pfgw5gvvwvbm492g2csj3h"; + sha256 = "0df79vlbclv1qx4zwir728c6ggqfawxh2x1py16m5q0ga1hd799j"; }; - cargoSha256 = "08xswkwy6npmx9z8d27l83flq0haj0rnmwkcsz68mlrndz8yymlh"; + cargoSha256 = "0wwxh71i94h68sryckbvrr43gd19qjcs0cgcpycnimkhdcdy8nlj"; buildInputs = lib.optional stdenv.isDarwin Foundation; From 46213cf4d652bf5a5cda7ff996bf6ead3ae5ed79 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Thu, 14 May 2020 11:09:17 +0300 Subject: [PATCH 090/310] nomachine-client: 6.9.2 -> 6.10.12 --- pkgs/tools/admin/nomachine-client/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index b999c65f6f66..a0369ecfea67 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,29 +1,29 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.9"; - versionMinor = "2"; + versionMajor = "6.10"; + versionMinor = "12"; versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in stdenv.mkDerivation rec { pname = "nomachine-client"; version = "${versionMajor}.${versionMinor}"; - + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii"; + sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6"; + sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; - + postUnpack = '' mv $(find . -type f -name nxclient.tar.gz) . mv $(find . -type f -name nxplayer.tar.gz) . @@ -32,7 +32,7 @@ in tar xf nxplayer.tar.gz rm $(find . -maxdepth 1 -type f) ''; - + nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; buildInputs = [ jsoncpp libpulseaudio ]; @@ -50,7 +50,7 @@ in cp "$i"/* "$out/share/icons/hicolor/$(basename $i)/apps/" fi done - + mkdir $out/share/applications cp share/applnk/player/xdg/*.desktop $out/share/applications/ cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/ @@ -62,7 +62,7 @@ in substituteInPlace "$i" --replace /usr/NX/bin $out/bin done ''; - + postFixup = '' makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX @@ -71,7 +71,7 @@ in # have a DT_NEEDED entry for it. patchelf --add-needed libpulse.so.0 $out/NX/lib/libnxcau.so ''; - + dontBuild = true; dontStrip = true; @@ -87,4 +87,4 @@ in platforms = [ "x86_64-linux" "i686-linux" ]; }; } - + From 91f58ec9ccdc07165e35902748cb60b40492e3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 14 May 2020 10:13:25 +0200 Subject: [PATCH 091/310] vscodium: Fix .desktop file --- pkgs/applications/editors/vscode/vscodium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 63e6cc920bf3..8cb21ec4acac 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -32,7 +32,7 @@ in executableName = "codium"; longName = "VSCodium"; - shortName = "Codium"; + shortName = "vscodium"; src = fetchurl { url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}"; From b381e9a5046491c1917140fb793148fbebb5f882 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 14 May 2020 10:15:11 +0200 Subject: [PATCH 092/310] =?UTF-8?q?apostrophe:=202.2.0.2=20=E2=86=92=202.2?= =?UTF-8?q?.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/apostrophe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 391a87345632..b3902293718e 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -11,14 +11,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.2.0.2"; + version = "2.2.0.3"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "13wvfkg0jw9mayd9ifzkqnhf8fmfjgr1lsj4niqbyrw130y9r9f6"; + sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils From 9d55751754345d4fcf52e417b4304722e89ea27b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 13 May 2020 22:04:09 +0200 Subject: [PATCH 093/310] =?UTF-8?q?ocamlPackages.jingoo:=201.2.18=20?= =?UTF-8?q?=E2=86=92=201.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/jingoo/default.nix | 24 +++++++++---------- pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index bf1e59c2f226..7e693c4bf02e 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, pcre, uutf }: +{ lib, buildDunePackage, fetchFromGitHub +, menhir, ppx_deriving, re, uutf, uucp, ounit2 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "jingoo is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "jingoo"; + version = "1.3.4"; -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-jingoo-${version}"; - version = "1.2.18"; + minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "tategakibunko"; repo = "jingoo"; rev = "v${version}"; - sha256 = "0gciiysrjy5r4yiisc41k4h0p530yawzqnr364xg8fdkk444fgkn"; + sha256 = "0fsmm6wxa3axwbcgwdidik3drg754wyh2vxri2w12d662221m98s"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ pcre uutf ]; + buildInputs = [ menhir ]; + propagatedBuildInputs = [ ppx_deriving re uutf uucp ]; + checkInputs = [ ounit2 ]; + doCheck = true; - createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tategakibunko/jingoo"; description = "OCaml template engine almost compatible with jinja2"; license = licenses.mit; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 071d1612b6c4..eb607e305a50 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -393,9 +393,7 @@ let irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { }; - jingoo = callPackage ../development/ocaml-modules/jingoo { - pcre = ocaml_pcre; - }; + jingoo = callPackage ../development/ocaml-modules/jingoo { }; js_of_ocaml = if lib.versionOlder "4.02" ocaml.version From 794a08ca8ed50bc1189f5996c51891a3a50af98a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 08:37:26 +0200 Subject: [PATCH 094/310] sublime3{,-dev}: fix updateScript The HTML page changed and the update script was no longer finding the latest version. I changed it to query for the latest version using dedicated URL: https://forum.sublimetext.com/t/fixed-download-url-for-latest-version/23763/7 Also terminated the update sooner if we detect no update available. update-source-version handles that normally but we are cleaning the version so that we can update both platforms at the same time. --- pkgs/applications/editors/sublime/3/common.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index a75233fcf359..22c23280d17d 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -13,7 +13,7 @@ let primaryBinary = "sublime_text"; primaryBinaryAliases = [ "subl" "sublime" "sublime3" ]; downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; - versionUrl = "https://www.sublimetext.com/${if dev then "3dev" else "3"}"; + versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; archSha256 = if stdenv.hostPlatform.system == "i686-linux" then @@ -133,7 +133,12 @@ in stdenv.mkDerivation (rec { set -o errexit PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} - latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=

Version: Build )([0-9]+)') + latestVersion=$(curl -s ${versionUrl}) + + if [[ "${buildVersion}" = "$latestVersion" ]]; then + echo "The new version same as the old version." + exit 0 + fi for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run From 0df3c2dfe257428e5e9edb6c37d644d0520800c0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 09:02:22 +0200 Subject: [PATCH 095/310] gnome-keysign: remove broken updateScript It is not hosted on GNOME mirrors so GNOME updateScript will not work. --- pkgs/tools/security/gnome-keysign/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index d430a689524a..4b9a6fb0e321 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -6,7 +6,6 @@ , gobject-introspection , gtk3 , glib -, gnome3 , gst_all_1 }: @@ -68,12 +67,6 @@ python3.pkgs.buildPythonApplication rec { twisted ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; From f22083106882352d9edc2428c45f749403ddaf6a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 11:35:36 +0200 Subject: [PATCH 096/310] tracker: format with nixpkgs-fmt --- .../development/libraries/tracker/default.nix | 78 +++++++++++++++---- 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 50eb56ce2d1e..c7f71ead9c0d 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,8 +1,34 @@ -{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, gobject-introspection, python3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales -, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer -, gnome3, icu, libuuid, networkmanager, libsoup, json-glib, systemd, dbus -, substituteAll }: +{ stdenv +, fetchurl +, gettext +, meson +, ninja +, pkgconfig +, gobject-introspection +, python3 +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, docbook_xml_dtd_43 +, glibcLocales +, libxml2 +, upower +, glib +, wrapGAppsHook +, vala +, sqlite +, libxslt +, libstemmer +, gnome3 +, icu +, libuuid +, networkmanager +, libsoup +, json-glib +, systemd +, dbus +, substituteAll +}: stdenv.mkDerivation rec { pname = "tracker"; @@ -15,16 +41,43 @@ stdenv.mkDerivation rec { sha256 = "V3lSJEq5d8eLC4ji9jxBl+q6FuTWa/9pK39YmT4GUW0="; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gdbus = "${glib.bin}/bin/gdbus"; + }) + ]; + nativeBuildInputs = [ - meson ninja vala pkgconfig gettext libxslt wrapGAppsHook gobject-introspection - gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales + meson + ninja + vala + pkgconfig + gettext + libxslt + wrapGAppsHook + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + docbook_xml_dtd_43 + glibcLocales python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkgconfig to install dbus service/s ]; buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer + glib + libxml2 + sqlite + upower + icu + networkmanager + libsoup + libuuid + json-glib + libstemmer ]; mesonFlags = [ @@ -33,13 +86,6 @@ stdenv.mkDerivation rec { "-Ddocs=true" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - gdbus = "${glib.bin}/bin/gdbus"; - }) - ]; - postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate @@ -60,7 +106,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From 39b92f6e45534658b49e79c78154df6333af8472 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 12:06:48 +0200 Subject: [PATCH 097/310] tracker: enable tests Also remove glibcLocales which are no longer needed for tests and add DocBook 4.5 schemas which are needed for something. --- .../development/libraries/tracker/default.nix | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index c7f71ead9c0d..b3681b7a8b69 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -10,7 +10,7 @@ , docbook_xsl , docbook_xml_dtd_412 , docbook_xml_dtd_43 -, glibcLocales +, docbook_xml_dtd_45 , libxml2 , upower , glib @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 - glibcLocales + docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkgconfig to install dbus service/s @@ -80,15 +80,42 @@ stdenv.mkDerivation rec { libstemmer ]; + checkInputs = [ + python3.pkgs.pygobject3 + ]; + mesonFlags = [ # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - "-Dfunctional_tests=false" + # "-Dfunctional_tests=true" "-Ddocs=true" ]; + doCheck = true; + postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate + patchShebangs tests/functional-tests/test-runner.sh.in + patchShebangs tests/functional-tests/*.py + ''; + + preCheck = '' + # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file + export HOME=$(mktemp -d) + + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running functional tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0 + ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0 + ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so + ''; + + postCheck = '' + # Clean up out symlinks + rm -r $out/lib ''; postInstall = '' From 7a642881c971d581cd165c05476dc39d312c772c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 13 May 2020 20:20:20 -0500 Subject: [PATCH 098/310] gopass: 1.9.1 -> 1.9.2 Changelog: https://github.com/gopasspw/gopass/releases/tag/v1.9.2 --- pkgs/tools/security/gopass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 7eec1b5e4bca..6b9042e56914 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.9.1"; + version = "1.9.2"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "19xhyyd76r17rwn6s8xgfjnyi7kywagy0i4anqws40w79j3qb1p0"; + sha256 = "066dphw8xq0g72kj64sdai2yyllnr6ca27bfy5sxhk8x69j97rvz"; }; vendorSha256 = "1wn20bh7ma4pblsf6qnlbz5bx4p9apig3d1yz7cpsqv4z3w07baw"; From b70435e43c540527e7650b652a5ec2690b2fc89b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 14 May 2020 12:50:34 +0200 Subject: [PATCH 099/310] firefox: 76.0 -> 76.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d33535da3764..092f4342e158 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "76.0"; + ffversion = "76.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3dq9h84w1qqidabbrl34jgyjr8bbmbf5wddjazpr7znfm49fn2xyg8fmm5lx9dakghk3wp8yhfi36gmk08fzlrm47v6h17dm9hkh0hz"; + sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q"; }; patches = [ From 3116788c9bab3ad999fdecd310bf9f020cf7686e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 14:16:48 +0200 Subject: [PATCH 100/310] tracker: remove unnecessary dependency upower handling was moved to tracker miners a while ago. --- pkgs/development/libraries/tracker/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index b3681b7a8b69..2224addf02ad 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -12,7 +12,6 @@ , docbook_xml_dtd_43 , docbook_xml_dtd_45 , libxml2 -, upower , glib , wrapGAppsHook , vala @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { glib libxml2 sqlite - upower icu networkmanager libsoup From 0ffc85d64b081f0210787435122ef7f42b81d791 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 May 2020 14:34:50 +0200 Subject: [PATCH 101/310] Remove unused files --- nixos/lib/testing-python.nix | 6 +----- nixos/lib/testing.nix | 6 +----- nixos/lib/testing/jquery-ui.nix | 24 ---------------------- nixos/lib/testing/jquery.nix | 36 --------------------------------- 4 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 nixos/lib/testing/jquery-ui.nix delete mode 100644 nixos/lib/testing/jquery.nix diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 88801f20517d..123323711a7c 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -10,11 +10,7 @@ with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with pkgs; -let - jquery-ui = callPackage ./testing/jquery-ui.nix { }; - jquery = callPackage ./testing/jquery.nix { }; - -in rec { +rec { inherit pkgs; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index cbb7faf039ec..5c784c2f0abe 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -10,11 +10,7 @@ with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with pkgs; -let - jquery-ui = callPackage ./testing/jquery-ui.nix { }; - jquery = callPackage ./testing/jquery.nix { }; - -in rec { +rec { inherit pkgs; diff --git a/nixos/lib/testing/jquery-ui.nix b/nixos/lib/testing/jquery-ui.nix deleted file mode 100644 index 05bd8dc2f946..000000000000 --- a/nixos/lib/testing/jquery-ui.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "jquery-ui-1.11.4"; - - src = fetchurl { - url = "https://jqueryui.com/resources/download/${name}.zip"; - sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh"; - }; - - buildInputs = [ unzip ]; - - installPhase = - '' - mkdir -p "$out/js" - cp -rv . "$out/js" - ''; - - meta = { - homepage = "https://jqueryui.com/"; - description = "A library of JavaScript widgets and effects"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixos/lib/testing/jquery.nix b/nixos/lib/testing/jquery.nix deleted file mode 100644 index 732fdb3ba879..000000000000 --- a/nixos/lib/testing/jquery.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, compressed ? true }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "jquery-1.11.3"; - - src = if compressed then - fetchurl { - url = "http://code.jquery.com/${name}.min.js"; - sha256 = "1f4glgxxn3jnvry3dpzmazj3207baacnap5w20gr2xlk789idfgc"; - } - else - fetchurl { - url = "http://code.jquery.com/${name}.js"; - sha256 = "1v956yf5spw0156rni5z77hzqwmby7ajwdcd6mkhb6zvl36awr90"; - }; - - dontUnpack = true; - - installPhase = - '' - mkdir -p "$out/js" - cp -v "$src" "$out/js/jquery.js" - ${optionalString compressed '' - (cd "$out/js" && ln -s jquery.js jquery.min.js) - ''} - ''; - - meta = with stdenv.lib; { - description = "JavaScript library designed to simplify the client-side scripting of HTML"; - homepage = "http://jquery.com/"; - license = licenses.mit; - platforms = platforms.all; - }; -} From 399f5ea75edae655527781a62f6907974cd07625 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 22:11:32 +1000 Subject: [PATCH 102/310] cri-o: remove propagated inputs, update buildtags --- pkgs/applications/virtualization/cri-o/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 14cac1533990..3796b8857b7f 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -6,8 +6,6 @@ , gpgme , installShellFiles , libapparmor -, libassuan -, libgpgerror , libseccomp , libselinux , lvm2 @@ -32,15 +30,15 @@ buildGoModule rec { btrfs-progs gpgme libapparmor - libassuan - libgpgerror libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; - BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; + BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' + patchShebangs . + sed -i '/version.buildDate/d' Makefile make binaries docs BUILDTAGS="$BUILDTAGS" From e142fbb3f7545863268b82440cb16bf1266add86 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 21:37:47 +1000 Subject: [PATCH 103/310] podman: add libapparmor, libselinux --- pkgs/applications/virtualization/podman/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 995d571a1922..e88e0a60c5ea 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -6,7 +6,9 @@ , gpgme , lvm2 , btrfs-progs +, libapparmor , libseccomp +, libselinux , systemd , go-md2man , nixosTests @@ -29,7 +31,15 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ + btrfs-progs + gpgme + libapparmor + libseccomp + libselinux + lvm2 + systemd + ]; buildPhase = '' patchShebangs . From b57ae988643eed4d05e5b2671e42abb054edee0a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 21:37:48 +1000 Subject: [PATCH 104/310] runc: add libselinux, update buildtags --- pkgs/applications/virtualization/runc/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 95db2a1d9e9a..1bf6b3d574a9 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -8,6 +8,7 @@ , libapparmor , apparmor-parser , libseccomp +, libselinux }: buildGoPackage rec { @@ -25,9 +26,11 @@ buildGoPackage rec { outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; - buildInputs = [ libseccomp libapparmor apparmor-parser ]; - makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" ]; + buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; + + # these will be the default in the next release + makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; buildPhase = '' cd go/src/${goPackagePath} From 65be068b0b4ea88f9636a28a472fd2f28dfcc967 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 21:37:48 +1000 Subject: [PATCH 105/310] buildah: remove propagated input, add libapparmor --- pkgs/development/tools/buildah/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 0171dfc0543c..d033fe52e6c2 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,9 +4,9 @@ , installShellFiles , pkg-config , gpgme -, libgpgerror , lvm2 , btrfs-progs +, libapparmor , libselinux , libseccomp }: @@ -27,9 +27,18 @@ buildGoModule rec { vendorSha256 = null; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; + + buildInputs = [ + btrfs-progs + gpgme + libapparmor + libseccomp + libselinux + lvm2 + ]; buildPhase = '' + patchShebangs . make GIT_COMMIT="unknown" make -C docs ''; From f28b0d64ad4567bd0968f025cc7dd13fa6b32230 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 22:11:34 +1000 Subject: [PATCH 106/310] skopeo: remove outdated/propagated inputs --- pkgs/development/tools/skopeo/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index e9fc9a969a70..5532c3088e06 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -3,11 +3,9 @@ , fetchFromGitHub , runCommand , gpgme -, libgpgerror , lvm2 , btrfs-progs , pkg-config -, libselinux , go-md2man , installShellFiles , makeWrapper @@ -41,8 +39,9 @@ buildGoModule { excludedPackages = [ "integration" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; + buildInputs = [ gpgme ] - ++ stdenv.lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; + ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildFlagsArray = '' -ldflags= From 496bd1c706edcf3f1e757b059a015ab2be71460c Mon Sep 17 00:00:00 2001 From: Nikolaj Hey Hinnerskov Date: Thu, 14 May 2020 15:14:02 +0200 Subject: [PATCH 107/310] nixosTests.kubernetes: port tests to python --- nixos/tests/kubernetes/base.nix | 8 ++-- nixos/tests/kubernetes/dns.nix | 74 ++++++++++++++++++++++----------- nixos/tests/kubernetes/rbac.nix | 68 ++++++++++++++++++++---------- 3 files changed, 98 insertions(+), 52 deletions(-) diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index adb736506895..86de9455e737 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -3,7 +3,7 @@ pkgs ? import ../../.. { inherit system config; } }: -with import ../../lib/testing.nix { inherit system pkgs; }; +with import ../../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let @@ -75,10 +75,8 @@ let ) machines; testScript = '' - startAll; - - ${test} - ''; + start_all() + '' + test; }; mkKubernetesMultiNodeTest = attrs: mkKubernetesBaseTest ({ diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 638942e15407..890499a0fb8a 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -75,51 +75,75 @@ let singleNodeTest = { test = '' # prepare machine1 for test - $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready"); - $machine1->waitUntilSucceeds("docker load < ${redisImage}"); - $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); - $machine1->waitUntilSucceeds("kubectl create -f ${redisService}"); - $machine1->waitUntilSucceeds("docker load < ${probeImage}"); - $machine1->waitUntilSucceeds("kubectl create -f ${probePod}"); + machine1.wait_until_succeeds("kubectl get node machine1.${domain} | grep -w Ready") + machine1.wait_until_succeeds( + "docker load < ${redisImage}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${redisPod}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${redisService}" + ) + machine1.wait_until_succeeds( + "docker load < ${probeImage}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${probePod}" + ) # check if pods are running - $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'"); + machine1.wait_until_succeeds("kubectl get pod redis | grep Running") + machine1.wait_until_succeeds("kubectl get pod probe | grep Running") + machine1.wait_until_succeeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'") # check dns on host (dnsmasq) - $machine1->succeed("host redis.default.svc.cluster.local"); + machine1.succeed("host redis.default.svc.cluster.local") # check dns inside the container - $machine1->succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local"); + machine1.succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local") ''; }; multiNodeTest = { test = '' # Node token exchange - $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); - $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); + machine1.wait_until_succeeds( + "cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret" + ) + machine2.wait_until_succeeds( + "cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join" + ) # prepare machines for test - $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready"); - $machine2->waitUntilSucceeds("docker load < ${redisImage}"); - $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); - $machine1->waitUntilSucceeds("kubectl create -f ${redisService}"); - $machine2->waitUntilSucceeds("docker load < ${probeImage}"); - $machine1->waitUntilSucceeds("kubectl create -f ${probePod}"); + machine1.wait_until_succeeds("kubectl get node machine2.${domain} | grep -w Ready") + machine2.wait_until_succeeds( + "docker load < ${redisImage}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${redisPod}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${redisService}" + ) + machine2.wait_until_succeeds( + "docker load < ${probeImage}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${probePod}" + ) # check if pods are running - $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'"); + machine1.wait_until_succeeds("kubectl get pod redis | grep Running") + machine1.wait_until_succeeds("kubectl get pod probe | grep Running") + machine1.wait_until_succeeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'") # check dns on hosts (dnsmasq) - $machine1->succeed("host redis.default.svc.cluster.local"); - $machine2->succeed("host redis.default.svc.cluster.local"); + machine1.succeed("host redis.default.svc.cluster.local") + machine2.succeed("host redis.default.svc.cluster.local") # check dns inside the container - $machine1->succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local"); + machine1.succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local") ''; }; in { diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index 3ce7adcd0d71..c922da515d91 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -94,43 +94,67 @@ let singlenode = base // { test = '' - $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready"); + machine1.wait_until_succeeds("kubectl get node machine1.my.zyx | grep -w Ready") - $machine1->waitUntilSucceeds("docker load < ${kubectlImage}"); + machine1.wait_until_succeeds( + "docker load < ${kubectlImage}" + ) - $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}"); - $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}"); - $machine1->waitUntilSucceeds("kubectl apply -f ${roRoleBinding}"); - $machine1->waitUntilSucceeds("kubectl create -f ${kubectlPod}"); + machine1.wait_until_succeeds( + "kubectl apply -f ${roServiceAccount}" + ) + machine1.wait_until_succeeds( + "kubectl apply -f ${roRole}" + ) + machine1.wait_until_succeeds( + "kubectl apply -f ${roRoleBinding}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${kubectlPod}" + ) - $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running"); + machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running") - $machine1->waitUntilSucceeds("kubectl exec -ti kubectl -- kubectl get pods"); - $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json"); - $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl"); + machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods") + machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json") + machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl") ''; }; multinode = base // { test = '' # Node token exchange - $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); - $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); + machine1.wait_until_succeeds( + "cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret" + ) + machine2.wait_until_succeeds( + "cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join" + ) - $machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready"); + machine1.wait_until_succeeds("kubectl get node machine2.my.zyx | grep -w Ready") - $machine2->waitUntilSucceeds("docker load < ${kubectlImage}"); + machine2.wait_until_succeeds( + "docker load < ${kubectlImage}" + ) - $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}"); - $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}"); - $machine1->waitUntilSucceeds("kubectl apply -f ${roRoleBinding}"); - $machine1->waitUntilSucceeds("kubectl create -f ${kubectlPod}"); + machine1.wait_until_succeeds( + "kubectl apply -f ${roServiceAccount}" + ) + machine1.wait_until_succeeds( + "kubectl apply -f ${roRole}" + ) + machine1.wait_until_succeeds( + "kubectl apply -f ${roRoleBinding}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${kubectlPod}" + ) - $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running"); + machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running") - $machine1->waitUntilSucceeds("kubectl exec -ti kubectl -- kubectl get pods"); - $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json"); - $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl"); + machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods") + machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json") + machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl") ''; }; From e9dbf2e508860eac8f627228b956ab318e472a5b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 May 2020 09:18:52 -0400 Subject: [PATCH 108/310] linux: 4.19.122 -> 4.19.123 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 577138542b34..4cb90abc29ff 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.122"; + version = "4.19.123"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1980vza1vf6cl772dynn4m0rgdjazbn125kd6sb3s06gqn72cl2h"; + sha256 = "0gwrkbbfy85ajxpg7q6j9mn8mzhmsr1v3wmh5c76p34d3b9i96d7"; }; } // (args.argsOverride or {})) From e3ba43b82638ed09e711f5f634c6a450dc7ccd53 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 May 2020 09:19:02 -0400 Subject: [PATCH 109/310] linux: 5.4.40 -> 5.4.41 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index ffe594809153..e2554cf91b4c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.40"; + version = "5.4.41"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ar001rljlr15rcl77la5y1cj3plaqhdblnh87xsmv47fq13yml3"; + sha256 = "0mxhz3f0ayz0nggndbikp44kx307yxf16qzsv46hni6p8z1ffr0y"; }; } // (args.argsOverride or {})) From 7ef8639163a6e27ed3c218c2a5db6da75dba88a6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 May 2020 09:19:09 -0400 Subject: [PATCH 110/310] linux: 5.6.12 -> 5.6.13 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index 844fb18c21a4..e3eb296d6ddc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.12"; + version = "5.6.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0892ar2irfhd612sb8jpx85w0wwh4n76jgsv8wb92fp6mim37sns"; + sha256 = "11zriz0jwqizv0pq0laql0svsnspdfnxqykq70v22x39iyfdf9gi"; }; } // (args.argsOverride or {})) From a40a811b1742365e463f3bd45a56b09608c4ccd3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 May 2020 09:30:54 +0300 Subject: [PATCH 111/310] mariadb-galera: 25.3.27 -> 26.4.3 --- nixos/tests/mysql/mariadb-galera-mariabackup.nix | 6 +++--- nixos/tests/mysql/mariadb-galera-rsync.nix | 6 +++--- pkgs/servers/sql/mariadb/galera/25.nix | 6 ------ pkgs/servers/sql/mariadb/galera/default.nix | 12 +++++------- pkgs/top-level/all-packages.nix | 3 +-- 5 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 pkgs/servers/sql/mariadb/galera/25.nix diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index 73abf6c555f9..9b94ae7048cb 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -57,7 +57,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://"; wsrep_cluster_name = "galera"; wsrep_node_address = "192.168.1.1"; @@ -104,7 +104,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; wsrep_cluster_name = "galera"; wsrep_node_address = "192.168.1.2"; @@ -151,7 +151,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; wsrep_cluster_name = "galera"; wsrep_node_address = "192.168.1.3"; diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix index cacae4569b57..a35a67e31d77 100644 --- a/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -53,7 +53,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://"; wsrep_cluster_name = "galera-rsync"; wsrep_node_address = "192.168.2.1"; @@ -99,7 +99,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; wsrep_cluster_name = "galera-rsync"; wsrep_node_address = "192.168.2.2"; @@ -145,7 +145,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; wsrep_cluster_name = "galera-rsync"; wsrep_node_address = "192.168.2.3"; diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix deleted file mode 100644 index 2772d60e398b..000000000000 --- a/pkgs/servers/sql/mariadb/galera/25.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./. (args // { - version = "25.3.27"; - sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q"; -}) diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index a6ce8f4b0471..6c3a1af907dd 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchFromGitHub, buildEnv , asio, boost, check, openssl, scons -, version, sha256, ... }: let - pname = "mariadb-galera"; galeraLibs = buildEnv { name = "galera-lib-inputs-united"; paths = [ openssl.out boost check ]; }; -in stdenv.mkDerivation { - inherit pname; - inherit version; +in stdenv.mkDerivation rec { + pname = "mariadb-galera"; + version = "26.4.3"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - inherit sha256; + sha256 = "1r0b4kxgqrivnwm4hprnpscb16v6l6j8cnvk4i8c64fig1ly8g3j"; fetchSubmodules = true; }; @@ -40,7 +38,7 @@ in stdenv.mkDerivation { installPhase = '' # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${pname}" + GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} install -m 555 "garb/garbd" "$out/bin/garbd" install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dd647e6295d..12b47de766b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15865,8 +15865,7 @@ in mariadb-connector-c = mariadb-connector-c_3_1; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; - mariadb-galera = mariadb-galera_25; - mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix { + mariadb-galera = callPackage ../servers/sql/mariadb/galera { asio = asio_1_10; }; From 6ac9a9fcb48374362907039354533518788cf480 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 May 2020 09:59:07 +0300 Subject: [PATCH 112/310] mariadb: 10.3.22 -> 10.4.12 --- .../sql/mariadb/cmake-disable-auth-pam-testing.patch | 12 ++++++++++++ pkgs/servers/sql/mariadb/default.nix | 12 +++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch diff --git a/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch b/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch new file mode 100644 index 000000000000..864ee818d3c1 --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch @@ -0,0 +1,12 @@ +diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt +index a556b870..918a26f9 100644 +--- a/plugin/auth_pam/CMakeLists.txt ++++ b/plugin/auth_pam/CMakeLists.txt +@@ -22,7 +22,6 @@ IF(HAVE_PAM_APPL_H) + COMPONENT Server) + ENDIF() + IF(TARGET auth_pam OR TARGET auth_pam_v1) +- ADD_SUBDIRECTORY(testing) + ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) + TARGET_LINK_LIBRARIES(pam_user_map pam) + SET_TARGET_PROPERTIES (pam_user_map PROPERTIES PREFIX "") diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9b5118eacc36..ac9772922ec2 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.3.22"; + version = "10.4.12"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1iyf1hl82nqsci5h327a537rvdrc5qcbrd1v3fc4cxy2pmfha01j"; + sha256 = "0252b9rxxz1ljjv6ni0wwgy14j8qmmdd2sq0a65dslx2ib9y3wgy"; name = "mariadb-${version}.tar.gz"; }; @@ -111,7 +111,6 @@ common = rec { # attributes common to both builds }; meta = { - description = "An enhanced, drop-in replacement for MySQL"; homepage = "https://mariadb.org/"; license = licenses.gpl2; @@ -161,7 +160,10 @@ server = stdenv.mkDerivation (common // { ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; - patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ + patches = common.patches ++ [ + # Disable build unused plugin pam_mariadb_mtr.so. See https://jira.mariadb.org/browse/MDEV-21654 + ./cmake-disable-auth-pam-testing.patch + ] ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -198,7 +200,7 @@ server = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common - rm "$out"/bin/{mysql_client_test,mysqltest} + rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql From b8c8e810aa330798cc458f412fd6282632e80073 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 May 2020 10:22:52 +0300 Subject: [PATCH 113/310] nixos/mysql: disable load pluginx auth_socket in mariadb --- nixos/modules/services/databases/mysql.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index f9e657f57742..71b7afa3d39c 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -87,7 +87,6 @@ in datadir = /var/lib/mysql bind-address = 127.0.0.1 port = 3336 - plugin-load-add = auth_socket.so !includedir /etc/mysql/conf.d/ '''; @@ -315,7 +314,6 @@ in datadir = cfg.dataDir; bind-address = mkIf (cfg.bind != null) cfg.bind; port = cfg.port; - plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; } (mkIf (cfg.replication.role == "master" || cfg.replication.role == "slave") { log-bin = "mysql-bin-${toString cfg.replication.serverId}"; @@ -323,6 +321,9 @@ in relay-log = "mysql-relay-bin"; server-id = cfg.replication.serverId; }) + (mkIf (!isMariaDB) { + plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; + }) ]; users.users.mysql = { From a4c7e0f502be64f326339d9ed609d24e99b594ff Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 May 2020 10:51:17 +0300 Subject: [PATCH 114/310] nixos/mysql: add release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 315a2eaeacb6..c52fbdfebe9d 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -61,6 +61,28 @@ This is to make it possible to use podman instead of docker. + + + MariaDB has been updated to 10.4, MariaDB Galera to 26.4. + Before you upgrade, it would be best to take a backup of your database. + For MariaDB Galera Cluster, see Upgrading + from MariaDB 10.3 to MariaDB 10.4 with Galera Cluster instead. + Before doing the upgrade read Incompatible + Changes Between 10.3 and 10.4. + After the upgrade you will need to run mysql_upgrade. + MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more + intuitive. See Authentication from MariaDB 10.4. + unix_socket auth plugin does not use a password, and uses the connecting user's UID instead. When a new MariaDB data directory is initialized, two MariaDB users are + created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use + the traditional mysql_native_password plugin method, one must run the following: + +services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' + ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret"); +''; + + When MariaDB data directory is just upgraded (not initialized), the users are not created or modified. + + From 963259d4ed340c00a0494de29a20d0da4185f0fa Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 May 2020 21:27:02 +0300 Subject: [PATCH 115/310] nixos/tests/mariadb-galera-mariabackup: fix test script MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. --- .../mysql/mariadb-galera-mariabackup.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index 9b94ae7048cb..cae55878060c 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -55,7 +55,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://"; @@ -102,7 +102,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; @@ -149,7 +149,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; @@ -184,17 +184,17 @@ in { galera_03.wait_for_unit("mysql") galera_03.wait_for_open_port(3306) galera_02.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 37" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" ) galera_02.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" ) galera_02.succeed("systemctl stop mysql") galera_01.succeed( "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" ) galera_03.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" ) galera_01.succeed( "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" @@ -202,22 +202,22 @@ in { galera_02.succeed("systemctl start mysql") galera_02.wait_for_open_port(3306) galera_02.succeed( - "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" ) galera_03.succeed( - "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" ) galera_01.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db3;' -N | grep 39" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 39" ) galera_02.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db2;' -N | grep 38" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 38" ) galera_03.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 37" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" ) galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_02.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db2;'") - galera_03.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db1;'") + galera_02.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_03.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") ''; }) From 90f30032f3a8349fced2b29614562477cc6f33c9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 May 2020 21:30:25 +0300 Subject: [PATCH 116/310] nixos/tests/mariadb-galera-rsync: fix test script MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. --- nixos/tests/mysql/mariadb-galera-rsync.nix | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix index a35a67e31d77..4318efae8a93 100644 --- a/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -51,7 +51,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://"; @@ -97,7 +97,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; @@ -143,7 +143,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; @@ -177,17 +177,17 @@ in { galera_06.wait_for_unit("mysql") galera_06.wait_for_open_port(3306) galera_05.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 41" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" ) galera_05.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" ) galera_05.succeed("systemctl stop mysql") galera_04.succeed( "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" ) galera_06.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" ) galera_04.succeed( "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" @@ -195,22 +195,22 @@ in { galera_05.succeed("systemctl start mysql") galera_05.wait_for_open_port(3306) galera_05.succeed( - "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" ) galera_06.succeed( - "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" ) galera_04.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db3;' -N | grep 43" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 43" ) galera_05.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db2;' -N | grep 42" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 42" ) galera_06.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 41" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" ) galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_05.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db2;'") - galera_06.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db1;'") + galera_05.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_06.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") ''; }) From f52700fc146493fc185848200901b561e266cbda Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 May 2020 21:53:10 +0300 Subject: [PATCH 117/310] nixos/tests/mysql-replication: fix test script MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. --- nixos/tests/mysql/mysql-replication.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index 81038dccd947..b5e003250193 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -59,7 +59,7 @@ in master.wait_for_open_port(3306) # Wait for testdb to be fully populated (5 rows). master.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + "sudo -u mysql mysql -u mysql -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" ) slave1.start() @@ -71,19 +71,21 @@ in # wait for replications to finish slave1.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + "sudo -u mysql mysql -u mysql -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" ) slave2.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + "sudo -u mysql mysql -u mysql -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" ) slave2.succeed("systemctl stop mysql") - master.succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N") + master.succeed( + "echo 'insert into testdb.tests values (123, 456);' | sudo -u mysql mysql -u mysql -N" + ) slave2.succeed("systemctl start mysql") slave2.wait_for_unit("mysql") slave2.wait_for_open_port(3306) slave2.wait_until_succeeds( - "echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456" + "echo 'select * from testdb.tests where Id = 123;' | sudo -u mysql mysql -u mysql -N | grep 456" ) ''; }) From da08b22e1aa4687f5e74f9bab2aedaf4fb018bdc Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 May 2020 22:47:56 +0300 Subject: [PATCH 118/310] nixos/mysql-replication: ignore system databases in binary log --- nixos/modules/services/databases/mysql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 71b7afa3d39c..44183788d936 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -320,6 +320,7 @@ in log-bin-index = "mysql-bin-${toString cfg.replication.serverId}.index"; relay-log = "mysql-relay-bin"; server-id = cfg.replication.serverId; + binlog-ignore-db = [ "information_schema" "performance_schema" "mysql" ]; }) (mkIf (!isMariaDB) { plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; @@ -445,7 +446,6 @@ in ( echo "stop slave;" echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';" - echo "set global slave_exec_mode='IDEMPOTENT';" echo "start slave;" ) | ${mysql}/bin/mysql -u root -N ''} From dde9810bd895e3016200c7ec915b41e03c07db99 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 12 May 2020 14:30:52 +0300 Subject: [PATCH 119/310] mysql57, mysql80: build with protobuf 3.7 They fail to build with protobuf 3.8: In file included from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol/message.h:24, from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h:23, from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/client_session.h:24, from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_session.h:25, from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_plugin.cc:23: /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h:32:10: fatal error: google/protobuf/wire_format_lite_inl.h: No such file or directory 32 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [rapid/plugin/x/CMakeFiles/mysqlx.dir/build.make:203: rapid/plugin/x/CMakeFiles/mysqlx.dir/src/xpl_plugin.cc.o] Error 1 make[2]: *** Waiting for unfinished jobs.... --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12b47de766b4..c3104b53eabd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15926,12 +15926,14 @@ in inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost159; + protobuf = protobuf3_7; }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost169; # Configure checks for specific version. + protobuf = protobuf3_7; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; From b59b7414c35e5c4026c53453329a25e4260b958b Mon Sep 17 00:00:00 2001 From: Ethan Glasser-Camp Date: Thu, 14 May 2020 12:00:01 -0400 Subject: [PATCH 120/310] nixos/manual: document use of systemd to mount filesystems (#87684) * nixos/manual: document use of systemd to mount filesystems --- nixos/doc/manual/configuration/file-systems.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index e4c03de71b72..3ac02a975ebf 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -16,6 +16,17 @@ fsType = "ext4"; }; + This will create an entry in /etc/fstab, which will + generate a corresponding + systemd.mount + unit via + systemd-fstab-generator. + The filesystem will be mounted automatically unless + "noauto" is present in options. + "noauto" filesystems can be mounted explicitly using + systemctl e.g. systemctl start + data.mount. Mount points are created automatically if they don’t already exist. For , it’s best to use the topology-independent device aliases in From 9ec8205e78314abd912e0ca4a2e2f22d0bffd59a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 7 May 2020 21:42:08 +0200 Subject: [PATCH 121/310] =?UTF-8?q?ocamlPackages.tyxml:=204.3.0=20?= =?UTF-8?q?=E2=86=92=204.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.eliom: 6.10.1 → 6.12.0 --- pkgs/development/ocaml-modules/eliom/default.nix | 4 ++-- pkgs/development/ocaml-modules/tyxml/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 559c21cecac8..4ce502af19f1 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -14,11 +14,11 @@ else stdenv.mkDerivation rec { pname = "eliom"; - version = "6.10.1"; + version = "6.12.0"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "006722wcmhsfhyzv3qbgrrn53fbv9v4i31z52a0pznb6cll45nkm"; + sha256 = "015jh72v6ch9h9czd8sn5kjz3pv6lsnvvnhdjgrplwj443dn1xp8"; }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 0d0d43229f89..5d5e7dedd233 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "tyxml"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; - sha256 = "1hxzppfvsdls2y8qiwvz31hmffzh2hgglf01am1vzf2f31mxf6vf"; + sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi"; }; propagatedBuildInputs = [ uutf re ]; From 6f4f37d655d994340cd2f15ebbcb0205dadb9678 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 14 May 2020 18:17:50 +0200 Subject: [PATCH 122/310] nixos/manual: fix build This broke in https://github.com/NixOS/nixpkgs/pull/86376 Also, fix some stray trailing whitespaces --- nixos/doc/manual/release-notes/rl-2009.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c52fbdfebe9d..341b304cb9e2 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -73,7 +73,7 @@ MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. See Authentication from MariaDB 10.4. unix_socket auth plugin does not use a password, and uses the connecting user's UID instead. When a new MariaDB data directory is initialized, two MariaDB users are - created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use + created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use the traditional mysql_native_password plugin method, one must run the following: services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' @@ -124,7 +124,6 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' The go-modules builder now uses vendorSha256 instead of modSha256 to pin fetched version data. This is currently a warning, but will be removed in the next release. - @@ -218,13 +217,13 @@ environment.systemPackages = [ customizable to your liking by using php.withExtensions or php.buildEnv instead of writing config files - or changing configure flags. + or changing configure flags. The remaining configuration flags can now be set directly on - the php attribute. For example, instead of + the php attribute. For example, instead of php.override { From 131663718e97f26583d8f80d068888f8dc0591d8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 14 May 2020 18:28:24 +0300 Subject: [PATCH 123/310] newsboat: fix on darwin --- .../networking/feedreaders/newsboat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 5b97859304cb..74a43f00ca83 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace Makefile --replace "|| true" "" + '' + stdenv.lib.optionalString stdenv.isDarwin '' # Allow other ncurses versions on Darwin substituteInPlace config.sh \ --replace "ncurses5.4" "ncurses" @@ -25,13 +26,13 @@ rustPlatform.buildRustPackage rec { pkgconfig asciidoctor gettext - ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv gettext ]; postBuild = '' - make + make prefix="$out" ''; # TODO: Check if that's still needed From 9cc24aa9f0dd9f2d65fd56fd0fdac31555eaa23c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 17 Feb 2020 17:54:16 +0800 Subject: [PATCH 124/310] kdeFrameworks.qqc2-desktop-style: init at 5.68 --- .../libraries/kde-frameworks/default.nix | 5 +++-- .../kde-frameworks/qqc2-desktop-style.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 3d618f09e382..1db37bc78790 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -105,8 +105,10 @@ let kdbusaddons = callPackage ./kdbusaddons.nix {}; kdnssd = callPackage ./kdnssd.nix {}; kguiaddons = callPackage ./kguiaddons.nix {}; + kholidays = callPackage ./kholidays.nix {}; ki18n = callPackage ./ki18n.nix {}; kidletime = callPackage ./kidletime.nix {}; + kirigami2 = callPackage ./kirigami2.nix {}; kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; kplotting = callPackage ./kplotting.nix {}; @@ -117,12 +119,11 @@ let networkmanager-qt = callPackage ./networkmanager-qt.nix {}; oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; prison = callPackage ./prison.nix {}; + qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix {}; solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; - kirigami2 = callPackage ./kirigami2.nix {}; - kholidays = callPackage ./kholidays.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix new file mode 100644 index 000000000000..ed372e01aeb2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, qtquickcontrols2 +, qtx11extras +, kconfig +, kiconthemes +, kirigami2 +}: + +mkDerivation { + name = "qqc2-desktop-style"; + meta = { maintainers = with lib.maintainers; [ ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras qtquickcontrols2 kconfig kiconthemes kirigami2 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d04e68dc7336..f72a6defec54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14179,7 +14179,7 @@ in knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose kcontacts; ### KDE PLASMA 5 From e88673aa27dea719295bcb6ec1ae6a67eca3d683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 14 May 2020 06:52:32 +0200 Subject: [PATCH 125/310] mkl: fix expectation of MKLROOT being set in pkg-config files The Intel MKL pkg-config files did not work, because they expect that the MKLROOT environment variable is set. This change replaces occurences by the actual path of MKL in the Nix store. Since the pkg-config files seem to break quite frequently after upgrades, add a post-install check to validate the pkg-config files. --- .../libraries/science/math/mkl/default.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 2df39b330c45..016864abed8c 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,12 @@ -{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin, enableStatic ? false }: +{ stdenvNoCC +, fetchurl +, pkgconfig +, rpmextract +, undmg +, darwin +, enableStatic ? false +}: + /* For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. @@ -44,6 +52,10 @@ in stdenvNoCC.mkDerivation { else [ rpmextract ]; + installCheckInputs = [ pkgconfig ]; + + doInstallCheck = true; + buildPhase = if stdenvNoCC.isDarwin then '' for f in Contents/Resources/pkg/*.tgz; do tar xzvf $f @@ -77,6 +89,7 @@ in stdenvNoCC.mkDerivation { bn=$(basename $f) substituteInPlace $f \ --replace "prefix=/mkl" "prefix=$out" \ + --replace $\{MKLROOT} "$out" \ --replace "lib/intel64_lin" "lib" done @@ -139,6 +152,11 @@ in stdenvNoCC.mkDerivation { install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib ''; + # Validate pkgconfig files, since they break often on updates. + installCheckPhase = '' + pkg-config --validate $out/lib/pkgconfig/*.pc + ''; + # Per license agreement, do not modify the binary dontStrip = true; dontPatchELF = true; From 04a4941379e42708669eb6b4eeee779cc0858f10 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 14 May 2020 11:07:08 -0400 Subject: [PATCH 126/310] pythonPackages.dash-core-components: 1.9.1 -> 1.10.1 --- .../python-modules/dash-core-components/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index b4af53cb296a..e88591aba9af 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.9.1"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0mi608d4q4clx5ikblqni5v67k051k894q0w5asa3jj1v0agawpa"; + sha256 = "1bqvxm7h3b0wah32jrsn919hp4xr1zlkxclbs261mvd57ps0rf9h"; }; # No tests in archive From d7e620c39652fc33514b27d43d95b15b11877da8 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 14 May 2020 11:07:40 -0400 Subject: [PATCH 127/310] pythonPackages.dash-renderer: 1.3.0 -> 1.4.1 --- pkgs/development/python-modules/dash-renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index 348deba7123b..a92f6617abec 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "07nyajjc3209ha2nbvk43sh5bnslwb2hs9wn8q5dpfngsc96wr9g"; + sha256 = "11fl7756zshlrfiqcr6rcg1m0c4434vdg1bkrcjl54hl02k3pcmv"; }; # No tests in archive From 4bdb7d2ab6f68dbba83e532eee7693c5ccf44e20 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 14 May 2020 11:08:00 -0400 Subject: [PATCH 128/310] pythonPackages.dash-table: 4.6.2 -> 4.7.0 --- pkgs/development/python-modules/dash-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 3ea04666249d..9c323c6fa33f 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.6.2"; + version = "4.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1hn1yjz5ig2kzkk0wkr75q3l4lrfbnsh0kxzlld9sfn69d1vvsjw"; + sha256 = "0md7qqjpsarc8ymfccvsqgj6mgq8gxl09im5v5yxhv8hv24yy4jm"; }; # No tests in archive From c8727a324edf91d4f6dea5f9e3eb3ec37fe434d3 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 14 May 2020 11:08:31 -0400 Subject: [PATCH 129/310] pythonPackages.dash: 1.10.0 -> 1.12.0 --- pkgs/development/python-modules/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 83632ff6db68..4a9a9a60af87 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "18rrysfhmjfzb5b3n8fjbwk755p4slbb8fh9myq4qp76v00lfpnh"; + sha256 = "0nr5ppjbfmay0d3bah26i4k8xj6xyp24gq0cqlv9lzdrbdd3j9wy"; }; propagatedBuildInputs = [ From d13fc39d84590658cc82c68e8902a8bbf2ebb65a Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 14 May 2020 12:16:08 -0700 Subject: [PATCH 130/310] starship: 0.41.0 -> 0.41.1 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 6e720bf1034c..8016c73cd3f3 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.41.0"; + version = "0.41.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1m5pi49g3pj2qr5slyasda5xp9lz3xhz3qb9k0pa6fvcn9581r9q"; + sha256 = "0q41f1zj27vz5sg7harmk9zvmyc37w8hr5f74ipws438wz27qwm3"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "18z1p8xj1v9w6amc52gc2vcn5f4z8k71ig20zmj005v24si9pfwf"; + cargoSha256 = "1i6d2vsgcjclk0r6j5lmynk5m0my2yphn0q9rm53s43n1vyf2g2v"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { From 2ed4bfd7eb6b08966a24698d727f75431d002935 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 14 May 2020 12:16:37 -0700 Subject: [PATCH 131/310] starship: add Frostman to maintainers --- pkgs/tools/misc/starship/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 8016c73cd3f3..c1fd2fedde79 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; - maintainers = with maintainers; [ bbigras davidtwco filalex77 ]; + maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman ]; platforms = platforms.all; }; } From d00c84b5bd90d4fe348f836191f7e6228a0e752e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 8 May 2020 08:25:10 +0200 Subject: [PATCH 132/310] ocamlPackages.lablgtkmathview: remove at 0.7.2 --- .../ocaml-modules/lablgtkmathview/default.nix | 40 ------------------- pkgs/top-level/ocaml-packages.nix | 4 -- 2 files changed, 44 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/lablgtkmathview/default.nix diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix deleted file mode 100644 index b91e92684755..000000000000 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, pkgconfig, ocaml, findlib, gmetadom, gtkmathview, lablgtk }: - -let - pname = "lablgtkmathview"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.7.2"; - - src = fetchurl { - url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz"; - sha256 = "0rgrpgwrgphw106l1xawxir002b7rmzc23rcxhv8ib6rymp1divx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib gmetadom gtkmathview lablgtk]; - - createFindlibDestdir = true; - - propagatedBuildInputs = [gtkmathview]; - - prePatch = '' - substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib" - ''; - - buildPhase = '' - mkdir -p .test - make - make opt - ''; - - meta = { - homepage = "http://helm.cs.unibo.it/mml-widget/"; - description = "OCaml bindings for gtkmathview"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - broken = true; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index eb607e305a50..f21f3ca9cbed 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -447,10 +447,6 @@ let then callPackage ../development/ocaml-modules/lablgtk-extras { } else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; - lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { - gtkmathview = callPackage ../development/libraries/gtkmathview { }; - }; - labltk = callPackage ../development/ocaml-modules/labltk { }; lacaml = callPackage ../development/ocaml-modules/lacaml { }; From 608dbf662c52e29db0143d8b9c4c3e31c8f6e1a8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 8 May 2020 08:25:16 +0200 Subject: [PATCH 133/310] =?UTF-8?q?ocamlPackages.lablgtk:=202.18.8=20?= =?UTF-8?q?=E2=86=92=202.18.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures compatibility with OCaml 4.10 --- .../ocaml-modules/lablgtk/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index e9ad3104d3f0..2b6c3028fd6c 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: +{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = let check = stdenv.lib.versionAtLeast ocaml.version; in - if check "4.06" then { - version = "2.18.8"; - url = "https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz"; - sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci"; + if check "4.06" then rec { + version = "2.18.10"; + src = fetchFromGitHub { + owner = "garrigue"; + repo = "lablgtk"; + rev = version; + sha256 = "0w8cdfcv2wc19sd3qzj3qq77qc6rbnbynsz02gzbl15kgrvgrfxi"; + }; } else if check "3.12" then { version = "2.18.5"; - url = "https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz"; - sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz"; + sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + }; } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in stdenv.mkDerivation { pname = "lablgtk"; - inherit (param) version; - - src = fetchurl { - inherit (param) url sha256; - }; + inherit (param) version src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; From d30e2468e0c7875d3d4d47404f52647ccea76fcf Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:14:16 +0000 Subject: [PATCH 134/310] agda: rework builder --- doc/languages-frameworks/agda.section.md | 96 ++++++++++++ doc/languages-frameworks/index.xml | 1 + pkgs/build-support/agda/default.nix | 141 ++++++++---------- .../libraries/agda/agda-prelude/default.nix | 16 +- .../default.nix | 12 +- .../default.nix | 12 +- pkgs/top-level/agda-packages.nix | 24 +++ pkgs/top-level/all-packages.nix | 13 +- pkgs/top-level/release.nix | 1 + 9 files changed, 205 insertions(+), 111 deletions(-) create mode 100644 doc/languages-frameworks/agda.section.md rename pkgs/development/libraries/agda/{agda-iowa-stdlib => iowa-stdlib}/default.nix (71%) rename pkgs/development/libraries/agda/{agda-stdlib => standard-library}/default.nix (74%) create mode 100644 pkgs/top-level/agda-packages.nix diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md new file mode 100644 index 000000000000..7a5dc767b7c4 --- /dev/null +++ b/doc/languages-frameworks/agda.section.md @@ -0,0 +1,96 @@ +--- +title: Agda +author: Alex Rice (alexarice) +date: 2020-01-06 +--- +# Agda + +## How to use Agda + +Agda can be installed from `agda`: +``` +$ nix-env -iA agda +``` + +To use agda with libraries, the `agda.withPackages` function can be used. This function either takes: ++ A list of packages, ++ or a function which returns a list of packages when given the `agdaPackages` attribute set, ++ or an attribute set containing a list of packages and a GHC derivation for compilation (see below). + +For example, suppose we wanted a version of agda which has access to the standard library. This can be obtained with the expressions: + +``` +agda.withPackages [ agdaPackages.standard-library ] +``` + +or + +``` +agda.withPackages (p: [ p.standard-library ]) +``` + +or can be called as in the [Compiling Agda](#compiling-agda) section. + +If you want to use a library in your home directory (for instance if it is a development version) then typecheck it manually (using `agda.withPackages` if necessary) and then override the `src` attribute of the package to point to your local repository. + +Agda will not by default use these libraries. To tell agda to use the library we have some options: +- Call `agda` with the library flag: +``` +$ agda -l standard-library -i . MyFile.agda +``` +- Write a `my-library.agda-lib` file for the project you are working on which may look like: +``` +name: my-library +include: . +depends: standard-library +``` +- Create the file `~/.agda/defaults` and add any libraries you want to use by default. + +More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html). + +## Compiling Agda +Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee` is made available to the Agda program via the `--with-compiler` flag. +This can be overridden by a different version of `ghc` as follows: + +``` +agda.withPackages { + pkgs = [ ... ]; + ghc = haskell.compiler.ghcHEAD; +} +``` + +## Writing Agda packages +To write a nix derivation for an agda library, first check that the library has a `*.agda-lib` file. + +A derivation can then be written using `agdaPackages.mkDerivation`. This has similar arguments to `stdenv.mkDerivation` with the following additions: ++ `everythingFile` can be used to specify the location of the `Everything.agda` file, defaulting to `./Everything.agda`. If this file does not exist then either it should be patched in or the `buildPhase` should be overridden (see below). ++ `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`. ++ `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`. + +The build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden (or a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file). `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. The install phase simply copies all `.agda`, `.agdai` and `.agda-lib` files to the output directory. Again, this can be overridden. + +To add an agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other agda libraries, so the top line of the `default.nix` can look like: +``` +{ mkDerivation, standard-library, fetchFromGitHub }: +``` +and `mkDerivation` should be called instead of `agdaPackages.mkDerivation`. Here is an example skeleton derivation for iowa-stdlib: + +``` +mkDerivation { + version = "1.5.0"; + pname = "iowa-stdlib"; + + src = ... + + libraryFile = ""; + libraryName = "IAL-1.3"; + + buildPhase = '' + patchShebangs find-deps.sh + make + ''; +} +``` +This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName = "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`. + +When writing an agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes agda to think that the nix store is a agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613). diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 9364c764bbf9..97202751f7d3 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -5,6 +5,7 @@ The standard build environment makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of stdenv. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. + diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 0d054eaa5469..205aff555730 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -1,90 +1,71 @@ -# Builder for Agda packages. Mostly inspired by the cabal builder. +# Builder for Agda packages. -{ stdenv, Agda, glibcLocales -, writeShellScriptBin -, extension ? (self: super: {}) -}: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages }: -with stdenv.lib.strings; +with lib.strings; let - defaults = self : { - # There is no Hackage for Agda so we require src. - inherit (self) src name; - - isAgdaPackage = true; - - buildInputs = [ Agda ] ++ self.buildDepends; - buildDepends = []; - - buildDependsAgda = stdenv.lib.filter - (dep: dep ? isAgdaPackage && dep.isAgdaPackage) - self.buildDepends; - buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; - - # Not much choice here ;) - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = stdenv.lib.optionalString - stdenv.isLinux - "${glibcLocales}/lib/locale/locale-archive"; - - everythingFile = "Everything.agda"; - - propagatedBuildInputs = self.buildDependsAgda; - propagatedUserEnvPkgs = self.buildDependsAgda; - - # Immediate source directories under which modules can be found. - sourceDirectories = [ ]; - - # This is used if we have a top-level element that only serves - # as the container for the source and we only care about its - # contents. The directories put here will have their - # *contents* copied over as opposed to sourceDirectories which - # would make a direct copy of the whole thing. - topSourceDirectories = [ "src" ]; - - # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" - includeDirs = self.buildDependsAgdaShareAgda - ++ self.sourceDirectories ++ self.topSourceDirectories - ++ [ "." ]; - buildFlags = stdenv.lib.concatMap (x: ["-i" x]) self.includeDirs; - - agdaWithArgs = "${Agda}/bin/agda ${toString self.buildFlags}"; - - buildPhase = '' - runHook preBuild - ${self.agdaWithArgs} ${self.everythingFile} - runHook postBuild + withPackages' = { + pkgs, + ghc ? ghcWithPackages (p: with p; [ ieee ]) + }: let + pkgs' = if builtins.isList pkgs then pkgs else pkgs self; + library-file = writeText "libraries" '' + ${(concatMapStringsSep "\n" (p: "${p}/${p.libraryFile}") pkgs')} ''; + pname = "agdaWithPackages"; + version = Agda.version; + in runCommandNoCC "${pname}-${version}" { + inherit pname version; + nativeBuildInputs = [ makeWrapper ]; + passthru.unwrapped = Agda; + } '' + mkdir -p $out/bin + makeWrapper ${Agda}/bin/agda $out/bin/agda \ + --add-flags "--with-compiler=${ghc}/bin/ghc" \ + --add-flags "--library-file=${library-file}" \ + --add-flags "--local-interfaces" + makeWrapper ${Agda}/bin/agda-mode $out/bin/agda-mode + ''; # Local interfaces has been added for now: See https://github.com/agda/agda/issues/4526 - installPhase = let - srcFiles = self.sourceDirectories - ++ map (x: x + "/*") self.topSourceDirectories; - in '' - runHook preInstall - mkdir -p $out/share/agda - cp -pR ${concatStringsSep " " srcFiles} $out/share/agda - runHook postInstall - ''; + withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; }; - passthru = { - env = stdenv.mkDerivation { - name = "interactive-${self.name}"; - inherit (self) LANG LOCALE_ARCHIVE; - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; - buildInputs = let - # Makes a wrapper available to the user. Very useful in - # nix-shell where all dependencies are -i'd. - agdaWrapper = writeShellScriptBin "agda" '' - exec ${self.agdaWithArgs} "$@" - ''; - in [agdaWrapper] ++ self.buildDepends; + + defaults = + { pname + , buildInputs ? [] + , everythingFile ? "./Everything.agda" + , libraryName ? pname + , libraryFile ? "${libraryName}.agda-lib" + , buildPhase ? null + , installPhase ? null + , ... + }: let + agdaWithArgs = withPackages (builtins.filter (p: p ? isAgdaDerivation) buildInputs); + in + { + inherit libraryName libraryFile; + + isAgdaDerivation = true; + + buildInputs = buildInputs ++ [ agdaWithArgs ]; + + buildPhase = if buildPhase != null then buildPhase else '' + runHook preBuild + agda -i ${dirOf everythingFile} ${everythingFile} + runHook postBuild + ''; + + installPhase = if installPhase != null then installPhase else '' + runHook preInstall + mkdir -p $out + find \( -name '*.agda' -or -name '*.agdai' -or -name '*.agda-lib' \) -exec cp -p --parents -t "$out" {} + + runHook postInstall + ''; }; - }; - }; in -{ mkDerivation = args: let - super = defaults self // args self; - self = super // extension self super; - in stdenv.mkDerivation self; +{ + mkDerivation = args: stdenv.mkDerivation (args // defaults args); + + inherit withPackages withPackages'; } diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 86f21ad9b19c..1709ce314d96 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,16 +1,16 @@ -{ stdenv, agda, fetchgit }: +{ stdenv, mkDerivation, fetchFromGitHub }: -agda.mkDerivation (self: rec { +mkDerivation rec { version = "eacc961c2c312b7443109a7872f99d55557df317"; - name = "agda-prelude-${version}"; + pname = "agda-prelude"; - src = fetchgit { - url = "https://github.com/UlfNorell/agda-prelude.git"; + src = fetchFromGitHub { + owner = "UlfNorell"; + repo = "agda-prelude"; rev = version; sha256 = "0iql67hb1q0fn8dwkcx07brkdkxqfqrsbwjy71ndir0k7qzw7qv2"; }; - topSourceDirectories = [ "src" ]; everythingFile = "src/Prelude.agda"; meta = with stdenv.lib; { @@ -18,6 +18,6 @@ agda.mkDerivation (self: rec { description = "Programming library for Agda"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ mudri ]; + maintainers = with maintainers; [ mudri alexarice ]; }; -}) +} diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix similarity index 71% rename from pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix rename to pkgs/development/libraries/agda/iowa-stdlib/default.nix index 23013bfbc324..9cda6ceec133 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -1,8 +1,8 @@ -{ stdenv, agda, fetchFromGitHub }: +{ stdenv, mkDerivation, fetchFromGitHub }: -agda.mkDerivation (self: rec { +mkDerivation (rec { version = "1.5.0"; - name = "agda-iowa-stdlib-${version}"; + pname = "iowa-stdlib"; src = fetchFromGitHub { owner = "cedille"; @@ -11,7 +11,9 @@ agda.mkDerivation (self: rec { sha256 = "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g"; }; - sourceDirectories = [ "./." ]; + libraryFile = ""; + libraryName = "IAL-1.3"; + buildPhase = '' patchShebangs find-deps.sh make @@ -22,6 +24,6 @@ agda.mkDerivation (self: rec { description = "Agda standard library developed at Iowa"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ alexarice ]; }; }) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix similarity index 74% rename from pkgs/development/libraries/agda/agda-stdlib/default.nix rename to pkgs/development/libraries/agda/standard-library/default.nix index 6647677f71c0..6d85d560a9bd 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,8 +1,8 @@ -{ stdenv, agda, fetchFromGitHub, ghcWithPackages }: +{ stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }: -agda.mkDerivation (self: rec { +mkDerivation rec { + pname = "standard-library"; version = "1.1"; - name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; @@ -16,13 +16,11 @@ agda.mkDerivation (self: rec { runhaskell GenerateEverything.hs ''; - topSourceDirectories = [ "src" ]; - meta = with stdenv.lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ jwiegley mudri ]; + maintainers = with maintainers; [ jwiegley mudri alexarice ]; }; -}) +} diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix new file mode 100644 index 000000000000..5bd57b5dec89 --- /dev/null +++ b/pkgs/top-level/agda-packages.nix @@ -0,0 +1,24 @@ +{ pkgs, lib, callPackage, newScope, Agda }: + +let + mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); + mkAgdaPackages' = Agda: self: let + callPackage = self.callPackage; + inherit (callPackage ../build-support/agda { + inherit Agda self; + inherit (pkgs.haskellPackages) ghcWithPackages; + }) withPackages mkDerivation; + in { + inherit mkDerivation; + + agda = withPackages [] // { inherit withPackages; }; + + standard-library = callPackage ../development/libraries/agda/standard-library { + inherit (pkgs.haskellPackages) ghcWithPackages; + }; + + iowa-stdlib = callPackage ../development/libraries/agda/iowa-stdlib { }; + + agda-prelude = callPackage ../development/libraries/agda/agda-prelude { }; + }; +in mkAgdaPackages Agda diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea1a07917621..8c1414803eeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15128,19 +15128,10 @@ in ### DEVELOPMENT / LIBRARIES / AGDA - agda = callPackage ../build-support/agda { - glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; - extension = self : super : { }; + agdaPackages = callPackage ./agda-packages.nix { inherit (haskellPackages) Agda; }; - - agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { }; - - agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { }; - - AgdaStdlib = callPackage ../development/libraries/agda/agda-stdlib { - inherit (haskellPackages) ghcWithPackages; - }; + agda = agdaPackages.agda; ### DEVELOPMENT / LIBRARIES / JAVA diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e0723523f4e5..60a4a679f161 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -181,6 +181,7 @@ let haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; + agdaPackages = packagePlatforms pkgs.agdaPackages; tests = packagePlatforms pkgs.tests; From c2814be3a329288a391c9436493ab6dcaa36f3ce Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 13:20:59 +0000 Subject: [PATCH 135/310] agda-prelude: update --- .../libraries/agda/agda-prelude/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 1709ce314d96..bdc1b27cef4f 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,23 +1,32 @@ { stdenv, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "eacc961c2c312b7443109a7872f99d55557df317"; + version = "compat-2.6.0"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; rev = version; - sha256 = "0iql67hb1q0fn8dwkcx07brkdkxqfqrsbwjy71ndir0k7qzw7qv2"; + sha256 = "0brg61qrf8izqav80qpx77dbdxvlnsxyy0v7hmlrmhg68b5lp38y"; }; - everythingFile = "src/Prelude.agda"; + preConfigure = '' + cd test + make everything + mv Everything.agda .. + cd .. + ''; + + everythingFile = "./Everything.agda"; meta = with stdenv.lib; { homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + # broken since Agda 2.6.1 + broken = true; maintainers = with maintainers; [ mudri alexarice ]; }; } From 6c1cdedb6d6203aff485422c1b84cde6df7add57 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 17:22:00 +0000 Subject: [PATCH 136/310] agda-categories: init at 0.1 --- .../agda/agda-categories/default.nix | 28 +++++++++++++++++++ pkgs/top-level/agda-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/agda/agda-categories/default.nix diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix new file mode 100644 index 000000000000..11f8d71f1cd7 --- /dev/null +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -0,0 +1,28 @@ +{ lib, mkDerivation, fetchFromGitHub, standard-library }: + +mkDerivation rec { + version = "0.1"; + pname = "agda-categories"; + + src = fetchFromGitHub { + owner = "agda"; + repo = "agda-categories"; + rev = "release/v${version}"; + sha256 = "0m4pjy92jg6zfziyv0bxv5if03g8k4413ld8c3ii2xa8bzfn04m2"; + }; + + buildInputs = [ standard-library ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A new Categories library"; + license = licenses.bsd3; + platforms = platforms.unix; + # agda categories takes a lot of memory to build. + # This can be removed if this is eventually fixed upstream. + hydraPlatforms = []; + # Waiting for release 0.2 for this to work + broken = true; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 5bd57b5dec89..3f4d7db0c7c7 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -20,5 +20,7 @@ let iowa-stdlib = callPackage ../development/libraries/agda/iowa-stdlib { }; agda-prelude = callPackage ../development/libraries/agda/agda-prelude { }; + + agda-categories = callPackage ../development/libraries/agda/agda-categories { }; }; in mkAgdaPackages Agda From a7cd372a3e913bf526e4f72847ad1bbda23cc811 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 5 Jan 2020 23:34:35 +0000 Subject: [PATCH 137/310] agda.standard-library: 1.1 -> 1.3 --- pkgs/development/libraries/agda/standard-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 6d85d560a9bd..1b76aefe6fc1 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "190bxsy92ffmvwpmyyg3lxs91vyss2z25rqz1w79gkj56484cy64"; + sha256 = "18kl20z3bjfgx5m3nvrdj5776qmpi7jl2p12pqybsls2lf86m0d5"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; From 11750651110696c4da6357adeea62d452ef6837c Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sat, 21 Mar 2020 11:58:44 +0000 Subject: [PATCH 138/310] agda.iowa-stdlib: mark broken --- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 9cda6ceec133..6fa45f58e78c 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -24,6 +24,8 @@ mkDerivation (rec { description = "Agda standard library developed at Iowa"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; + # broken since Agda 2.6.1 + broken = true; maintainers = with stdenv.lib.maintainers; [ alexarice ]; }; }) From b78a5a0e79808550e450d8c5aba142309fe15fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Sun, 19 Apr 2020 20:01:37 +0200 Subject: [PATCH 139/310] agda: Added test --- nixos/tests/agda.nix | 41 +++++++++++++++++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + 2 files changed, 42 insertions(+) create mode 100644 nixos/tests/agda.nix diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix new file mode 100644 index 000000000000..e158999e57d1 --- /dev/null +++ b/nixos/tests/agda.nix @@ -0,0 +1,41 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + hello-world = pkgs.writeText "hello-world" '' + open import IO + + main = run(putStrLn "Hello World!") + ''; +in +{ + name = "agda"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ alexarice turion ]; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = [ + (pkgs.agda.withPackages { + pkgs = p: [ p.standard-library ]; + }) + ]; + virtualisation.memorySize = 2000; # Agda uses a lot of memory + }; + + testScript = '' + # Minimal script that typechecks + machine.succeed("touch TestEmpty.agda") + machine.succeed("agda TestEmpty.agda") + + # Minimal script that actually uses the standard library + machine.succeed('echo "import IO" > TestIO.agda') + machine.succeed("agda -l standard-library -i . TestIO.agda") + + # # Hello world + machine.succeed( + "cp ${hello-world} HelloWorld.agda" + ) + machine.succeed("agda -l standard-library -i . -c HelloWorld.agda") + ''; +} +) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cbfdf3ad9c20..c4d7e38f54ea 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -23,6 +23,7 @@ in { _3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; + agda = handleTest ./agda.nix {}; atd = handleTest ./atd.nix {}; automysqlbackup = handleTest ./automysqlbackup.nix {}; avahi = handleTest ./avahi.nix {}; From 43fb96efe89c2215a58b576ee70e8b8ca0413897 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sat, 2 May 2020 13:25:18 -0700 Subject: [PATCH 140/310] iowa-stdlib: update homepage URL The old homepage URL, which was hosted inside the old SVN server, isn't publicly accessible anymore. Since the project has officially moved to github, it seems better to set the github repo as the homepage. --- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 6fa45f58e78c..3cd1921be2d5 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -20,7 +20,7 @@ mkDerivation (rec { ''; meta = { - homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/"; + homepage = "https://github.com/cedille/ial"; description = "Agda standard library developed at Iowa"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; From 8ee4c3698c573e76cdb6617356ef21a3013a18ae Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Thu, 14 May 2020 20:50:00 +0100 Subject: [PATCH 141/310] Agda: Add turion as maintainer --- pkgs/development/libraries/agda/agda-categories/default.nix | 2 +- pkgs/development/libraries/agda/agda-prelude/default.nix | 2 +- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 +- pkgs/development/libraries/agda/standard-library/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 11f8d71f1cd7..9eb68b5a64ac 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -23,6 +23,6 @@ mkDerivation rec { hydraPlatforms = []; # Waiting for release 0.2 for this to work broken = true; - maintainers = with maintainers; [ alexarice ]; + maintainers = with maintainers; [ alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index bdc1b27cef4f..2bec10c02dd1 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -27,6 +27,6 @@ mkDerivation rec { platforms = stdenv.lib.platforms.unix; # broken since Agda 2.6.1 broken = true; - maintainers = with maintainers; [ mudri alexarice ]; + maintainers = with maintainers; [ mudri alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 3cd1921be2d5..55cd6a742e54 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -26,6 +26,6 @@ mkDerivation (rec { platforms = stdenv.lib.platforms.unix; # broken since Agda 2.6.1 broken = true; - maintainers = with stdenv.lib.maintainers; [ alexarice ]; + maintainers = with stdenv.lib.maintainers; [ alexarice turion ]; }; }) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 1b76aefe6fc1..4bff585ac3a9 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -21,6 +21,6 @@ mkDerivation rec { description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ jwiegley mudri alexarice ]; + maintainers = with maintainers; [ jwiegley mudri alexarice turion ]; }; } From 9a0b7457d304b85444ac07cbb0c0aa45cf453d63 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Thu, 14 May 2020 06:42:05 -0700 Subject: [PATCH 142/310] =?UTF-8?q?ocamlPackages.x509:=200.11.1=20?= =?UTF-8?q?=E2=86=92=200.11.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/x509/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index eae40d4dfaed..289a3891c783 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "1vmjqwmxf7zz157rlp3wp3zp88kw62m4f22i0xmxhinssd0dvr9c"; + sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22"; }; useDune2 = true; From 1d3fbaac004f30478c8784ffc21adce941219d13 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Thu, 14 May 2020 05:03:49 -0400 Subject: [PATCH 143/310] bibtool: 2.67 -> 2.68 cf. https://github.com/ge-ne/bibtool/issues/76 --- pkgs/tools/misc/bibtool/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index 2f90745785a2..041dabeee775 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibtool"; - version = "2.67"; + version = "2.68"; src = fetchurl { url = "http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-${version}.tar.gz"; - sha256 = "116pv532mz0q954y5b7c6zipnamc05f0x7g5x1b674jsjxh42v2v"; + sha256 = "1ymq901ckaysq2n1bplk1064rb2njq9n30pii15w157y0lxcwd3i"; }; # Perl for running test suite. @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; doCheck = true; + checkTarget = "test"; meta = with stdenv.lib; { description = "Tool for manipulating BibTeX bibliographies"; From 022f2cc02f75ea44f96d1a7174e6da3d612a4b01 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 14 May 2020 23:03:09 +0200 Subject: [PATCH 144/310] nomachine-client: Add archive.org to source urls NoMachine removes each old release as soon as a new one is available, resulting in failed downloads. Thankfully, the Internet Archive provides backups of old downloads, so we can use it as a fallback. --- pkgs/tools/admin/nomachine-client/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index a0369ecfea67..a4d201fd4c4c 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -13,12 +13,18 @@ in src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; + urls = [ + "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" + "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" + ]; sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; + urls = [ + "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" + "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" + ]; sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg"; } else From b7ddd316f1ba041c0d9f79973996f097708681fb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 15 May 2020 00:23:28 +0200 Subject: [PATCH 145/310] postgresql: Use runuser instead of sudo Currently, sudo doesn't work in a NixOS container running inside a Nix build, because Nix's seccomp filter doesn't allow setuid programs. In any case, runuser is a bit lower-overhead than sudo. --- nixos/modules/services/databases/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 982480fbd99c..579b6a4d9c67 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -343,7 +343,7 @@ in # Wait for PostgreSQL to be ready to accept connections. postStart = '' - PSQL="${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql --port=${toString cfg.port}" + PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}" while ! $PSQL -d postgres -c "" 2> /dev/null; do if ! kill -0 "$MAINPID"; then exit 1; fi From 5746259af694fc791743c322f2cf0d47e3d0d9bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 15 May 2020 01:39:42 +0300 Subject: [PATCH 146/310] gotify: adapt update script to use vendor sha --- pkgs/servers/gotify/default.nix | 2 +- pkgs/servers/gotify/update.sh | 12 ++++++------ pkgs/servers/gotify/vendor-sha.nix | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 pkgs/servers/gotify/vendor-sha.nix diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 47f5925edfcd..5d305c1e4122 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { sha256 = import ./source-sha.nix; }; - vendorSha256 = "1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3"; + vendorSha256 = import ./vendor-sha.nix; postPatch = '' substituteInPlace app.go \ diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh index e26ffbde62ee..dc39a15be739 100755 --- a/pkgs/servers/gotify/update.sh +++ b/pkgs/servers/gotify/update.sh @@ -11,9 +11,9 @@ echo got version $version echo \""${version#v}"\" > "$dirname/version.nix" printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix tput setaf 1 -echo zeroing modSha256 in $dirname/mod-sha.nix +echo zeroing vendorSha256 in $dirname/vendor-sha.nix tput sgr0 -printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/mod-sha.nix +printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" @@ -28,13 +28,13 @@ echo removed yarn.lock echo running nix-build for ui nix-build -A gotify-server.ui -echo running nix-build for gotify itself in order to get modSha256 +echo running nix-build for gotify itself in order to get vendorSha256 set +e -modSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" +vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" set -e -printf '"%s"' "$modSha256" > $dirname/mod-sha.nix +printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix tput setaf 2 -echo got modSha256 of: $modSha256 +echo got vendorSha256 of: $vendorSha256 tput sgr0 echo running nix-build -A gotify-server which should build gotify-server normally nix-build -A gotify-server diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix new file mode 100644 index 000000000000..0705f436316d --- /dev/null +++ b/pkgs/servers/gotify/vendor-sha.nix @@ -0,0 +1 @@ +"1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3" \ No newline at end of file From ec7dbdb74c0e74c8985836684dde836e6c5ea916 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 11 May 2020 19:00:17 -0400 Subject: [PATCH 147/310] python3Packages.cirq: 0.6.1 -> 0.8.0 --- .../python-modules/cirq/default.nix | 46 ++++++++++++------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 18c1e7f8c0de..98fc3b9ff058 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -3,7 +3,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, google_api_python_client +, fetchpatch +, freezegun +, google_api_core , matplotlib , networkx , numpy @@ -16,6 +18,7 @@ , typing-extensions # test inputs , pytestCheckHook +, pytest-asyncio , pytest-benchmark , ply , pydot @@ -25,7 +28,7 @@ buildPythonPackage rec { pname = "cirq"; - version = "0.6.1"; + version = "0.8.0"; disabled = pythonOlder "3.5"; @@ -33,25 +36,29 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "0lhr2dka7vpz9xd6akxphrcv2b3ni2cgjywpc1r7qpqa5mrq1q7f"; + sha256 = "01nnv7r595sp60wvp7750lfdjwdsi4q0r4lmaj6li09zsdw0r4b3"; }; - # Cirq 0.6 requires networkx==2.3 only for optional qiskit dependency/test, disable this to avoid networkx version conflicts. https://github.com/quantumlib/Cirq/issues/2368 + patches = [ + (fetchpatch { + # Fixes serialization issues on certain versions of protobuf & numpy. + name = "cirq-pr-2986-protobuf-bools.patch"; + url = "https://github.com/quantumlib/Cirq/commit/78ddfb574c0f3936f713613bf4ba102163efb7b3.patch"; + sha256 = "0hmad9ndsqf5ci7shvd924d2rv4k9pzx2r2cl1bm5w91arzz9m18"; + }) + ]; + # Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts postPatch = '' - substituteInPlace requirements.txt --replace "networkx==2.3" "networkx" \ - --replace "protobuf==3.8.0" "protobuf" - - # Fix sympy 1.5 test failures. Should be fixed in v0.7 - substituteInPlace cirq/optimizers/eject_phased_paulis_test.py --replace "phase_exponent=0.125 + x / 8" "phase_exponent=0.125 + x * 0.125" - substituteInPlace cirq/contrib/quirk/cells/parse_test.py --replace "parse_formula('5t') == 5 * t" "parse_formula('5t') == 5.0 * t" - - # Fix pandas >= 1.0 error, #2886 - substituteInPlace cirq/experiments/t1_decay_experiment.py --replace "del tab.columns.name" 'tab.rename_axis(None, axis="columns", inplace=True)' + substituteInPlace requirements.txt \ + --replace "networkx~=2.4" "networkx" \ + --replace "protobuf==3.8.0" "protobuf" \ + --replace "freezegun~=0.3.15" "freezegun" ''; propagatedBuildInputs = [ - google_api_python_client + freezegun + google_api_core numpy matplotlib networkx @@ -69,19 +76,26 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; checkInputs = [ pytestCheckHook + pytest-asyncio pytest-benchmark ply pydot pyyaml pygraphviz ]; - # TODO: enable op_serializer_test. Error is type checking, for some reason wants bool instead of numpy.bool_. Not sure if protobuf or internal issue + pytestFlagsArray = [ "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope - "--ignore=cirq/google/op_serializer_test.py" # investigating in https://github.com/quantumlib/Cirq/issues/2727 ]; disabledTests = [ + "test_serialize_sympy_constants" # fails due to small error in pi (~10e-7) "test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2 + + # Newly disabled tests on cirq 0.8 + # TODO: test & figure out why failing + "engine_job_test" + "test_health" + "test_run_delegation" ] ++ lib.optionals stdenv.isAarch64 [ # Seem to fail due to math issues on aarch64? "expectation_from_wavefunction" From 8fc9d7fe6ae1a3dc77f979f217ca27003e8f1d68 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 15 May 2020 10:08:48 +1000 Subject: [PATCH 148/310] miniserve: 0.6.0 -> 0.7.0 https://github.com/svenstaro/miniserve/blob/master/CHANGELOG.md#070---2020-05-14 --- pkgs/tools/misc/miniserve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index ea3afdab0982..dab44e1eea5a 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "0ybxnxjg0vqm4q60z4zjl3hfls0s2rvy44m6jgyhlj1p6cr3dbyw"; + sha256 = "06nrb84xfvx02yc4bjn1szfq3bjy8mqgxwwrjghl7vpcw51qhlk5"; }; - cargoSha256 = "0ypxv9wqcnjxjdrvdparddpssrarnifr43dq7kcr4l3fd1anl40a"; + cargoSha256 = "0mk8hvhjqggfr410yka9ygb41l1bnsizs8py3100xf685yxy5mhl"; RUSTC_BOOTSTRAP = 1; From 5b3f0c4f4af71ef702b3f2cdd5ebb8a4d442ac00 Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Thu, 14 May 2020 20:00:58 -0700 Subject: [PATCH 149/310] r-statmod: Add libiconv to buildInputs --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9ebd0e2b1d79..da42a5dd8200 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -445,6 +445,7 @@ let ucminf = [ pkgs.libiconv ]; glmnet = [ pkgs.libiconv ]; mvtnorm = [ pkgs.libiconv ]; + statmod = [ pkgs.libiconv ]; }; packagesRequireingX = [ From 90e5b2a44eb9c6bde33abaa6322b65fa78e45482 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Thu, 14 May 2020 21:00:31 -0700 Subject: [PATCH 150/310] bs-platform: 7.3.1 -> 7.3.2 --- pkgs/development/compilers/bs-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index ee4123a23c13..0fd696c69f0a 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -4,14 +4,14 @@ let in (build-bs-platform rec { inherit stdenv runCommand fetchFromGitHub ninja nodejs python3; - version = "7.3.1"; + version = "7.3.2"; ocaml-version = "4.06.1"; src = fetchFromGitHub { owner = "BuckleScript"; repo = "bucklescript"; rev = version; - sha256 = "14vp6cl5ml7xb3pd0paqajb50qv62l8j5m8hi3b6fh0pm68j1yxd"; + sha256 = "1nvp7wiiv149r4qf9bgc84bm4w7s44sjq9i7j103v24wllzz218s"; fetchSubmodules = true; }; }).overrideAttrs (attrs: { From aa35d565ffdfffbfa8159a3aab649959b5e86cdb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Apr 2020 13:08:19 +0200 Subject: [PATCH 151/310] meteor: 1.10.1 -> 1.10.2 --- pkgs/servers/meteor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 0a0d3aa7bd8a..ddf7a972c2eb 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - version = "1.10.1"; + version = "1.10.2"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "meteor"; src = fetchurl { url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1xck7pi7rhkgssic7adbg1slypjjkqxa18wlf3jffbgj0zzr87nx"; + sha256 = "17s1n92nznasaaprvxg289a1fcizq2nj51xqw7akgw5f77q19vmw"; }; #dontStrip = true; From 5ecd99b2bd4e0e04e6c1b2566bb6b287e1288ba1 Mon Sep 17 00:00:00 2001 From: Henk Kalkwater Date: Wed, 13 May 2020 17:55:22 +0200 Subject: [PATCH 152/310] qt5.qtgamepad: init at 5.12.7 --- pkgs/development/libraries/qt-5/5.12/default.nix | 3 ++- pkgs/development/libraries/qt-5/modules/qtgamepad.nix | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/modules/qtgamepad.nix diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 78d711e969b5..afca6c7969b4 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -139,6 +139,7 @@ let qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgamepad = callPackage ../modules/qtgamepad.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; @@ -171,7 +172,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix new file mode 100644 index 000000000000..281f6e0b8ecd --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -0,0 +1,9 @@ +{ qtModule, qtbase, qtdeclarative, pkgconfig }: + +qtModule { + name = "qtgamepad"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ ]; + nativeBuildInputs = [ pkgconfig ]; + outputs = [ "out" "dev" "bin" ]; +} From 415e3ec512edabe1d71b818f3d2a49b1888fa6c7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 00:00:00 -0500 Subject: [PATCH 153/310] gitAndTools.git-absorb: 0.5.0 -> 0.6.0 --- .../git-and-tools/git-absorb/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 3f5cbad4c12f..d476b896601c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "0lggv3knh6iglkh8x2zqvqcs3dlwfsdiclg7pmdrycny72la4k2j"; + sha256 = "1da6h9hf98dnnqw9jpnj1x2gr7psmsa8219gpamylfg1ifk28rkr"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "13gikjswbb0kkpvb5zhj88qq5l667624gkfb7hd3zygh4qyhsy05"; + cargoSha256 = "1ba43m5ndyj4hwwfyg0c2hwv3ad7kzhrr7cvymsgaj2dxl7bif4w"; + + postInstall = '' + installManPage Documentation/git-absorb.1 + ''; meta = with stdenv.lib; { homepage = "https://github.com/tummychow/git-absorb"; From 762efd1987653472e4b087c97cf47ca93c1c1af3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 11:33:58 +0000 Subject: [PATCH 154/310] python27Packages.plexapi: 3.2.0 -> 3.4.0 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index ed95de9ffde6..a387bc061146 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "3.2.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf"; + sha256 = "1y6mynsvkm9n2n927x8az9ch4blrjja7im9x7iyfrxahqgz0km77"; }; propagatedBuildInputs = [ requests tqdm websocket_client ]; From 23be01d6abcd979a2e24b1f34e4227b1c8442b39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 03:23:46 +0000 Subject: [PATCH 155/310] python27Packages.kafka-python: 1.4.7 -> 2.0.1 --- pkgs/development/python-modules/kafka-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 953a58950349..1c85fbd29af4 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.7"; + version = "2.0.1"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "2f29baad4b3efe05a2bb81ac268855aa01cbc68397f15bac77b494ffd7e2cada"; + sha256 = "1y7ny81rihnhc8lj921d76ir4kf4aj5iy35szgim8zccxhnx96p5"; }; checkInputs = [ pytest six mock ]; From f89cfee2309c43b77ce0e85a00776b074fbcea6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 06:28:31 +0000 Subject: [PATCH 156/310] python27Packages.evdev: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/evdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index ab169fe679d8..305ada89552c 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166"; + sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi"; }; buildInputs = [ linuxHeaders ]; From f6bfb371cba2b5a02f200c2747c1fe2c72bd782f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 May 2020 18:56:11 +0000 Subject: [PATCH 157/310] python27Packages.bids-validator: 1.3.12 -> 1.5.1 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 6b7bad58bc4c..56a941e60e09 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.3.12"; + version = "1.5.1"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "7a244b09adfd083292ed1f7ff335676a1e2effbbffe62b02a4abaf377d33ef86"; + sha256 = "1fy8w56m0x546zjk3is1xp83jm19fkn4y15g5jgmq29sfzc8n3y3"; }; propagatedBuildInputs = [ ]; From b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 9 May 2020 17:24:59 +0100 Subject: [PATCH 158/310] uwsgi: make instance configuration deeply mergeable allows to specify independent uwsgi instances in two modules. --- nixos/modules/services/web-servers/uwsgi.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 4b74c329e3dc..936e211ec713 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -79,7 +79,25 @@ in { }; instance = mkOption { - type = types.attrs; + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + (lazyAttrsOf valueType) + (listOf valueType) + (mkOptionType { + name = "function"; + description = "function"; + check = x: isFunction x; + merge = mergeOneOption; + }) + ]) // { + description = "Json value or lambda"; + emptyValue.value = {}; + }; + in valueType; default = { type = "normal"; }; From 0a4f1bc7f7549e1fd148afc17003507d15c40dc2 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 15 May 2020 10:39:50 +0200 Subject: [PATCH 159/310] Sylk: 2.7.0 -> 2.7.2 --- pkgs/applications/networking/Sylk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 7079e3afa9a6..425f4fcf2ff4 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.7.0"; + version = "2.7.2"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256:0xjg9j69yj06ys8229x6mwsjlk3mvxi8gnr2kymx0vhhg1zvqi1k"; + hash = "sha256:1hz41jan8hw56ahpaajlb1yy5zjkyxrclzmqhklm5x59b76pd0zx"; }; profile = '' From ad17c01f932d20e01248a0473ca58b4b32d6f802 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 15 May 2020 01:32:27 -0400 Subject: [PATCH 160/310] go-ethereum: 1.9.13 -> 1.9.14 --- pkgs/applications/blockchains/go-ethereum.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 15583d0a1efd..690731fa1201 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.13"; + version = "1.9.14"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425"; + sha256 = "0vqsx4q7jn6vhmrm9kkk810d5nvnmyb6bni38ynkxcwlrp3qs6v2"; }; usb = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; }; - vendorSha256 = "12aw8b8ci7nssidh1yz8d2hk43csdacq5jca9y70rjakpl3zndsz"; + vendorSha256 = "01mbmc8qlp08127dlmcqz0viasmg7mrzqzmyw21an69sabcr112n"; overrideModAttrs = (_: { postBuild = '' From 3c4b40300bb38c9994f640f24d8cb421a9236d1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 04:20:00 -0500 Subject: [PATCH 161/310] shadowsocks-rust: 1.7.2 -> 1.8.11 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 36f6b5849592..ba90a7cacb77 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,24 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.7.2"; + version = "1.8.11"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng"; + sha256 = "0imnvx3v0msk9qf72zy1qg5q52dmc8xfs9iwdwa2q13scjslgmwn"; }; - cargoSha256 = "0srmn8ndy7vdvcysyb7a5pjly0m3jchq0zrqzhrwicynm291w56h"; + cargoSha256 = "1aqqx0pdq3vp5c06pjwsrbrqfkz5dhxnpvv3vnr3pqfm62xrffgg"; + + SODIUM_USE_PKG_CONFIG = 1; buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkgconfig ]; - # tries to read /etc/resolv.conf, hence fails in sandbox - doCheck = false; - meta = with stdenv.lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; description = "A Rust port of shadowsocks"; From 24a6c81291769b5e218cd9c9f07f2e16ca16bcc1 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 15 May 2020 11:33:55 +0200 Subject: [PATCH 162/310] gopls: 0.4.0 -> 0.4.1 --- pkgs/development/tools/gopls/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 9591c6415162..a77f9fa8ddd3 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.4.0"; - rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + version = "0.4.1"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1sn6f638hgqpyd8rfyal3y6i6p21x4340jnhsvmgcd8lph49pplb"; + sha256 = "18migk7arxm8ysfzidl7mdr069fxym9bfi6zisj7dliczw0qnkzv"; }; modRoot = "gopls"; - vendorSha256 = "1zj0zpyl9wq23vks426vqg5xjwjcaj1079rkc67489h0p7y0aqv5"; + vendorSha256 = "1jaav6c5vybgks5hc164is0i7h097c5l75s7w3wi5a3zyzkbiyny"; meta = with stdenv.lib; { description = "Official language server for the Go language"; From 730133e130a03f074b489b13ee2a3f3df8197b2f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 May 2020 10:15:14 +0100 Subject: [PATCH 163/310] darktable: Remove doc directory from output It puts very generic file names in the store like `$out/share/doc/README.md` which has a high risk of collisions. --- pkgs/applications/graphics/darktable/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 948b4ddd54db..b021c186b5c5 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; + # Reduce the risk of collisions + postInstall = "rm -r $out/share/doc"; # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the From 8f475b0470dbf4f84a7a1598e6640c761495ed6c Mon Sep 17 00:00:00 2001 From: Pascal Winkelmann Date: Fri, 15 May 2020 10:42:45 +0200 Subject: [PATCH 164/310] jugglinglab: init at 1.2 --- maintainers/maintainer-list.nix | 6 +++++ pkgs/tools/misc/jugglinglab/default.nix | 30 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/tools/misc/jugglinglab/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc2ea541d697..fda8fd8d204c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8301,6 +8301,12 @@ githubId = 54934; name = "Wout Mertens"; }; + wnklmnn = { + email = "pascal@wnklmnn.de"; + github = "wnklmnn"; + githubId = 9423014; + name = "Pascal Winkelmann"; + }; woffs = { email = "github@woffs.de"; github = "woffs"; diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix new file mode 100644 index 000000000000..6ef3a39353d5 --- /dev/null +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, jre, makeWrapper, ant, jdk }: +stdenv.mkDerivation rec { + major= "1"; + minor = "2"; + version = "${major}.${minor}"; + name = "jugglinglab"; + src = fetchgit { + url = "https://github.com/jkboyce/jugglinglab"; + rev = "v${major}.${minor}"; + sha256 = "1p62kb9hfch7pi4way18c5mgky4xbxcrfgrw0hd25sd6cpr88z92"; + }; + buildInputs = [ jre ]; + nativeBuildInputs = [ ant jdk makeWrapper ]; + buildPhase = "ant"; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/lib" + cp bin/JugglingLab.jar $out/lib/ + + makeWrapper ${jre}/bin/java $out/bin/jugglinglab \ + --add-flags "-jar $out/lib/JugglingLab.jar" + ''; + + meta = with stdenv.lib; { + description = "A program to visualize different juggling pattens"; + license = licenses.gpl2; + maintainers = with maintainers; [ wnklmnn ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db4b476682f..21b192ff3f96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7204,6 +7204,8 @@ in umlet = callPackage ../tools/misc/umlet { }; + jugglinglab = callPackage ../tools/misc/jugglinglab { }; + unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; From 9774e87ef152857aa7aad95f31879abab9082782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 15 May 2020 12:21:38 +0200 Subject: [PATCH 165/310] python.pkgs.latexcodec: run tests --- pkgs/development/python-modules/latexcodec/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 25a266b3dc26..3514d5da9a23 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ stdenv, buildPythonPackage, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "latexcodec"; @@ -11,6 +11,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + meta = { homepage = "https://github.com/mcmtroffaes/latexcodec"; description = "Lexer and codec to work with LaTeX code in Python"; From 5d362c2335eee327aab027625b0095bf2d87468c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 15 May 2020 13:47:00 +0200 Subject: [PATCH 166/310] fly: use completion generator There's no need to ship the pre-generated completions in the nixpkgs tree anymore. --- .../tools/continuous-integration/fly/default.nix | 12 +++++------- .../tools/continuous-integration/fly/fly.bash | 10 ---------- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/tools/continuous-integration/fly/fly.bash diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 216121c8bd3f..bea8c4908510 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, writeText }: +{ buildGoModule, fetchFromGitHub, stdenv, lib, writeText }: buildGoModule rec { pname = "fly"; @@ -20,12 +20,10 @@ buildGoModule rec { -X github.com/concourse/concourse.Version=${version} ''; - # The fly.bash file included with this derivation can be replaced by a - # call to `fly completion bash` once the `completion` subcommand has - # made it into a release. Similarly, `fly completion zsh` will provide - # zsh completions. https://github.com/concourse/concourse/pull/4012 - postInstall = '' - install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} + $out/bin/fly completion --shell bash > $out/share/bash-completion/completions/fly + $out/bin/fly completion --shell zsh > $out/share/zsh/site-functions/_fly ''; meta = with lib; { diff --git a/pkgs/development/tools/continuous-integration/fly/fly.bash b/pkgs/development/tools/continuous-integration/fly/fly.bash deleted file mode 100644 index a9acc5f70a40..000000000000 --- a/pkgs/development/tools/continuous-integration/fly/fly.bash +++ /dev/null @@ -1,10 +0,0 @@ -# credits: -# https://godoc.org/github.com/jessevdk/go-flags#hdr-Completion -# https://github.com/concourse/concourse/issues/1309#issuecomment-452893900 -_fly_compl() { - args=("${COMP_WORDS[@]:1:$COMP_CWORD}") - local IFS=$'\n' - COMPREPLY=($(GO_FLAGS_COMPLETION=1 ${COMP_WORDS[0]} "${args[@]}")) - return 0 -} -complete -F _fly_compl fly From 0682ec40c68bf86fc002b56395e68dd5fe754738 Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Thu, 14 May 2020 11:23:36 +0200 Subject: [PATCH 167/310] =?UTF-8?q?alot:=200.9=20=E2=86=92=200.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dropped the patch, as it is included in the point release. Switched the hash representation to regular base32. --- pkgs/development/python-modules/alot/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index d15d1ea0110e..71ad0c85fcbd 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "alot"; - version = "0.9"; + version = "0.9.1"; outputs = [ "out" ] ++ lib.optional withManpage "man"; disabled = !isPy3k; @@ -16,18 +16,9 @@ buildPythonPackage rec { owner = "pazz"; repo = "alot"; rev = version; - sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI="; + sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"; }; - patches = [ - # can't compose email if signature is set: https://github.com/pazz/alot/issues/1468 - (fetchpatch { - name = "envelope-body.patch"; - url = "https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55.patch"; - sha256 = "1iwvmjyz4mh1g08vr85ywhah2xarcqg8dazagygk19icgsn45w06"; - }) - ]; - nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ From 136aebc2e17d3fdc0d373b1265b9907b2e21f710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 15 May 2020 12:39:39 +0200 Subject: [PATCH 168/310] python.pkgs.sphinxcontrib-bibtex: disable python2 Support dropped in https://github.com/mcmtroffaes/sphinxcontrib-bibtex/commit/efa4e66b5a7e4c760ce37b00296c21a41f31eca1. --- .../python-modules/sphinxcontrib-bibtex/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 36fb29fde595..bc9a90efcf23 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , oset, pybtex, pybtex-docutils, sphinx }: @@ -6,6 +6,8 @@ buildPythonPackage rec { version = "1.0.0"; pname = "sphinxcontrib-bibtex"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0"; From c5629543267254aa0f6489566256d89b4aaa6078 Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Fri, 15 May 2020 14:05:03 +0200 Subject: [PATCH 169/310] alot: replace geistesk as maintainer As requested by geistesk here: https://github.com/NixOS/nixpkgs/pull/87803#issuecomment-628711513 --- pkgs/development/python-modules/alot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 71ad0c85fcbd..a2012132024b 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { description = "Terminal MUA using notmuch mail"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ aepsil0n ]; }; } From b0df5a6816b644c2e0b6ebcde6ad0784b07205e0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 May 2020 14:00:58 +0200 Subject: [PATCH 170/310] signal-desktop: 1.33.4 -> 1.34.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 4a751bac4ac7..be9cdbecc0bf 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.33.4"; # Please backport all updates to the stable channel. + version = "1.34.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0mcxia2zaflaazfdl1ngpab0dyhwwzbhad7brc6kwhjxydbnmwcd"; + sha256 = "175iir85qlign5ns8wk4x4mf7xw8sriq8jyj61n76is79jjk7b3d"; }; nativeBuildInputs = [ From 44c053349758fff67f67dbc61f2bb27968c1135e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 15 May 2020 13:51:31 +0200 Subject: [PATCH 171/310] fly: 6.0.0 -> 6.1.0 --- .../tools/continuous-integration/fly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index bea8c4908510..3bf48084bbd8 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq"; + sha256 = "14sm3xwhm6pfln18i9f9dyj7s2wcri43rxj4s1cja7nwqr5sqb3x"; }; - vendorSha256 = "127mc1wzqhn0l4ni6qxcx06qfdb1cgahzypjrs4vgr6i4sipjxck"; + vendorSha256 = "1c099sn5rrvj805va1lyjlbv7i2g1z5bxyaisv5l9365z0lv1cwm"; subPackages = [ "fly" ]; @@ -32,4 +32,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ivanbrennan ]; }; -} \ No newline at end of file +} From b94e8cc448e1c834b42bf0704748981833ef1a72 Mon Sep 17 00:00:00 2001 From: Pascal Winkelmann Date: Fri, 15 May 2020 16:03:26 +0200 Subject: [PATCH 172/310] incorporate suggested changes from pull request --- pkgs/tools/misc/jugglinglab/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix index 6ef3a39353d5..32c45b31a17d 100644 --- a/pkgs/tools/misc/jugglinglab/default.nix +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, jre, makeWrapper, ant, jdk }: +{ stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: stdenv.mkDerivation rec { - major= "1"; - minor = "2"; - version = "${major}.${minor}"; + version = "1.2.1"; name = "jugglinglab"; - src = fetchgit { - url = "https://github.com/jkboyce/jugglinglab"; - rev = "v${major}.${minor}"; - sha256 = "1p62kb9hfch7pi4way18c5mgky4xbxcrfgrw0hd25sd6cpr88z92"; + src = fetchFromGitHub { + owner = "jkboyce"; + repo = "jugglinglab"; + rev = "1908012682d8c39a9b92248a20f285455104c510"; # v1.2.1 does not have a tag on Github + sha256 = "0dvcyjwynvapqbjchrln59vdskrm3w6kh0knxcn4bx61vcz3171z"; }; buildInputs = [ jre ]; nativeBuildInputs = [ ant jdk makeWrapper ]; @@ -26,5 +25,6 @@ stdenv.mkDerivation rec { description = "A program to visualize different juggling pattens"; license = licenses.gpl2; maintainers = with maintainers; [ wnklmnn ]; + platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21b192ff3f96..3331594eeb04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4468,6 +4468,8 @@ in jucipp = callPackage ../applications/editors/jucipp { }; + jugglinglab = callPackage ../tools/misc/jugglinglab { }; + jupp = callPackage ../applications/editors/jupp { }; jupyter = callPackage ../applications/editors/jupyter { }; @@ -7204,8 +7206,6 @@ in umlet = callPackage ../tools/misc/umlet { }; - jugglinglab = callPackage ../tools/misc/jugglinglab { }; - unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; From 7ac738273dc7f112c80c7faa9638d7494cc88338 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 16:13:34 +0200 Subject: [PATCH 173/310] lsp-plugins: Fix build /build/source/include/metadata/modules.h:122:1: note: in expansion of macro 'MOD_PLUGIN' 122 | MOD_PLUGIN(slap_delay_mono, plugin_ui) | ^~~~~~~~~~ lv2.cpp:414:43: error: invalid conversion from 'void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*)' {aka 'void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)'} to 'void* (*)(const LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*)' {aka 'void* (*)(const LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)'} [-fpermissive] 414 | d->instantiate = lv2ui_instantiate; \ | ^~~~~~~~~~~~~~~~~ | | | void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*) {aka void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)} --- pkgs/applications/audio/lsp-plugins/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index d530aff9faa6..218c2bdac741 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { sha256 = "1wiph3vxhydc6mr9hn2c6crd4cx592l2zv0wrzgmpnlm1lflzpbg"; }; + patches = [ + # Fix build + # https://github.com/sadko4u/lsp-plugins/issues/104 + (fetchpatch { + url = "https://github.com/sadko4u/lsp-plugins/commit/4d901135fb82fa95e668b4d55d05e405f5e620d2.patch"; + excludes = [ "TODO.txt" ]; + sha256 = "wR2B6XnDXT2BGwmrsL72PH/BM1e9d9JvqHxDtfFDAug="; + }) + ]; + nativeBuildInputs = [ pkgconfig php makeWrapper ]; buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; From 48c4f434fa3b05331ac4fe6f43941d9025df512c Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 15 May 2020 11:22:25 -0400 Subject: [PATCH 174/310] starship: 0.41.1 -> 0.41.3 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index c1fd2fedde79..d6ff65adb4ca 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.41.1"; + version = "0.41.3"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0q41f1zj27vz5sg7harmk9zvmyc37w8hr5f74ipws438wz27qwm3"; + sha256 = "0f3d95abivbmjqdzw9pbdbis96sfds26xv3k8k9skxml8iqzq29c"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "1i6d2vsgcjclk0r6j5lmynk5m0my2yphn0q9rm53s43n1vyf2g2v"; + cargoSha256 = "10h0arvl3gf5hg530d24ypj4yzk3zhm8mgkhz0v61y0jcdy2zdrm"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { From 751729914624e57888e85e6e178fc258db004d9a Mon Sep 17 00:00:00 2001 From: Lila Date: Fri, 15 May 2020 17:58:27 +0200 Subject: [PATCH 175/310] treewide: fix broken AlpineLinux repo links (#87892) --- pkgs/applications/misc/xterm/default.nix | 2 +- pkgs/development/libraries/gamin/default.nix | 2 +- pkgs/development/libraries/libexecinfo/default.nix | 6 +++--- pkgs/os-specific/linux/apparmor/default.nix | 4 ++-- pkgs/os-specific/linux/lvm2/default.nix | 6 +++--- pkgs/os-specific/linux/musl/default.nix | 4 ++-- pkgs/os-specific/linux/pam/default.nix | 4 ++-- pkgs/os-specific/linux/powertop/default.nix | 2 +- pkgs/servers/monitoring/net-snmp/default.nix | 2 +- pkgs/shells/tcsh/default.nix | 2 +- pkgs/tools/misc/figlet/default.nix | 2 +- pkgs/tools/networking/vde2/default.nix | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index f6837b692b19..109444fc5180 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "posix-ptys.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; + url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; }); diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index b1be17abf379..38451571d8b6 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "fix-pthread-mutex.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; + url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; }); diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index cc1c4b48e788..147b213735db 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "10-execinfo.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g"; }) (fetchpatch { name = "20-define-gnu-source.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; }) (fetchpatch { name = "30-linux-makefile.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; }) ]; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index d661b2172b3c..afb6799fbafc 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -39,12 +39,12 @@ let patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0003-Added-missing-typedef-definitions-on-parser.patch"; sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0"; }) (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0007-Do-not-build-install-vim-file-with-utils-package.patch"; sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; }) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index c7925bae5581..8db4be94e4ed 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -47,17 +47,17 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { name = "fix-stdio-usage.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p"; }) (fetchpatch { name = "mallinfo.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) (fetchpatch { name = "mlockall-default-config.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; }) ]; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index d31a75fbba0b..51dcf4cfca33 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -19,10 +19,10 @@ let # iconv tool, implemented by musl author. # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f # We use copy from Alpine which fixes error messages, see: - # https://git.alpinelinux.org/cgit/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f + # https://git.alpinelinux.org/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f iconv_c = fetchurl { name = "iconv.c"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; + url = "https://git.alpinelinux.org/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; }; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 2e44a887d69a..fb969d7574a0 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals (stdenv.hostPlatform.libc == "musl") [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; }) (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; }) # From adelie's package repo, using local copy since it seems to be currently offline. diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index d57b511af346..bcac7ab63c0a 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( fetchpatch { name = "strerror_r.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; + url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; } ) ++ [ diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 3c8005a16dfd..160907d58fa6 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = let fetchAlpinePatch = name: sha256: fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; + url = "https://git.alpinelinux.org/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; inherit name sha256; }; in [ diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index e22811828fcd..87cbf8c59f36 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "sysmalloc.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; + url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67"; }); diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 7f7fc6f4e086..90fb0981fbd0 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; + url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; name = "musl-fix-cplusplus-decls.patch"; sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; }) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index be3d12678613..b10ec5c1695d 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }) ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; + url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; }) ]; From 4621fe7889e0f81eba5d91367a5d796ca6e08001 Mon Sep 17 00:00:00 2001 From: jakobrs Date: Fri, 15 May 2020 18:21:34 +0200 Subject: [PATCH 176/310] schismtracker: Add x86_64-darwin support --- pkgs/applications/audio/schismtracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 36125489e3a2..59f8c82ba02c 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook python ]; - buildInputs = [ alsaLib SDL ]; + buildInputs = [ SDL ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; meta = with stdenv.lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ ftrvxmtrx ]; }; } From 6bbdcdbf129ea07fc65ecde5cf2d68107b9c5af1 Mon Sep 17 00:00:00 2001 From: jakobrs Date: Fri, 15 May 2020 18:23:16 +0200 Subject: [PATCH 177/310] schismtracker: 20190805 -> 20200412 --- pkgs/applications/audio/schismtracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 36125489e3a2..169d6477cdd6 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20190805"; + version = "20200412"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0qqps20vvn3rgpg8174bjrrm38gqcci2z5z4c1r1vhbccclahgsd"; + sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; }; configureFlags = [ "--enable-dependency-tracking" ]; From e8215cd634fc47b9d8b9ac254fe47467de87f691 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Tue, 12 May 2020 22:24:00 -0700 Subject: [PATCH 178/310] colmap: update boost to 1.72 to fix build --- pkgs/applications/science/misc/colmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 02adb689e20b..83dff3e08f15 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost, ceres-solver, eigen, +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudatoolkit ? null }: assert !cudaSupport || cudatoolkit != null; -let boost_static = boost.override { enableStatic = true; }; +let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { version = "3.5"; From 0666f6277bd0845aae4f4210389b545d59a65b8e Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 15 May 2020 10:48:14 -0400 Subject: [PATCH 179/310] govc: 0.21.0 -> 0.22.1 --- pkgs/tools/virtualization/govc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 1595af847701..e3329ea13f11 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.21.0"; + version = "0.22.1"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130"; + sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; }; meta = { From 55242c1d67733fed23bc221b4efb38e940a2df34 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 15 May 2020 07:51:46 +0000 Subject: [PATCH 180/310] polybar: 3.4.2 -> 3.4.3 --- pkgs/applications/misc/polybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 1fc0162f8d08..a793ee887243 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -26,13 +26,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { pname = "polybar"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1ss4wzy68dpqr5a4m090nn36v8wsp4a7pj6whcxxdrrimgww5r88"; + sha256 = "0fsfh3xv0c0hz10xqzvd01c0p0wvzcnanbyczi45zhaxfrisb39w"; fetchSubmodules = true; }; From 202ded0110b3adbe99f871a462446f0b43203e57 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 14 May 2020 21:21:21 -0500 Subject: [PATCH 181/310] go-tools: 2020.1.3 -> 2020.1.4 --- pkgs/development/tools/go-tools/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index faf2e9938d0d..8362d1db02c7 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,15 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.1.3"; - - excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata''; + version = "2020.1.4"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; + sha256 = "182j3zzx1bj4j4jiamqn49v9nd3vcrx727f7i9zgcrgmiscvw3mh"; }; vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; From 6b17638dc6c052a3b2e132959a0f0e2b38f4310c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 17:29:00 +0200 Subject: [PATCH 182/310] glade: rename from gnome3.glade --- pkgs/applications/editors/gnome-builder/default.nix | 3 ++- pkgs/desktops/gnome-3/default.nix | 4 ++-- pkgs/development/libraries/libhandy/default.nix | 4 ++-- .../gnome-3/apps => development/tools}/glade/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 9 insertions(+), 6 deletions(-) rename pkgs/{desktops/gnome-3/apps => development/tools}/glade/default.nix (97%) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index c58d12a58f89..3db4e5649a51 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -9,6 +9,7 @@ , gnome3 , libgit2-glib , gobject-introspection +, glade , gspell , gtk-doc , gtk3 @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ctags flatpak gnome3.devhelp - gnome3.glade + glade libgit2-glib libpeas libportal diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 9d34fc0f40c6..846eefa9fa98 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -164,8 +164,6 @@ lib.makeScope pkgs.newScope (self: with self; { ghex = callPackage ./apps/ghex { }; - glade = callPackage ./apps/glade { }; - gnome-books = callPackage ./apps/gnome-books { }; gnome-boxes = callPackage ./apps/gnome-boxes { }; @@ -352,6 +350,8 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) networkmanagerapplet; # added 2019-12-12 + inherit (pkgs) glade; # added 2020-05-15 + vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 2a5ad06455d2..25186abb3aa2 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3 +, gtk3, gnome3, glade , dbus, xvfb_run, libxml2 , hicolor-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; + buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/development/tools/glade/default.nix similarity index 97% rename from pkgs/desktops/gnome-3/apps/glade/default.nix rename to pkgs/development/tools/glade/default.nix index 23f5410e1eaa..504f781f1681 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; }; + updateScript = gnome3.updateScript { packageName = "glade"; }; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db4b476682f..3ca119668f79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -181,6 +181,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + glade = callPackage ../development/tools/glade { }; + hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. proto-contrib = callPackage ../development/tools/proto-contrib {}; From fe7e564467acbc1e8b3009fab41c62c4de9f8a04 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 17:30:40 +0200 Subject: [PATCH 183/310] glade: format with nixpkgs-fmt also switch away from dependency aliases and reorder the attributes a bit --- pkgs/development/tools/glade/default.nix | 50 ++++++++++++++++++------ 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 504f781f1681..13b3d8c23620 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,7 +1,20 @@ -{ stdenv, intltool, fetchurl, python3 -, pkgconfig, gtk3, glib, gobject-introspection -, wrapGAppsHook, itstool, libxml2, docbook_xsl -, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: +{ stdenv +, intltool +, fetchurl +, python3 +, pkg-config +, gtk3 +, glib +, gobject-introspection +, wrapGAppsHook +, itstool +, libxml2 +, docbook-xsl-nons +, gnome3 +, gdk-pixbuf +, libxslt +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "glade"; @@ -12,21 +25,36 @@ stdenv.mkDerivation rec { sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "glade"; }; - }; - nativeBuildInputs = [ - pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection + pkg-config + intltool + itstool + wrapGAppsHook + docbook-xsl-nons + libxslt + libxml2 + gobject-introspection ]; + buildInputs = [ - gtk3 glib libxml2 python3 python3.pkgs.pygobject3 + gtk3 + glib + libxml2 + python3 + python3.pkgs.pygobject3 gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme + gdk-pixbuf + gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Glade"; description = "User interface designer for GTK applications"; From e20c3296a459b3607de38976e536bac875a5bca7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 18:29:11 +0200 Subject: [PATCH 184/310] =?UTF-8?q?glade:=203.32.2=20=E2=86=92=203.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/glade/3.36/glade-3.36.0.news --- pkgs/development/libraries/libhandy/default.nix | 12 +++++++++++- pkgs/development/tools/glade/default.nix | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 25186abb3aa2..28816ab13070 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3, glade , dbus, xvfb_run, libxml2 @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; }; + patches = [ + # Fix build with Glade 3.36.0 + # https://source.puri.sm/Librem5/libhandy/merge_requests/451 + (fetchpatch { + url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch"; + sha256 = "ZW6qCtHhXMsLsxgcOjVAukgPAhOdvFhxx0iAQEEk8GE="; + excludes = [ "glade/glade-hdy-header-bar.c" ]; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 13b3d8c23620..4d86fc2acd00 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,5 +1,5 @@ { stdenv -, intltool +, gettext , fetchurl , python3 , pkg-config @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { pname = "glade"; - version = "3.22.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; + sha256 = "GbVGtSfMRiE8z8gCLUnsV+YY/iyqmqUdstKGIjPqbwg="; }; nativeBuildInputs = [ pkg-config - intltool + gettext itstool wrapGAppsHook docbook-xsl-nons From 99efa7c85c8835127c1c65d69665f74f5aaf1a03 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 15 May 2020 19:26:53 +0200 Subject: [PATCH 185/310] Revert "Get rid of go 1.13 (#86036)" This partially reverts commit 3e0aa4af2da4e4010cd9011aaa125fed7ca220e6. See the discussion in the PR. --- pkgs/development/compilers/go/1.13.nix | 244 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++ 2 files changed, 257 insertions(+) create mode 100644 pkgs/development/compilers/go/1.13.nix diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix new file mode 100644 index 000000000000..8fee93cc4abe --- /dev/null +++ b/pkgs/development/compilers/go/1.13.nix @@ -0,0 +1,244 @@ +{ stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, mailcap, runtimeShell +, buildPackages, pkgsTargetTarget +}: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.13.8"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.13.patch + ./remove-test-pie-1.13.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests.patch + ./skip-nohup-tests.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32.patch + else ./skip-test-extra-files-on-386.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + # Independent from host/target, CC should produce code for the building system. + export CC=${buildPackages.stdenv.cc}/bin/cc + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + branch = "1.13"; + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db4b476682f..aa84e8aa8e34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8638,6 +8638,13 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -15252,12 +15259,18 @@ in ### DEVELOPMENT / GO MODULES + buildGo113Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_13; + }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; buildGoPackage = buildGo114Package; + buildGo113Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_13; + }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; From cf8bd2cd22d60f8e5022311b6e3cc419cdd265ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2020 08:20:41 +0200 Subject: [PATCH 186/310] LTS Haskell 15.12 --- .../configuration-hackage2nix.yaml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 008a3b502914..03ad7f063409 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.11 + # LTS Haskell 15.12 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -390,7 +390,7 @@ default-package-overrides: - cast ==0.1.0.2 - category ==0.2.5.0 - cayley-client ==0.4.12 - - cborg ==0.2.2.1 + - cborg ==0.2.3.0 - cborg-json ==0.2.2.0 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 @@ -601,7 +601,7 @@ default-package-overrides: - diagrams-lib ==1.4.3 - diagrams-postscript ==1.5 - diagrams-rasterific ==1.4.2 - - diagrams-solve ==0.1.1 + - diagrams-solve ==0.1.2 - diagrams-svg ==1.4.3 - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 @@ -893,7 +893,7 @@ default-package-overrides: - gravatar ==0.8.0 - greskell ==1.0.1.0 - greskell-core ==0.1.3.2 - - greskell-websocket ==0.1.2.1 + - greskell-websocket ==0.1.2.2 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 - groups ==0.4.1.0 @@ -1060,7 +1060,7 @@ default-package-overrides: - human-readable-duration ==0.2.1.4 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==2.0.0.1 + - hunit-dejafu ==2.0.0.2 - hvect ==0.4.0.0 - hvega ==0.5.0.0 - hw-balancedparens ==0.3.1.0 @@ -1081,7 +1081,7 @@ default-package-overrides: - hw-json ==1.3.2.0 - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - - hw-json-standard-cursor ==0.2.2.0 + - hw-json-standard-cursor ==0.2.3.1 - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 @@ -1111,7 +1111,7 @@ default-package-overrides: - if ==0.1.0.0 - iff ==0.0.6 - ihs ==0.1.0.3 - - ilist ==0.4.0.0 + - ilist ==0.4.0.1 - imagesize-conduit ==1.1 - Imlib ==0.1.2 - immortal ==0.3 @@ -1157,7 +1157,7 @@ default-package-overrides: - iproute ==1.7.9 - IPv6Addr ==1.1.3 - ipynb ==0.1.0.1 - - ipython-kernel ==0.10.1.0 + - ipython-kernel ==0.10.2.0 - irc ==0.6.1.0 - irc-client ==1.1.1.1 - irc-conduit ==0.3.0.4 @@ -1195,8 +1195,8 @@ default-package-overrides: - keycode ==0.2.2 - keys ==3.12.3 - kind-apply ==0.3.2.0 - - kind-generics ==0.4.0.0 - - kind-generics-th ==0.2.1.0 + - kind-generics ==0.4.1.0 + - kind-generics-th ==0.2.2.0 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - kubernetes-webhook-haskell ==0.2.0.1 @@ -1265,7 +1265,7 @@ default-package-overrides: - load-env ==0.2.1.0 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 - - log-base ==0.8.0.0 + - log-base ==0.8.0.1 - log-domain ==0.13 - logfloat ==0.13.3.3 - logging-effect ==1.3.9 @@ -1712,7 +1712,7 @@ default-package-overrides: - read-env-var ==1.0.0.0 - reanimate-svg ==0.9.8.0 - rebase ==1.4.1 - - record-dot-preprocessor ==0.2.3 + - record-dot-preprocessor ==0.2.5 - record-hasfield ==1.0 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 @@ -1823,7 +1823,7 @@ default-package-overrides: - sequence-formats ==1.4.1 - sequenceTools ==1.4.0.5 - serf ==0.1.1.0 - - serialise ==0.2.2.0 + - serialise ==0.2.3.0 - servant ==0.16.2 - servant-auth ==0.3.2.0 - servant-auth-server ==0.4.5.1 @@ -1867,7 +1867,7 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - - shellmet ==0.0.3.0 + - shellmet ==0.0.3.1 - shelltestrunner ==1.9 - shell-utility ==0.0 - shelly ==1.9.0 @@ -1898,8 +1898,8 @@ default-package-overrides: - sized ==0.4.0.0 - skein ==1.0.9.4 - skip-var ==0.1.1.0 - - skylighting ==0.8.3.4 - - skylighting-core ==0.8.3.4 + - skylighting ==0.8.4 + - skylighting-core ==0.8.4 - slist ==0.1.1.0 - small-bytearray-builder ==0.3.4.0 - smallcheck ==1.1.5 @@ -1968,7 +1968,7 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 - - string-interpolate ==0.2.0.3 + - string-interpolate ==0.2.1.0 - string-qq ==0.0.4 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 @@ -2010,7 +2010,7 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - - tasty-dejafu ==2.0.0.1 + - tasty-dejafu ==2.0.0.3 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.3.2 @@ -2130,14 +2130,14 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.6.0.0 - tsv2csv ==0.1.0.2 - - ttc ==0.2.0.0 + - ttc ==0.2.1.0 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.18 + - turtle ==1.5.19 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2211,7 +2211,7 @@ default-package-overrides: - uuid-types ==1.0.3 - validation ==1.1 - validity ==0.9.0.3 - - validity-aeson ==0.2.0.3 + - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 - validity-containers ==0.5.0.3 - validity-path ==0.4.0.1 @@ -2234,7 +2234,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.0.0 + - vector-sized ==1.4.1.0 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 @@ -2270,7 +2270,7 @@ default-package-overrides: - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.7.0 + - websockets ==0.12.7.1 - websockets-snap ==0.10.3.1 - weigh ==0.0.16 - wide-word ==0.1.1.1 @@ -2330,7 +2330,7 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.3.0 + - yaml ==0.11.4.0 - yesod ==1.6.0.1 - yesod-auth ==1.6.10 - yesod-auth-hashdb ==1.7.1.2 From ca8cb6044efd50866cdd4d251413d56cb42da542 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 May 2020 11:59:44 +0200 Subject: [PATCH 187/310] hackage2nix: update list of broken packages --- .../haskell-modules/configuration-hackage2nix.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 03ad7f063409..2cbe100fa40b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2708,6 +2708,7 @@ broken-packages: - adaptive-containers - adaptive-tuple - adb + - addy - adhoc-network - adict - adobe-swatch-exchange @@ -7432,6 +7433,7 @@ broken-packages: - miniforth - minilens - minilight + - minilight-lua - minimung - minions - minioperational @@ -9282,6 +9284,13 @@ broken-packages: - ShortestPathProblems - show-prettyprint - showdown + - Shpadoinkle + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-snabbdom + - Shpadoinkle-backend-static + - Shpadoinkle-html + - Shpadoinkle-router + - Shpadoinkle-widgets - shpider - shuffle - si-clock From 730024fcaad303c30d879b2e70e532369398088d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 May 2020 02:30:22 +0200 Subject: [PATCH 188/310] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.3-1-gb7c82db from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4c409c7b8e5c77d052a2fa16ce922b014f9539b0. --- .../haskell-modules/hackage-packages.nix | 2362 +++++++++++------ 1 file changed, 1510 insertions(+), 852 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4fe3aac01214..a03d6a9b33d9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9347,8 +9347,8 @@ self: { }: mkDerivation { pname = "HTab"; - version = "1.7.2"; - sha256 = "1xn2ljw97j625l5q7a9chqscdbi4cj29zg1yy4jz4mcivzwbjqii"; + version = "1.7.3"; + sha256 = "0w5zjd9q87a79vaslxs4r7xllq37vyg546ramgfnw43l1cmkica6"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -18097,6 +18097,164 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Shpadoinkle" = callPackage + ({ mkDerivation, base, jsaddle, jsaddle-warp, text, unliftio }: + mkDerivation { + pname = "Shpadoinkle"; + version = "0.1.0.0"; + sha256 = "0527rd9dh5sjh3y7sir9bpydad05rx43nr6ba20sa4ha8zvvl583"; + libraryHaskellDepends = [ + base jsaddle jsaddle-warp text unliftio + ]; + description = "A programming model for declarative, high performance user interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-pardiff" = callPackage + ({ mkDerivation, base, compactable, containers, file-embed, jsaddle + , lens, mtl, neat-interpolation, random, semialign, Shpadoinkle + , text, these, unliftio, uuid + }: + mkDerivation { + pname = "Shpadoinkle-backend-pardiff"; + version = "0.1.0.1"; + sha256 = "1b1ab062fm1qz0pnp4jws7wmhsb2hfvj5mb6jrrgbm9yjv7k725v"; + libraryHaskellDepends = [ + base compactable containers file-embed jsaddle lens mtl + neat-interpolation random semialign Shpadoinkle text these unliftio + uuid + ]; + description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-snabbdom" = callPackage + ({ mkDerivation, base, file-embed, jsaddle, mtl, Shpadoinkle, text + }: + mkDerivation { + pname = "Shpadoinkle-backend-snabbdom"; + version = "0.1.0.0"; + sha256 = "1j00ivjlmpb55h4ygldlads9135qnx3q0k0w946xqqlbyca1qzir"; + libraryHaskellDepends = [ + base file-embed jsaddle mtl Shpadoinkle text + ]; + description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-static" = callPackage + ({ mkDerivation, base, compactable, Shpadoinkle, text }: + mkDerivation { + pname = "Shpadoinkle-backend-static"; + version = "0.1.0.0"; + sha256 = "1mpia2qzv8cmd3ss20sj0bc15zjjkdj1g0byvnb3yakpbjky44j5"; + libraryHaskellDepends = [ base compactable Shpadoinkle text ]; + description = "A backend for rendering Shpadoinkle as Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-examples" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-sqlite, bytestring + , containers, exceptions, file-embed, lens, mtl + , optparse-applicative, servant, servant-client, servant-server + , Shpadoinkle, Shpadoinkle-backend-pardiff + , Shpadoinkle-backend-snabbdom, Shpadoinkle-backend-static + , Shpadoinkle-html, Shpadoinkle-lens, Shpadoinkle-router + , Shpadoinkle-widgets, sqlite-simple, stm, text, unliftio, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "Shpadoinkle-examples"; + version = "0.0.0.1"; + sha256 = "19iq8yw2m14y8j67slry1x30fnayx1d4sjwg2cafbgz9g7l1g7f1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base beam-core beam-sqlite bytestring containers exceptions + file-embed lens mtl optparse-applicative servant servant-client + servant-server Shpadoinkle Shpadoinkle-backend-pardiff + Shpadoinkle-backend-snabbdom Shpadoinkle-backend-static + Shpadoinkle-html Shpadoinkle-lens Shpadoinkle-router + Shpadoinkle-widgets sqlite-simple stm text unliftio wai + wai-app-static warp + ]; + description = "Example usages of Shpadoinkle"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {Shpadoinkle-lens = null;}; + + "Shpadoinkle-html" = callPackage + ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, jsaddle-dom + , Shpadoinkle, stm, template-haskell, text, unliftio + }: + mkDerivation { + pname = "Shpadoinkle-html"; + version = "0.1.0.0"; + sha256 = "1v5dxg7axg2a508rcphchihr5krrwagxx1a41660r7js7wba9bk8"; + libraryHaskellDepends = [ + base containers ghcjs-dom jsaddle jsaddle-dom Shpadoinkle stm + template-haskell text unliftio + ]; + description = "A typed, template generated Html DSL, and helpers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-router" = callPackage + ({ mkDerivation, aeson, base, bytestring, compactable, exceptions + , ghcjs-dom, http-api-data, jsaddle, jsaddle-dom, lens, network-uri + , servant, servant-client, servant-server, Shpadoinkle + , Shpadoinkle-backend-static, text, unliftio, wai, wai-app-static + , warp + }: + mkDerivation { + pname = "Shpadoinkle-router"; + version = "0.1.0.1"; + sha256 = "08kv5gbs2kkkspnmkzv0q5y3hnvv69yliwc4815wsyh8hdrn3ks6"; + libraryHaskellDepends = [ + aeson base bytestring compactable exceptions ghcjs-dom + http-api-data jsaddle jsaddle-dom lens network-uri servant + servant-client servant-server Shpadoinkle + Shpadoinkle-backend-static text unliftio wai wai-app-static warp + ]; + description = "A single page application rounter for Shpadoinkle based on Servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-widgets" = callPackage + ({ mkDerivation, aeson, base, compactable, containers + , edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck + , Shpadoinkle, Shpadoinkle-html, stm, template-haskell, text + , unliftio + }: + mkDerivation { + pname = "Shpadoinkle-widgets"; + version = "0.0.0.2"; + sha256 = "1n85pjzkn1rjhl9rqswm7cra631qqabqf42wimfq2v17l8ymrlky"; + libraryHaskellDepends = [ + aeson base compactable containers edit-distance email-validate + jsaddle mtl Shpadoinkle Shpadoinkle-html stm template-haskell text + unliftio + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "A collection of common reusable types and components"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Shrub" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -23296,6 +23454,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "addy" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hedgehog + , http-types, ip, lens, relude, tasty, tasty-hedgehog, tasty-hunit + , text, text-icu, validation-selective + }: + mkDerivation { + pname = "addy"; + version = "0.1.0.0"; + sha256 = "10p7q0infa1bawhg7hxw8rqjqdj3w737j5s3g41hy4in2nfp5ji0"; + libraryHaskellDepends = [ + attoparsec base bytestring ip lens relude text text-icu + validation-selective + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring hedgehog http-types ip lens relude + tasty tasty-hedgehog tasty-hunit text text-icu validation-selective + ]; + description = "A full-featured library for parsing, validating, and rendering email addresses"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "adhoc-network" = callPackage ({ mkDerivation, base, bytestring, containers, Crypto, dataenc , HaXml, hsgnutls, network, old-locale, parsec, pkcs1, random, time @@ -23930,8 +24111,6 @@ self: { ]; description = "Derivation of Aeson instances for GADTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aeson-generic-compat" = callPackage @@ -24281,6 +24460,8 @@ self: { pname = "aeson-schemas"; version = "1.1.0"; sha256 = "1w01mdixja6f8176ra0lrkhbrr68hcsiib7sq8sdfh1rsx3hsn62"; + revision = "1"; + editedCabalFile = "1z74b2barkaq4hmx29i39lgbq925z2ws226ad9cyicz8nlgrghbv"; libraryHaskellDepends = [ aeson base bytestring first-class-families megaparsec template-haskell text unordered-containers @@ -24454,6 +24635,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-via" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, text + }: + mkDerivation { + pname = "aeson-via"; + version = "0.1.0"; + sha256 = "0zlx4pxfh3qll8ymfya0rfqx3gd7ag0wag86fa8fvni6h07ynryf"; + libraryHaskellDepends = [ + aeson aeson-casing base newtype-generics text + ]; + description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "aeson-with" = callPackage + ({ mkDerivation, aeson, base, hashmap, lens, lens-aeson, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-with"; + version = "0.0.1.0"; + sha256 = "05xhbcfym586qb0giwr9rayqgyp25bc026kwbn7x5ln4nmzp2x9n"; + libraryHaskellDepends = [ + aeson base hashmap lens lens-aeson scientific text + unordered-containers vector + ]; + description = "withXField combinators for aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-yak" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -34355,14 +34566,14 @@ self: { broken = true; }) {}; - "aur_7_0_0" = callPackage + "aur_7_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "7.0.0"; - sha256 = "1x355bd8xdg0xm4y89ciqz861chj0b6dkwq8ma7nc46acl25a18z"; + version = "7.0.1"; + sha256 = "17gizmkbclgxsllsy4lcvxyw09bz5l51l40j74y8bzxzryvwdrq8"; libraryHaskellDepends = [ aeson base bytestring http-client http-types text ]; @@ -36555,8 +36766,8 @@ self: { ({ mkDerivation, barbies, base, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1.1"; - sha256 = "0b8g8q1ddbsfwf1v3063wv3abpa3f90mbiwa4wgsgizflj7s1ik9"; + version = "0.1.2"; + sha256 = "1zirafvm8x1badsh478hy8hh8zwqxkzcn3bscsvcp0vpyl8xxcma"; libraryHaskellDepends = [ barbies base template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -41836,6 +42047,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "blake3" = callPackage + ({ mkDerivation, base, memory, tasty, tasty-hunit }: + mkDerivation { + pname = "blake3"; + version = "0.1"; + sha256 = "005d7zqxbr0yc18c15llpd3mqwhvvc3nqgv9djmlf8xhzbmll4ar"; + libraryHaskellDepends = [ base memory ]; + testHaskellDepends = [ base memory tasty tasty-hunit ]; + description = "BLAKE3 hashing algorithm"; + license = stdenv.lib.licenses.asl20; + }) {}; + "blakesum" = callPackage ({ mkDerivation, base, bytestring, text, vector }: mkDerivation { @@ -43285,8 +43508,8 @@ self: { ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.7"; - sha256 = "11ycghpgngnw0ks47h3wmp0xdfl3qw1wnwdil1vmr1b5a4gngzi1"; + version = "1.4.6"; + sha256 = "09angcdqf75f03rh7m02rsqz5rr304dw4c5cszj9alpq4qxlsyqc"; libraryHaskellDepends = [ base mtl semigroups template-haskell text ]; @@ -44942,6 +45165,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bugsnag-hs_0_1_0_1" = callPackage + ({ mkDerivation, aeson, auto-update, base, bytestring, hedgehog + , http-client, stm, text, time, unordered-containers + }: + mkDerivation { + pname = "bugsnag-hs"; + version = "0.1.0.1"; + sha256 = "1b9ps0yhqvph9ax767xfq1v9v6pggm66ngsv96kww9lj8isg0y5d"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson auto-update base bytestring http-client stm text time + unordered-containers + ]; + testHaskellDepends = [ aeson base bytestring hedgehog stm ]; + description = "A Bugsnag client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -45218,13 +45460,18 @@ self: { }) {}; "burrito" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, template-haskell }: + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: mkDerivation { pname = "burrito"; - version = "1.0.2.0"; - sha256 = "1zmwzdihys8kh9idcpzvg1p4hcpzbfji8pdzixpvz9hya8cc44vf"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base hspec QuickCheck ]; + version = "1.1.0.0"; + sha256 = "16kw74sn3i6mfn0wakxyn2p71f8j924xqirzqrkdb6x9rr5y94di"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck text ]; description = "Parse and render URI templates"; license = stdenv.lib.licenses.isc; }) {}; @@ -45463,21 +45710,20 @@ self: { }) {}; "bv-sized" = callPackage - ({ mkDerivation, base, containers, lens, mtl, parameterized-utils - , pretty, QuickCheck, random + ({ mkDerivation, base, bitwise, bytestring, hedgehog, panic + , parameterized-utils, tasty, tasty-hedgehog, th-lift }: mkDerivation { pname = "bv-sized"; - version = "0.7.0"; - sha256 = "04fiqpd5kcq7lyas40axqn6mcngr1yymi1aiqgzip519qmdg73vl"; + version = "1.0.1"; + sha256 = "12l69p95z1ihwbfhlm0wyr1bdhs52ng4fvdsqxhgn0bpx9skzw73"; libraryHaskellDepends = [ - base containers lens mtl parameterized-utils pretty QuickCheck - random + base bitwise bytestring panic parameterized-utils th-lift ]; testHaskellDepends = [ - base lens parameterized-utils pretty QuickCheck random + base bytestring hedgehog parameterized-utils tasty tasty-hedgehog ]; - description = "a BitVector datatype that is parameterized by the vector width"; + description = "a bitvector datatype that is parameterized by the vector width"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -46320,16 +46566,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bz2_1_0_0_2" = callPackage - ({ mkDerivation, base, bytestring, bzlib, bzlib-conduit, c2hs - , conduit, cpphs, criterion, deepseq, directory, filepath, pipes - , pipes-bytestring, pipes-bzip, pipes-safe, tasty, tasty-golden - , tasty-hunit, temporary + "bz2_1_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib, c2hs, cpphs, criterion + , deepseq, directory, filepath, tasty, tasty-golden, tasty-hunit + , temporary }: mkDerivation { pname = "bz2"; - version = "1.0.0.2"; - sha256 = "12w3rz137g45cw3s5n0ajk9pvilfvh3fszjrnn07fsjck0r5mnyx"; + version = "1.0.1.0"; + sha256 = "1kskfgdfjpg2nn807298m605lc7jafnsi1phz3bp6jds48zwrfhq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; @@ -46338,8 +46583,7 @@ self: { tasty-hunit ]; benchmarkHaskellDepends = [ - base bytestring bzlib bzlib-conduit conduit criterion filepath - pipes pipes-bytestring pipes-bzip pipes-safe temporary + base bytestring bzlib criterion filepath temporary ]; benchmarkToolDepends = [ cpphs ]; description = "Bindings to libbz2"; @@ -48343,22 +48587,22 @@ self: { , exceptions, fmt, focus, generic-lens, generic-override , generic-override-aeson, hashable, http-date, http-types, lens , lens-aeson, mtl, polysemy, polysemy-plugin, reflection - , scientific, stm, stm-chans, stm-containers, text, text-show, time - , typerep-map, unordered-containers, vector, websockets - , wreq-patchable, wuss + , safe-exceptions, scientific, stm, stm-chans, stm-containers, text + , text-show, time, typerep-map, unagi-chan, unordered-containers + , vector, websockets, wreq-patchable, wuss }: mkDerivation { pname = "calamity"; - version = "0.1.5.1"; - sha256 = "1bbdxhv5gl61qwf65gsrdc5zkwx2a1aar83l2ndmanayjbh6n8cs"; + version = "0.1.8.0"; + sha256 = "1fn2nq1hzcn3lpk3y7i8s3xlbp68h6ikxmi0hvcp9mx9xhlw8yk0"; libraryHaskellDepends = [ aeson async base bytestring concurrent-extra containers data-default-class deepseq deque df1 di-polysemy exceptions fmt focus generic-lens generic-override generic-override-aeson hashable http-date http-types lens lens-aeson mtl polysemy polysemy-plugin - reflection scientific stm stm-chans stm-containers text text-show - time typerep-map unordered-containers vector websockets - wreq-patchable wuss + reflection safe-exceptions scientific stm stm-chans stm-containers + text text-show time typerep-map unagi-chan unordered-containers + vector websockets wreq-patchable wuss ]; description = "A library for writing discord bots"; license = stdenv.lib.licenses.mit; @@ -49077,10 +49321,8 @@ self: { }: mkDerivation { pname = "cardano-coin-selection"; - version = "1.0.0"; - sha256 = "0s0b2bbczsjq31h3xpyvingwpgpzgh3x2sw6bvryyn13wy717hbk"; - revision = "1"; - editedCabalFile = "1cdm1sq8qnna83lxr9s5jsaxwgzd2363fni3xyirldmxnn20j3l1"; + version = "1.0.1"; + sha256 = "1nvnkd5g0vq4vqj1w55hd1b1v7rwzhb3anhavablw9wy3w230qja"; libraryHaskellDepends = [ base bytestring containers cryptonite deepseq quiet text transformers @@ -50350,8 +50592,8 @@ self: { }: mkDerivation { pname = "cborg"; - version = "0.2.2.1"; - sha256 = "10v1dip11zlpbj69k95n1zm1msp41hkw8snd93h19zlji0v0v4ms"; + version = "0.2.3.0"; + sha256 = "14y7yckj1xzldadyq8g84dgsdaygf9ss0gd38vjfw62smdjq1in8"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim half integer-gmp primitive text @@ -55274,8 +55516,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.3"; - sha256 = "0b4ihkghgzln8rz2czbmagcnzsi3gdsx99d29s74izbib4laxqqm"; + version = "0.1.3.4"; + sha256 = "059lijjlf31xw94fqp8ylzmvdf99v43vwa35q8an7qg5df81yc1j"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -57995,14 +58237,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_9_0_0" = callPackage + "concurrency_1_11_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.9.0.0"; - sha256 = "1bmj1g9dnjj6390ky1xkddb1azff1ibphaiyyy2dix351m9dhc3s"; + version = "1.11.0.0"; + sha256 = "19a4za0c65gi2a5n882nyi26cgxrsry64rkd3qiqhvzf7m34cjxd"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -60179,6 +60421,8 @@ self: { pname = "consumers"; version = "2.2.0.2"; sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd"; + revision = "1"; + editedCabalFile = "150f62zfb5kpa8iwp08fq9gdmv142swfldkjrrjyx0jpvf6qcjxc"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -61802,8 +62046,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.3"; - sha256 = "0fdwjpkjwdixcb3r265z3dnrsrzcfh513lv6wxmgd63507j29njf"; + version = "0.2.5.4"; + sha256 = "1269zgvcvd18zdmg4rf73mh89a3gcph91fqm46p5h05wz500179w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62748,6 +62992,8 @@ self: { pname = "criterion-compare"; version = "0.1.0.0"; sha256 = "034cm3hap9x6cwp44hrd03b09mifcm076a9pn3lgql5ardx91yl7"; + revision = "1"; + editedCabalFile = "0nzwqk0mrchrymbmim2542s37i3dvvs5ks25839z9x0fp6gpxiq6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -64454,7 +64700,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {cudd = null;}; + }) {inherit (pkgs) cudd;}; "cue-sheet" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hspec @@ -65918,8 +66164,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "data-category"; - version = "0.9"; - sha256 = "1crp5mg9paf29gkl2nfpnx303p958kx3ap8zzbhq6gzvhklvyam0"; + version = "0.10"; + sha256 = "1mb72r17982w2sslmvi5nzpf7i702iikc7j4h68gzlfnm426jk9q"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67670,6 +67916,23 @@ self: { broken = true; }) {}; + "dataflower" = callPackage + ({ mkDerivation, base, criterion, hashable, hspec, mtl, pretty-show + , QuickCheck, stm, time, transformers, vector + }: + mkDerivation { + pname = "dataflower"; + version = "0.1.4.0"; + sha256 = "1ncm6rw8f0zcg7mnqkk027l48zqvg1xi27qjhxq00dhgbsnz42rp"; + libraryHaskellDepends = [ + base hashable mtl pretty-show stm time transformers vector + ]; + testHaskellDepends = [ base hspec QuickCheck stm ]; + benchmarkHaskellDepends = [ base criterion stm ]; + description = "A Pure-Haskell Timely Dataflow System"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "datalog" = callPackage ({ mkDerivation, base, containers, exceptions, hashable, haskeline , HUnit, parsec, pretty, test-framework, test-framework-hunit, text @@ -68141,6 +68404,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_15_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.15.1"; + sha256 = "1fq1ds5lkgysi5cpbwh97233vil6w9djxn6dcp5sjj7r5gb76vj7"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -69408,6 +69699,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_2_3_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.3.0.0"; + sha256 = "09lqniw3gacyykmk23vl4icyhiixdyjps50cwvcmlwd8k4941gwa"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -70137,8 +70445,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2.4"; - sha256 = "1wswirjqpmmzyag5y2jhys9pswl3fdrzjv69csvd655qg8iyybpb"; + version = "0.2.5"; + sha256 = "1pvrc139af0sh657ygj0lw1wi1rk3nr4y906l7l00iz5sa52j0cc"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -70672,34 +70980,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_31_1" = callPackage + "dhall_1_32_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory , doctest, dotgen, either, exceptions, filepath, foldl, gauge - , generic-random, hashable, haskeline, http-client, http-client-tls - , http-types, lens-family-core, megaparsec, memory, mockery, mtl - , network-uri, optparse-applicative, parser-combinators, parsers - , pretty-simple, prettyprinter, prettyprinter-ansi-terminal - , profunctors, QuickCheck, quickcheck-instances, repline - , scientific, semigroups, serialise, special-values, spoon, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-manipulate, th-lift-instances - , transformers, transformers-compat, turtle, unordered-containers - , uri-encode, vector + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, semigroups, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-manipulate + , th-lift-instances, transformers, transformers-compat, turtle + , unordered-containers, uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.31.1"; - sha256 = "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc"; + version = "1.32.0"; + sha256 = "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base bytestring case-insensitive cborg cborg-json containers contravariant cryptonite data-fix deepseq Diff directory dotgen either exceptions - filepath hashable haskeline http-client http-client-tls http-types - lens-family-core megaparsec memory mtl network-uri + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mtl network-uri optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate @@ -70745,14 +71053,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_29" = callPackage + "dhall-bash_1_0_30" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.29"; - sha256 = "0hmhk2lmqr1szrjx1kqa3zlylcblwigi6lqmkqnh0z1dh3kc1a1w"; + version = "1.0.30"; + sha256 = "1r2xr8c8kzmrxrb8m6f9dzjn81sqxzx97w0406kwrx9vzfj7ci1q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70851,7 +71159,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_6_3" = callPackage + "dhall-json_1_6_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -70860,8 +71168,10 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.6.3"; - sha256 = "1dm6lrn8nd29c8d1sp1l3jnxfxkhhqpvinrgn1hm0lcp3jgzchbb"; + version = "1.6.4"; + sha256 = "0vr6a02frfk5bh0qj0m4qlc5pp08m29gxp8ixqihrqakkna6409z"; + revision = "1"; + editedCabalFile = "1cnm3jww2cfw0fsrykcijrsixmci2j309k7f7kbplp7iy08dk5h0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70910,8 +71220,10 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.6"; - sha256 = "1pbxzs9axnbwqfgdz44cbaabq9v10jsk752ix8i0cz1vmwyrcnlv"; + version = "1.0.7"; + sha256 = "08nyai9y7s8facdjyfxc1z8dp8qd150y5554vxpvfr98xxj5kf41"; + revision = "1"; + editedCabalFile = "12gsy624cg1v98npanwmmmj4i37193lkqngjrrxj3z2ifr6s327i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70933,16 +71245,17 @@ self: { "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix - , neat-interpolation, optparse-generic, text + , lens-family-core, neat-interpolation, optparse-generic, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.13"; - sha256 = "0sdnrhr9f29ds4zdj2qs123k44vg15r8kn8w2zwkmdabilzlgg9k"; + version = "1.1.14"; + sha256 = "1sm7n8539y9944jlc6xk6qx0xssjwz0jjv1505swgi5qcrhdwsij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix neat-interpolation text + base containers data-fix dhall hnix lens-family-core + neat-interpolation text ]; executableHaskellDepends = [ base dhall hnix optparse-generic text @@ -71032,7 +71345,7 @@ self: { broken = true; }) {}; - "dhall-yaml_1_0_3" = callPackage + "dhall-yaml_1_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -71040,8 +71353,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.0.3"; - sha256 = "1lnxp2wqbgzg5f2kadhnbd8i5zgwy3g1nz17mmbdqwlx30p4scdn"; + version = "1.1.0"; + sha256 = "06lwzis9jjfis6rv4r9gd0iq1da5ymcd6jl8x3rbcimg87k9r4bj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71202,8 +71515,8 @@ self: { ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { pname = "di-polysemy"; - version = "0.1.1.2"; - sha256 = "0qglcvz628si1kg5djgh9j7ppvgfsc3gphal05hvlc4xziywf55y"; + version = "0.1.3.0"; + sha256 = "0fxm9m6cz687ihdh1nsms5cbxpngb9h6v62wdr82g83srvwgcflf"; libraryHaskellDepends = [ base df1 di-core di-df1 di-handle polysemy ]; @@ -71710,24 +72023,6 @@ self: { }) {}; "diagrams-solve" = callPackage - ({ mkDerivation, base, deepseq, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "diagrams-solve"; - version = "0.1.1"; - sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; - revision = "5"; - editedCabalFile = "1yl8cs05fzqcz49p601am1ij66m9pa70yamhfxgcvya2pf8nimlf"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base deepseq tasty tasty-hunit tasty-quickcheck - ]; - description = "Pure Haskell solver routines used by diagrams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-solve_0_1_2" = callPackage ({ mkDerivation, base, deepseq, tasty, tasty-hunit , tasty-quickcheck }: @@ -71741,7 +72036,6 @@ self: { ]; description = "Pure Haskell solver routines used by diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-svg" = callPackage @@ -71883,15 +72177,16 @@ self: { }: mkDerivation { pname = "dice-entropy-conduit"; - version = "1.0.0.1"; - sha256 = "01xwxajwyvv6ac48j9if6xsv05aqg1p02i7d25ivk1k56ky41l1s"; + version = "1.0.0.3"; + sha256 = "0pk1mhmy9683rbr2c589jqq1ra4w154nqcyvy3krw043hzd5y90n"; libraryHaskellDepends = [ base bytestring conduit entropy transformers ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 + base bytestring conduit entropy QuickCheck test-framework + test-framework-quickcheck2 transformers ]; - description = "Cryptographically secure n-sided dice via rejection sampling."; + description = "Cryptographically secure n-sided dice via rejection sampling"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -72295,10 +72590,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.8.4.0"; - sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0"; - revision = "2"; - editedCabalFile = "1a8z8fmjvwab222ayc04xd3wxqagfq6nwf68ynljcbwdbbjyjb7b"; + version = "0.8.4.2"; + sha256 = "0x0mh43rli77vqs9bpqd85w5wwr68qchfl5086nn137358583lrn"; libraryHaskellDepends = [ base bytestring containers mtl old-locale semigroups text time ]; @@ -72355,8 +72648,8 @@ self: { }: mkDerivation { pname = "digestive-functors-happstack"; - version = "0.6.1.2"; - sha256 = "18i4hb39rkgj2jz2ii697gayxi02dqpfbx5arv6zyjvmp1ydynvz"; + version = "0.6.1.3"; + sha256 = "1kjmjxmlaaawfkk96wzlzd0kbcb5j0pvqssh3ynjm074cy6h89fd"; libraryHaskellDepends = [ base bytestring digestive-functors happstack-server text ]; @@ -74619,8 +74912,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dobutokO"; - version = "0.3.1.0"; - sha256 = "0vsh9ygxaqy9qv193hbvk4fx4bj34m95qnqfippv76l0f4lpa8bz"; + version = "0.3.2.0"; + sha256 = "1qps4zvk3qn2d93778cs2b6kf1k9fjgw5248hyx9v0n05crfw2i8"; libraryHaskellDepends = [ base ]; description = "The library is intended to print updated messages on the terminal screen"; license = stdenv.lib.licenses.mit; @@ -74632,8 +74925,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.39.0.0"; - sha256 = "0xxdlxz3hmrsp57p3zdxwbd0wz366x5d9mkfld3i0v4by80x1a1m"; + version = "0.39.1.0"; + sha256 = "0nlgw32a5fbfpikdg8cs2ivc5gn4dcdqhmzgjl1qx07lhl0v8cyq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77442,8 +77735,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "earcut"; - version = "0.1.0.1"; - sha256 = "0zinq40b549avzgw1s8dbhn7cjsbsg72smr6iaj5aap8cccx6mr7"; + version = "0.1.0.2"; + sha256 = "080picb31ihv0gzxg0nnxx90g0n08l0hz9y57k2jihsibmkszwsi"; libraryHaskellDepends = [ base vector ]; description = "Binding to C++ earcut library"; license = stdenv.lib.licenses.isc; @@ -80144,8 +80437,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.3"; - sha256 = "07flh8rmdbi8rhgg2jzv70yb91kkjkiidc8ww5mxjdk8av70wbj3"; + version = "0.8.5"; + sha256 = "1kqi6ic5sa8y01ya99v7r5j9rl68vgy2lsixhbnavi8fx2200hcs"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -83176,8 +83469,8 @@ self: { }: mkDerivation { pname = "exinst"; - version = "0.7"; - sha256 = "01m50pixmrw6mrd04nxw6qwx0z5k857pn3nqfiybpmp4zbc3bwac"; + version = "0.8"; + sha256 = "08axj8yqnqbmxq4yi0fy2rffnkn7lcab2j13b9qlwl5ykc2jrhfh"; libraryHaskellDepends = [ base binary constraints deepseq hashable profunctors QuickCheck singletons @@ -83198,8 +83491,8 @@ self: { }: mkDerivation { pname = "exinst-aeson"; - version = "0.7"; - sha256 = "1dn08xqcfp3bsgvrhcv491kdfmky6925wa33zry8aijwxkchva67"; + version = "0.7.1"; + sha256 = "1rl9sg6bqac944dh4v6xish6fw6x5mr6a937nyq0yrjmg8d3gswp"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; @@ -83219,8 +83512,8 @@ self: { }: mkDerivation { pname = "exinst-bytes"; - version = "0.7"; - sha256 = "05k2jzlz6aj5wwy3bnysszr6kw85n0j73wkda5vwcrsha4prmf9r"; + version = "0.7.1"; + sha256 = "0carx1qbs97pxj9bq6splar46myfjz8l0imqmy2nr868sf7an7q5"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; @@ -83240,8 +83533,8 @@ self: { }: mkDerivation { pname = "exinst-cereal"; - version = "0.7"; - sha256 = "1qdz4a4qzi3fbkigvng36hz5j322zbbwya2vrs0shja8ry6rvi74"; + version = "0.7.1"; + sha256 = "1ffya75sjy1b60a2c10zymshc8qi1b79rzgpa2mpvlr0glf5i32d"; libraryHaskellDepends = [ base cereal constraints exinst singletons ]; @@ -83289,8 +83582,8 @@ self: { }: mkDerivation { pname = "exinst-serialise"; - version = "0.7"; - sha256 = "0a51534sifdhq764qa9hrhwnv48f1y08a7f11mhhx3r23pxh4588"; + version = "0.7.1"; + sha256 = "06fqhxcqwam7160i2m0hsmbdkb0q21kv0vy5azilrbphhz4ycfvp"; libraryHaskellDepends = [ base constraints exinst serialise singletons ]; @@ -84052,8 +84345,8 @@ self: { }: mkDerivation { pname = "extensions"; - version = "0.0.0.0"; - sha256 = "0abvqqzcmfrwla3i7zx09wm74dw50s2rzhxnfs1gx4rs7c9rn4kb"; + version = "0.0.0.1"; + sha256 = "0wxkkdvsq8pqirw5w8ss20iyblw9197q420cpwnqzbl2xb0cjk6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84653,8 +84946,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.1"; - sha256 = "1wz7f1ai73xc5n06db8mjbmbdyf5r9p78ysx3q1yiq32h2mvjd3m"; + version = "1.0.1.2"; + sha256 = "12pabsmy21il88qmdbg91152y9nzqci9y2cn9ljizlcndnsy7s5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86709,6 +87002,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-embed_0_0_12_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.12.0"; + sha256 = "13b2bcyifyrs1i9yk0qkj5md68ysnwma7zb1xrb1x2i4z3lk342p"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base filepath ]; + description = "Use Template Haskell to embed file contents directly"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "file-embed-lzma" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , lzma, template-haskell, text, th-lift-instances, transformers @@ -93601,6 +93911,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gather" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "gather"; + version = "0.1.0.0"; + sha256 = "0ajh8ygks61knc17vgsm5dsnqhkcrz2s0gaw6xyppq415wijgv0m"; + libraryHaskellDepends = [ base ]; + description = "An applicative for parsing unordered things, heterogenous sorting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gauge" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, directory , foundation, process, vector @@ -96068,6 +96389,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-byteorder" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ghc-byteorder"; + version = "4.11.0.0.10"; + sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "\"GHC.ByteOrder\" API Compatibility Layer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-call-stack-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -96594,14 +96928,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_8_10_0_6" = callPackage + "ghc-lib-parser-ex_8_10_0_8" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.6"; - sha256 = "0l416d7zxfpb3dvz5mh8fxg6z9gr56mhv9agkg3r9cgz0k7nfk1a"; + version = "8.10.0.8"; + sha256 = "0y5yxrgmmb69jq5z7b90hm1ialik1b4x1rmankh7kbynfmhl0h3q"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -105431,21 +105765,22 @@ self: { "graphql" = callPackage ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations - , hspec-megaparsec, megaparsec, raw-strings-qq, text, transformers - , unordered-containers + , hspec-megaparsec, megaparsec, parser-combinators, QuickCheck + , raw-strings-qq, text, transformers, unordered-containers }: mkDerivation { pname = "graphql"; - version = "0.6.1.0"; - sha256 = "0x0526kb29ndrhb9dy9iwxj9r3qij7sy4zjhjqfx3hc7334rdpda"; + version = "0.7.0.0"; + sha256 = "03bfg4whf7blf91x0h4qk6q7f1j7nfvhmqh4ggpnbyxdbyzx9sk4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers megaparsec text transformers - unordered-containers + aeson base containers megaparsec parser-combinators text + transformers unordered-containers ]; testHaskellDepends = [ aeson base containers hspec hspec-expectations hspec-megaparsec - megaparsec raw-strings-qq text transformers unordered-containers + megaparsec parser-combinators QuickCheck raw-strings-qq text + transformers unordered-containers ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -105883,28 +106218,6 @@ self: { }) {}; "greskell-websocket" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , greskell-core, hashtables, hspec, safe-exceptions, stm, text - , unordered-containers, uuid, vector, websockets - }: - mkDerivation { - pname = "greskell-websocket"; - version = "0.1.2.1"; - sha256 = "0wz4x7n64cwdjsmyziy9v76aa7p3kxjmbd9bfxc4rpqdjyfk34px"; - libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring greskell-core - hashtables safe-exceptions stm text unordered-containers uuid - vector websockets - ]; - testHaskellDepends = [ - aeson base bytestring greskell-core hspec unordered-containers uuid - vector - ]; - description = "Haskell client for Gremlin Server using WebSocket serializer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-websocket_0_1_2_2" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text , unordered-containers, uuid, vector, websockets @@ -105924,7 +106237,6 @@ self: { ]; description = "Haskell client for Gremlin Server using WebSocket serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grid" = callPackage @@ -107557,7 +107869,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {cudd = null; epd = null; inherit (pkgs) mtr; + }) {inherit (pkgs) cudd; epd = null; inherit (pkgs) mtr; inherit (pkgs) st; util = null;}; "hCM" = callPackage @@ -115694,7 +116006,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "haskoin-core_0_13_3" = callPackage + "haskoin-core_0_13_4" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3 @@ -115704,8 +116016,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.13.3"; - sha256 = "0lm2zsndiz9id7kmv4mxhakg7jzkz88g0f278bap78z5n9flh8sj"; + version = "0.13.4"; + sha256 = "0bxn1jfb2s308gpdiwwnvar606qc3fqnvf6k0hdz2x43pqkc15lb"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable memory mtl murmur3 @@ -115781,7 +116093,7 @@ self: { broken = true; }) {}; - "haskoin-node_0_12_0" = callPackage + "haskoin-node_0_13_0" = callPackage ({ mkDerivation, base, base64, bytestring, cereal, conduit , conduit-extra, containers, data-default, hashable, haskoin-core , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe @@ -115791,10 +116103,10 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.12.0"; - sha256 = "1x1z0k7n95mzgnlb3vcyp7gbqi727mniavdjijcrzw5vnvlzxnc6"; + version = "0.13.0"; + sha256 = "0s6l25n9w4g5r2xafb6x1gdqaghfmrnzh9i3nn64c3g26xzk3vnp"; libraryHaskellDepends = [ - base base64 bytestring cereal conduit conduit-extra containers + base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe random resourcet rocksdb-haskell rocksdb-query string-conversions text time transformers unliftio unordered-containers @@ -115862,37 +116174,38 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, base, base64, bytestring, cereal, conduit , containers, data-default, deepseq, filepath, hashable - , haskoin-core, haskoin-node, hedis, hspec, hspec-discover - , http-types, monad-logger, mtl, network, nqe, optparse-applicative - , QuickCheck, random, rocksdb-haskell, rocksdb-query, scotty - , string-conversions, text, time, transformers, unliftio - , unordered-containers, wai, warp + , haskoin-core, haskoin-node, haskoin-store-data, hedis, hspec + , hspec-discover, http-types, monad-logger, mtl, network, nqe + , optparse-applicative, QuickCheck, random, rocksdb-haskell + , rocksdb-query, scotty, string-conversions, text, time + , transformers, unliftio, unordered-containers, wai, warp }: mkDerivation { pname = "haskoin-store"; - version = "0.24.0"; - sha256 = "12ci8vgdd4xh9r8xl4j3b1f63majy8vgvxd2cxw221amhjcsvfvw"; + version = "0.29.3"; + sha256 = "1h28zn5fmps5jc2x2rx32z9yn7mz7j50ai4xs8mqzacsszj3sz95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node hedis http-types - monad-logger mtl network nqe random rocksdb-haskell rocksdb-query - scotty string-conversions text time transformers unliftio - unordered-containers wai warp + deepseq hashable haskoin-core haskoin-node haskoin-store-data hedis + http-types monad-logger mtl network nqe random rocksdb-haskell + rocksdb-query scotty string-conversions text time transformers + unliftio unordered-containers wai warp ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq filepath hashable haskoin-core haskoin-node monad-logger - mtl nqe optparse-applicative random string-conversions text time - transformers unliftio unordered-containers + deepseq filepath hashable haskoin-core haskoin-node + haskoin-store-data monad-logger mtl nqe optparse-applicative random + string-conversions text time transformers unliftio + unordered-containers ]; testHaskellDepends = [ aeson base base64 bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node hedis hspec http-types - monad-logger mtl network nqe QuickCheck random rocksdb-haskell - rocksdb-query scotty string-conversions text time transformers - unliftio unordered-containers wai warp + deepseq hashable haskoin-core haskoin-node haskoin-store-data hedis + hspec http-types monad-logger mtl network nqe QuickCheck random + rocksdb-haskell rocksdb-query scotty string-conversions text time + transformers unliftio unordered-containers wai warp ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -115901,6 +116214,29 @@ self: { broken = true; }) {}; + "haskoin-store-data" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , deepseq, hashable, haskoin-core, hspec, hspec-discover, network + , QuickCheck, scotty, string-conversions, text + }: + mkDerivation { + pname = "haskoin-store-data"; + version = "0.29.3"; + sha256 = "04ndllkxw3ly67d8irgjq8dhjvqh37qfcliz3978saa1i8bz3nav"; + libraryHaskellDepends = [ + aeson base bytestring cereal containers deepseq hashable + haskoin-core network scotty string-conversions text + ]; + testHaskellDepends = [ + aeson base bytestring cereal containers deepseq hashable + haskoin-core hspec network QuickCheck scotty string-conversions + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Data for Haskoin Store"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "haskoin-util" = callPackage ({ mkDerivation, base, binary, bytestring, containers, either , HUnit, mtl, QuickCheck, test-framework, test-framework-hunit @@ -116987,6 +117323,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-pool_0_5_2" = callPackage + ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.5.2"; + sha256 = "0l870d58a53akwbzgrcxfmz8mqc598qh1786d5ks937q0w219wlz"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + testHaskellDepends = [ base-prelude hasql hspec ]; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -117059,28 +117408,18 @@ self: { }) {}; "hasql-th" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , contravariant, fast-builder, foldl, hashable, hasql - , headed-megaparsec, hedgehog, megaparsec, parser-combinators - , selective, template-haskell, template-haskell-compat-v0208, text - , text-builder, tuple-th, unordered-containers, uuid, vector + ({ mkDerivation, base, bytestring, containers, contravariant, foldl + , hasql, postgresql-syntax, template-haskell + , template-haskell-compat-v0208, text, uuid, vector }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.7"; - sha256 = "0hs62wzp2phlq00jkz6qas1i3gyx3krnzn5hzvpa8zl4q0fggjvz"; + version = "0.4.0.8"; + sha256 = "14h71s7dha1g0zfi3vsg5y6lsn09x8c9nqv1nqiqmw2m19adx7gi"; libraryHaskellDepends = [ - base bytestring case-insensitive containers contravariant - fast-builder foldl hashable hasql headed-megaparsec megaparsec - parser-combinators selective template-haskell - template-haskell-compat-v0208 text text-builder - unordered-containers uuid vector - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers contravariant - fast-builder foldl hashable hasql headed-megaparsec hedgehog - megaparsec parser-combinators selective template-haskell text - text-builder tuple-th unordered-containers uuid vector + base bytestring containers contravariant foldl hasql + postgresql-syntax template-haskell template-haskell-compat-v0208 + text uuid vector ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; @@ -118855,20 +119194,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "headroom_0_2_2_0" = callPackage + "headroom_0_2_2_1" = callPackage ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec - , mustache, optparse-applicative, pcre-light, QuickCheck, rio - , template-haskell, time, yaml + , mustache, optparse-applicative, pcre-light, QuickCheck, rio, time + , yaml }: mkDerivation { pname = "headroom"; - version = "0.2.2.0"; - sha256 = "13kmzfh8r7y7cin93c0dhbcvgr66dcxfwjsylp41xyzq2w1g2aqb"; + version = "0.2.2.1"; + sha256 = "02s1s6v0fsn5a2anpi91za3dqafcp50lckr4xpir270l66lzdc2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base either file-embed mustache optparse-applicative - pcre-light rio template-haskell time yaml + pcre-light rio time yaml ]; executableHaskellDepends = [ base optparse-applicative rio ]; testHaskellDepends = [ @@ -119267,8 +119606,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.4.1"; sha256 = "0qa938cy1bm3shq0l4rfdq5cmb54jjy0qpp6cmx1xjd6yrdqrkxc"; - revision = "1"; - editedCabalFile = "1kxlq8x947wlpm6y80s25hhw074skzhpm7sbl87bvgcc6p7j7gc5"; + revision = "2"; + editedCabalFile = "0fs236sygw068v7l70myv23r3wpy961jjfiwvfd3l93ifsjrxm79"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers wl-pprint-annotated @@ -120941,8 +121280,8 @@ self: { }: mkDerivation { pname = "hextream"; - version = "0.1.0.1"; - sha256 = "0dc38zszqgbpmj7hlsd3w09i8rdpzd7jpr4vm2zv9y2y6bgcdpdr"; + version = "0.2.0.0"; + sha256 = "045q4glzqdl79w4baq4yvqjiqaih48p2iixkb3dv96nwmgr8xl8r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat containers parsers text @@ -121914,6 +122253,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hie-bios_0_5_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, containers, cryptohash-sha1, deepseq + , directory, extra, file-embed, filepath, ghc, hslogger, process + , tasty, tasty-hunit, temporary, text, time, transformers + , unix-compat, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.5.0"; + sha256 = "1096d9i4xx1ca9csm2gqi4wnm8q8wya4a5k37qc5ihwix531wx02"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit conduit-extra + containers cryptohash-sha1 deepseq directory extra file-embed + filepath ghc hslogger process temporary text time transformers + unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ base directory filepath ghc ]; + testHaskellDepends = [ + base directory extra filepath ghc tasty tasty-hunit text + unordered-containers yaml + ]; + description = "Set up a GHC API session"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hie-core" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot @@ -122761,8 +123129,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "1.0.0"; - sha256 = "18vhpmhpfam1nbh5fgbcfjnmsnsbkzq9qmr64alldlvwf6brs0kp"; + version = "2.0.0"; + sha256 = "1n1mp34s0ks7hkd2ddhfva9pbjwkciy1jjmqznmca244xg095yia"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -124048,8 +124416,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.1"; - sha256 = "1c17bcfddajkww05afjzbsdzx9xxxq4dnrb266jlb1zad1saf8ah"; + version = "3.1.1"; + sha256 = "1q3c7xjhzs0m1spd443nzpy7pxx6kjqklxvxkagfnjckxck8cpvv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -126928,6 +127296,45 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_34_1" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.34.1"; + sha256 = "0c0nnhg6yjcr6rmw2ffminjivjj8hd00cbimfkm6blxzmmxsv46i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -127137,17 +127544,17 @@ self: { "hpath-directory" = callPackage ({ mkDerivation, base, bytestring, exceptions, hpath-filepath , hpath-posix, hspec, HUnit, IfElse, process, safe-exceptions - , streamly, streamly-bytestring, time, unix, unix-bytestring - , utf8-string + , streamly, streamly-bytestring, streamly-posix, time, transformers + , unix, unix-bytestring, utf8-string }: mkDerivation { pname = "hpath-directory"; - version = "0.13.3"; - sha256 = "1cvqag2gincqdc0zmfs227qh0cqc6hvg26aaznis6q57jiyk0ja2"; + version = "0.13.4"; + sha256 = "0cg80zsh0cwkaq4hd6y41afvn340a4byrk6h4dspiksgym5i8ny0"; libraryHaskellDepends = [ base bytestring exceptions hpath-filepath hpath-posix IfElse - safe-exceptions streamly streamly-bytestring time unix - unix-bytestring utf8-string + safe-exceptions streamly streamly-bytestring streamly-posix time + transformers unix unix-bytestring utf8-string ]; testHaskellDepends = [ base bytestring hpath-filepath hpath-posix hspec HUnit IfElse @@ -127175,8 +127582,8 @@ self: { }: mkDerivation { pname = "hpath-io"; - version = "0.13.1"; - sha256 = "0bpjr4hqwz7hlj81ndi2lyi95halm822mmpyw91pimq6k2m635wk"; + version = "0.13.2"; + sha256 = "10dph69qsl73k5rjvr5mvcplwgcmq7qylaxmr2yx7hzcjzsdgg4z"; libraryHaskellDepends = [ base bytestring exceptions hpath hpath-directory hpath-posix safe-exceptions streamly time unix @@ -127233,6 +127640,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpc-codecov_0_2_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, directory, filepath, hpc + , tar, tasty, tasty-hunit + }: + mkDerivation { + pname = "hpc-codecov"; + version = "0.2.0.0"; + sha256 = "0ha97zldwbsx86ji4sjaw9jf7kzgrk41zabzdd1b6sdlf20p883k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring directory filepath hpc + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory filepath tar tasty tasty-hunit + ]; + description = "Generate codecov report from hpc data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process @@ -133525,6 +133954,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-openssl_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client + , http-types, network + }: + mkDerivation { + pname = "http-client-openssl"; + version = "0.3.1.0"; + sha256 = "16h2f4ap35g63mdg66iihp10p1s4nwsrb06hplwm9i4akdr9gws2"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL http-client network + ]; + testHaskellDepends = [ + base HsOpenSSL hspec http-client http-types + ]; + doCheck = false; + description = "http-client backend using the OpenSSL library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-overrides" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, network-uri, tasty, tasty-hunit @@ -134943,13 +135392,25 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "2.0.0.1"; - sha256 = "0n7npk8ksp14f2ib47navmc50rlnqrcsgdnxmd5qylg431h15sfz"; + version = "2.0.0.2"; + sha256 = "07bsf9wv1i1mzhbj216n0k22k9mwpkcvnh4gin8z4zldpj0vyqm4"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_2_0_0_3" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "2.0.0.3"; + sha256 = "03kjpc26bpym06ccz0kvbid2n38xdq5j0nd1cywfjbii8zyjmgzg"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -135347,14 +135808,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_7_0_1" = callPackage + "hvega_0_8_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: mkDerivation { pname = "hvega"; - version = "0.7.0.1"; - sha256 = "16s58m7kk72hr52k9gci17ac5k38r1zy08wll2frzjxissgza4cj"; + version = "0.8.0.0"; + sha256 = "1pz4wha9xg58zgxbfahgjz01s0frdk9mlns0m3bwcdgn26n5np68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -135453,36 +135914,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-balancedparens_0_4_0_0" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, doctest - , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover - , hw-bits, hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, lens, mmap, optparse-applicative - , transformers, vector + "hw-balancedparens_0_4_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, directory + , doctest, doctest-discover, generic-lens, hedgehog, hspec + , hspec-discover, hw-bits, hw-excess, hw-fingertree + , hw-hspec-hedgehog, hw-int, hw-prim, hw-rankselect-base, lens + , mmap, optparse-applicative, transformers, vector }: mkDerivation { pname = "hw-balancedparens"; - version = "0.4.0.0"; - sha256 = "02yb90i256avjkn7kfqiv55x8jpsiavr7swy1lh9bhga2zhgxnd5"; - revision = "1"; - editedCabalFile = "04s9n77xq5wr2n9zhj85dycxyvnbz0832m7sajrhl6kif4b0rsfv"; + version = "0.4.1.0"; + sha256 = "1ddxg00pwjvlrd4zdx9b9y7hm8rgxsxkvzzvwc34p2y75rivp21l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim - hw-rankselect-base vector + base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-int + hw-prim hw-rankselect-base vector ]; executableHaskellDepends = [ base bytestring generic-lens hw-bits hw-prim lens mmap optparse-applicative vector ]; testHaskellDepends = [ - base doctest doctest-discover hedgehog hspec hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector + base directory doctest doctest-discover hedgehog hspec hw-bits + hw-hspec-hedgehog hw-int hw-prim hw-rankselect-base transformers + vector ]; testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ - base criterion hedgehog hw-bits hw-prim vector + base criterion deepseq directory generic-lens hedgehog hw-bits + hw-prim lens vector ]; doHaddock = false; description = "Balanced parentheses"; @@ -135992,47 +136453,6 @@ self: { }) {}; "hw-json-standard-cursor" = callPackage - ({ mkDerivation, array, base, bits-extra, bytestring, criterion - , directory, doctest, doctest-discover, generic-lens, hedgehog - , hspec, hspec-discover, hw-balancedparens, hw-bits - , hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, optparse-applicative, text - , vector, word8 - }: - mkDerivation { - pname = "hw-json-standard-cursor"; - version = "0.2.2.0"; - sha256 = "0rj0p3p2b5ghyyfkzvaivzcdsmnjxvqm16n94qpwacaszyca8hny"; - revision = "2"; - editedCabalFile = "07cspws24pxh9i98zylw73fknw6gcvna8qq9r3lcnh455wr3c9m1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bits-extra bytestring hw-balancedparens hw-bits - hw-json-simd hw-prim hw-rankselect hw-rankselect-base mmap vector - word8 - ]; - executableHaskellDepends = [ - base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim - hw-rankselect hw-rankselect-base lens mmap optparse-applicative - text vector - ]; - testHaskellDepends = [ - base bits-extra bytestring doctest doctest-discover hedgehog hspec - hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect - hw-rankselect-base vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion directory mmap - ]; - description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-json-standard-cursor_0_2_3_1" = callPackage ({ mkDerivation, array, base, bits-extra, bytestring, criterion , directory, doctest, doctest-discover, generic-lens, hedgehog , hspec, hspec-discover, hw-balancedparens, hw-bits @@ -138751,8 +139171,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.10.1.0"; - sha256 = "0vbi0cnw0hxm69h90v9rbjaqqfilg4mcrv0rdvmc11jxdiv3qlvw"; + version = "0.10.1.1"; + sha256 = "10rsdcc2l0gkhapvi5vzjc7m2bwv67k4iy3vjkx8i92jk6023y64"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -139076,23 +139496,6 @@ self: { }) {}; "ilist" = callPackage - ({ mkDerivation, base, criterion, hspec, lens, loop, transformers - , vector - }: - mkDerivation { - pname = "ilist"; - version = "0.4.0.0"; - sha256 = "105qz5x03fa713ghxvmivawsaq3l9zf5ab4n09j7i7ryj3dwp4nv"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec transformers ]; - benchmarkHaskellDepends = [ - base criterion lens loop transformers vector - ]; - description = "Optimised list functions for doing index-related things"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "ilist_0_4_0_1" = callPackage ({ mkDerivation, base, criterion, hspec, lens, loop, transformers , vector }: @@ -139107,7 +139510,6 @@ self: { ]; description = "Optimised list functions for doing index-related things"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "illuminate" = callPackage @@ -139937,6 +140339,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "incremental-parser_0_4_0_2" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.4.0.2"; + sha256 = "11vip6qxw0y5yza4dcq4iah4kw3lyjsbxgbq1j17p1gr3c3xiafa"; + libraryHaskellDepends = [ + base monoid-subclasses parsers rank2classes transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -142644,28 +143069,6 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text - , containers, cryptonite, directory, filepath, memory, mtl, process - , temporary, text, transformers, unordered-containers, uuid - , zeromq4-haskell - }: - mkDerivation { - pname = "ipython-kernel"; - version = "0.10.1.0"; - sha256 = "03sygh5jvigfjg3il49wy41p6ac1wh2gx8wj3hg2rvsh91p9f4dw"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring cereal cereal-text containers cryptonite - directory filepath memory mtl process temporary text transformers - unordered-containers uuid zeromq4-haskell - ]; - description = "A library for creating kernels for IPython frontends"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ipython-kernel_0_10_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text , containers, cryptonite, directory, filepath, memory, mtl, parsec , process, temporary, text, transformers, unordered-containers @@ -142685,7 +143088,6 @@ self: { ]; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -142915,8 +143317,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5.3"; - sha256 = "0i9wrnlwf51wp3xgksj451nw6rxf2qghyhcjz7ihdxmqivbc6167"; + version = "0.6.6"; + sha256 = "1nmqgimmmxry4pj1y5mfsp662hkivn0vr9n8rx1yn0aldlzrxdm8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143338,6 +143740,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "it-has" = callPackage + ({ mkDerivation, base, generic-lens, QuickCheck }: + mkDerivation { + pname = "it-has"; + version = "0.1.0.0"; + sha256 = "11vfh01hwxg2jg2qwignvnjlms2issm94sqqvqy4mnm1vgphdbyx"; + libraryHaskellDepends = [ base generic-lens ]; + testHaskellDepends = [ base generic-lens QuickCheck ]; + description = "Automatically derivable Has instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "itanium-abi" = callPackage ({ mkDerivation, base, boomerang, HUnit, process, test-framework , test-framework-hunit, text, transformers, unordered-containers @@ -145051,6 +145465,38 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, pem, QuickCheck + , quickcheck-instances, safe, semigroups, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, text, time + , unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.3"; + sha256 = "0izrbjcmsiv67d2vmiqgmnzn27pvs0kvka3rw5x33fwjgq0b3jyv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + pem QuickCheck quickcheck-instances safe semigroups tasty + tasty-hspec tasty-quickcheck template-haskell text time + unordered-containers vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -146557,8 +147003,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.5.2"; - sha256 = "14pd0gl2an4mkxkhcx2ybvzdfx2izcnm05p7p7kncf5wdgmkn0px"; + version = "0.1.0.7"; + sha256 = "000qbmbm4gm9wv0q1vgn6y17g6ah0cx5jhcv311mwdfiq70k6ga4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146631,6 +147077,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "junit-xml_0_1_0_1" = callPackage + ({ mkDerivation, base, tasty, tasty-golden, text, xml-conduit }: + mkDerivation { + pname = "junit-xml"; + version = "0.1.0.1"; + sha256 = "1r75ncsmr5yj7xbgrw4sipjii7l3v7hj6nfi1lidc26n4m7r8ib1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base text xml-conduit ]; + testHaskellDepends = [ base tasty tasty-golden ]; + description = "Producing JUnit-style XML test reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jupyter" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cereal, containers , directory, exceptions, extra, filepath, monad-control, mtl @@ -148543,17 +149003,6 @@ self: { }) {}; "kind-generics" = callPackage - ({ mkDerivation, base, kind-apply }: - mkDerivation { - pname = "kind-generics"; - version = "0.4.0.0"; - sha256 = "1w3rpvdvgfczsc86y00qbr9s9r8vmv442m4x975f3zcqs4algfhp"; - libraryHaskellDepends = [ base kind-apply ]; - description = "Generic programming in GHC style for arbitrary kinds and GADTs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "kind-generics_0_4_1_0" = callPackage ({ mkDerivation, base, kind-apply }: mkDerivation { pname = "kind-generics"; @@ -148562,26 +149011,9 @@ self: { libraryHaskellDepends = [ base kind-apply ]; description = "Generic programming in GHC style for arbitrary kinds and GADTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kind-generics-th" = callPackage - ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "kind-generics-th"; - version = "0.2.1.0"; - sha256 = "08mswzwm1byxx2hfc8h2b90pnn2p4y83kdrvl4mlcn6v488k2lkb"; - libraryHaskellDepends = [ - base ghc-prim kind-generics template-haskell th-abstraction - ]; - testHaskellDepends = [ base kind-generics template-haskell ]; - description = "Template Haskell support for generating `GenericK` instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "kind-generics-th_0_2_2_0" = callPackage ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction }: @@ -148595,7 +149027,6 @@ self: { testHaskellDepends = [ base kind-generics template-haskell ]; description = "Template Haskell support for generating `GenericK` instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kinds" = callPackage @@ -148773,6 +149204,23 @@ self: { broken = true; }) {}; + "knit" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashtables + , vector + }: + mkDerivation { + pname = "knit"; + version = "0.1.0.0"; + sha256 = "0ypa7bj89zbkgyryms6nzwhqpp15hs52ynjvisdsng1xpgmf65dy"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashtables vector + ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "Ties the knot on data structures that reference each other by unique keys"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "knit-haskell" = callPackage ({ mkDerivation, aeson-pretty, base, base64-bytestring , blaze-colonnade, blaze-html, bytestring, case-insensitive @@ -150670,8 +151118,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-css"; - version = "0.0.3"; - sha256 = "1g0mh08rz44533473isrqbfn6hp12np9dxm85cn5xpx68jl9ni9g"; + version = "0.0.3.1"; + sha256 = "0gwsa9i9jxlnp60z3dh1rkk2zds74llxwjxzrsnhbmi71rmmiggx"; libraryHaskellDepends = [ base pretty ]; description = "CSS 2.1 syntax"; license = stdenv.lib.licenses.bsd3; @@ -151989,8 +152437,8 @@ self: { }: mkDerivation { pname = "latex-svg-pandoc"; - version = "0.2"; - sha256 = "1qzp5y7slklq8p1m6bspzyx7iypd5mq3q0hmxdysivisw776f0aq"; + version = "0.2.1"; + sha256 = "12rwapjx4whsw4id4rijwcqksfblp0mnvf0xrvj6pf17pgg4qh52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154796,6 +155244,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "libsodium" = callPackage + ({ mkDerivation, base, hedgehog, libsodium, tasty, tasty-hedgehog + , tasty-hunit + }: + mkDerivation { + pname = "libsodium"; + version = "1.0.18.0"; + sha256 = "1qp3ca673d71fiz48pgnc0ywgchar9j62wzayqgdvjkpbwq731am"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ libsodium ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + testPkgconfigDepends = [ libsodium ]; + description = "Low-level bindings to the libsodium C library"; + license = stdenv.lib.licenses.isc; + }) {inherit (pkgs) libsodium;}; + "libssh2" = callPackage ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb , time, unix @@ -155900,8 +156366,8 @@ self: { ({ mkDerivation, base, sbv }: mkDerivation { pname = "linearEqSolver"; - version = "2.0"; - sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w"; + version = "2.3"; + sha256 = "0lrrgix4m2sbfw9ydcqnx45lka0grl8ndiiy3cs1xg4xpcy2fkjw"; libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; license = stdenv.lib.licenses.bsd3; @@ -156956,8 +157422,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.6"; - sha256 = "0n837h2ffgqgram5kvnshlqk5jc87bw49z4pxa94qdmc323z51ak"; + version = "0.6.7"; + sha256 = "110y66kkbi6m55b3ba7p1r25xnf6n59yz2kdp4qf6s8c7a5i0wzh"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -157189,8 +157655,8 @@ self: { }: mkDerivation { pname = "little-rio"; - version = "0.1.0"; - sha256 = "0i0z0rc1wc46rsfn1i11xp5r2sxd5i11vcjzdmbkqadp6ms8ahv0"; + version = "0.1.1"; + sha256 = "0yxxmad9709h1gpxzjhvqmjhn3m8dcishd9gs6bakc2hrapw2ss2"; libraryHaskellDepends = [ base exceptions microlens microlens-mtl mtl unliftio-core ]; @@ -158218,10 +158684,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.8.0.0"; - sha256 = "15539v6y6s46kgb86ns13rh17c1qnidwdajk26yaxyqky58yx2m6"; - revision = "1"; - editedCabalFile = "0kdkvyw39ywly1qv1l0sq5qzr1akigl8410vr647hy2cn46anva0"; + version = "0.8.0.1"; + sha256 = "0s8w464yalbcgq3vq819mw9fsgj6a9rfbf00843311kqryml2a49"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -158321,10 +158785,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.1"; - sha256 = "1mx43qbv9rbzzkxz7qgwgp26aq00a97rwka7a823l5hm5hamx74k"; - revision = "1"; - editedCabalFile = "012vyqrw0ncwxdrlbcb97x9lcmaizxspfc9dd5jxq8dfmqw5xgq7"; + version = "0.7.1.3"; + sha256 = "132q4cx0a2malzncm7bscjikpqaaz6fwzz6n8mhqianbpq02s0v1"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -159553,26 +160015,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_10_3_0" = callPackage + "lsp-test_0_11_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl + , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl , parser-combinators, process, text, transformers, unix , unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.10.3.0"; - sha256 = "1gj6f99k3kd0flh2nbpj5wnhi1ql5rlijw0vf4l53zwxy203r7k8"; + version = "0.11.0.1"; + sha256 = "0s2sabykaaklw32z6j9z1m7l22ayc736sih39fhlq83iwgpv1917"; + revision = "1"; + editedCabalFile = "08lqzsw41vps1z8zihhsja95h5k73g5gpf689x2ryxn6ch13052v"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath + conduit-parse containers data-default Diff directory filepath Glob haskell-lsp lens mtl parser-combinators process text transformers unix unordered-containers ]; testHaskellDepends = [ - aeson base data-default haskell-lsp hspec lens text - unordered-containers + aeson base data-default directory filepath haskell-lsp hspec lens + text unordered-containers ]; description = "Functional test framework for LSP servers"; license = stdenv.lib.licenses.bsd3; @@ -161018,10 +161484,10 @@ self: { ({ mkDerivation, base, deepseq, profunctors, semigroups }: mkDerivation { pname = "magma"; - version = "0.4.0.0"; - sha256 = "18s93ap84cd74sl89fy89dpj89j6qxayc1v771n0zhshbp7g9gkz"; + version = "0.5.0.0"; + sha256 = "17ca22bs44whr597p7shv4fnpngbrb8vdxs6zbglfhb69bgjljyy"; libraryHaskellDepends = [ base deepseq profunctors semigroups ]; - description = "magma is an algebraic structure consisting a set together with an binary operation"; + description = "magma is an algebraic structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -162585,7 +163051,7 @@ self: { broken = true; }) {}; - "massiv_0_5_1_0" = callPackage + "massiv_0_5_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -162593,8 +163059,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.1.0"; - sha256 = "062b9mg1nqsg7lfv4a85s994jg1fipikpvxdb9w6ci3dqiq41dx0"; + version = "0.5.2.0"; + sha256 = "0j44as40bgzjixiga4l06gr3fpgk8vifmz2y12asczxwfv6k0xp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -164284,6 +164750,21 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "membrain_0_0_0_2" = callPackage + ({ mkDerivation, base, doctest, Glob, hedgehog, hspec, type-spec }: + mkDerivation { + pname = "membrain"; + version = "0.0.0.2"; + sha256 = "1nizjkiggm2ws8kkjw6v96a611kim4yjg4kdrk0rd83fa1zcf7cc"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec type-spec + ]; + description = "Type-safe memory units"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memcache" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion , data-default-class, hashable, network, resource-pool, time @@ -166211,6 +166692,28 @@ self: { broken = true; }) {}; + "minilight-lua" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hslua + , lens, linear, minilight, mtl, sdl2, sdl2-ttf, text, unix-time + }: + mkDerivation { + pname = "minilight-lua"; + version = "0.2.0.0"; + sha256 = "0q3w90rk7rlsy3p0iz91f3p7fsrbdsvirxq7xsb87hdbqxdwsavh"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers exceptions hslua linear minilight mtl + sdl2 sdl2-ttf text unix-time + ]; + executableHaskellDepends = [ base lens minilight mtl ]; + description = "A binding library of minilight for Lua langauge"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "minimal-configuration" = callPackage ({ mkDerivation, base, containers, directory, filepath }: mkDerivation { @@ -167129,8 +167632,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "mmsyn2"; - version = "0.1.7.0"; - sha256 = "1laskxwmylmg7mzm4h6z013s7rhfxf9y1mrvy4dp1cc80kq3scg0"; + version = "0.1.8.0"; + sha256 = "1qdbf89i5yx6ag9k4a9scc6wbm765b8zhq0gi12zx0bq75jjz3qz"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for multiple (Ord a) => a -> b transformations"; license = stdenv.lib.licenses.mit; @@ -167140,8 +167643,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "mmsyn3"; - version = "0.1.4.0"; - sha256 = "1i93744jprkg94lwcas2hvb341m6j08ncn1lzlz6d8z2blpd5z4w"; + version = "0.1.5.0"; + sha256 = "0fpn0lzr93aaha9741spc7vmlg5c4x5wb3p4qvxzp57w85zqdwm3"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = stdenv.lib.licenses.mit; @@ -167152,10 +167655,13 @@ self: { }: mkDerivation { pname = "mmsyn4"; - version = "0.1.6.0"; - sha256 = "0kz7wpfpvfayb6jgd0wwrb3dljcigmqdiixb7b86vyh36nzxhcfj"; - isLibrary = false; + version = "0.2.0.0"; + sha256 = "0915a1kh0sl9maq0i5hp6d87n19wihncx6sgm7wznfmzlvgs36qw"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base directory mmsyn2 mmsyn3 process vector + ]; executableHaskellDepends = [ base directory mmsyn2 mmsyn3 process vector ]; @@ -167167,8 +167673,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn5"; - version = "0.4.3.0"; - sha256 = "02ndmx1ndm87i2xlnaarw8yljjki1k7ak0jyb5s0c7hkvlrl7qax"; + version = "0.4.4.0"; + sha256 = "1yvsx82x7m5y2swxllhb7zzgspb3lfdhrbw6n5v3xsa9vxhwa35l"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; license = stdenv.lib.licenses.mit; @@ -167180,8 +167686,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.6.3.1"; - sha256 = "0iyyw02w4mw2g66dqs2ihd5qs4qrs4dcaql7y8gd3gc26mhn7svq"; + version = "0.7.2.0"; + sha256 = "03h2rcv8214jbbfw5wb4f1icv9lwn6jwvjp3a2cjpli425ira7kj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -167201,8 +167707,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.7.5.0"; - sha256 = "17haan991lzs5qs4gzywhk4vpn9dvgasdm9ff8hzs5h6a0604sfn"; + version = "0.7.6.0"; + sha256 = "0z8r6d7my2hbp8g2l3258461f53kx8zm3fzyq605vk4y9z6k6icb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167221,8 +167727,8 @@ self: { ({ mkDerivation, base, directory, mmsyn2, mmsyn7ukr, vector }: mkDerivation { pname = "mmsyn7l"; - version = "0.4.2.0"; - sha256 = "1dpilwaffrkihfgbpq7p1095qpx9qgcpzbs8q3kld948hliihix7"; + version = "0.4.3.0"; + sha256 = "0kr5aig2zgps846bx9psrci7hm35zdnaxbd5pm3ir1c7pxqf4csx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory mmsyn2 mmsyn7ukr vector ]; @@ -167237,8 +167743,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.6.6.0"; - sha256 = "0hmsf7l3p2b2zj5ydjzxzkgqsj53yjwn71vgw8qzhbxjihk5x6l2"; + version = "0.6.7.0"; + sha256 = "14siy618rby0x9s94cqlpn4ymx6d589vb9f3mnqly7ykf53rwbi3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -167253,8 +167759,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.15.3.0"; - sha256 = "02556sgfwi0fzlwj0x22hmyi9pgq0j7w4yfpjy2ni1px8vanwq5j"; + version = "0.15.4.0"; + sha256 = "0qiv2bc5aizpizmrjcsr2j6pi427xbk9pbgjyv4fr8mf7q3vcdjv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -169110,6 +169616,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monadic-recursion-schemes" = callPackage + ({ mkDerivation, base, comonad, containers, free, mtl + , recursion-schemes, transformers + }: + mkDerivation { + pname = "monadic-recursion-schemes"; + version = "0.1.7.0"; + sha256 = "16smzgbachi31xr9pmps7habwfb5577i3s0c9x2a81zl5wg23p30"; + libraryHaskellDepends = [ + base comonad containers free mtl recursion-schemes transformers + ]; + testHaskellDepends = [ base ]; + description = "Recursion Schemes for Monadic version"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monadiccp" = callPackage ({ mkDerivation, base, containers, mtl, parsec, pretty, random , semigroups @@ -170274,19 +170796,19 @@ self: { "moto" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath - , mtl, optparse-applicative, pipes, pipes-attoparsec + , mtl, optparse-applicative, pipes, pipes-aeson, pipes-attoparsec , pipes-bytestring, random, safe-exceptions, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers }: mkDerivation { pname = "moto"; - version = "0.0.3"; - sha256 = "1grvw5dlg6gjf83rhz45hnh73p74v85kmyn9yfi2gwbxcs7fsmvx"; + version = "0.0.4"; + sha256 = "04i85y0h5dqaz6iy7wrirgrm4bncygnmjjb5ncjzdf9c0lvmnab9"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers cryptohash-sha1 df1 di-core di-df1 directory filepath mtl optparse-applicative pipes - pipes-attoparsec pipes-bytestring safe-exceptions text time - transformers + pipes-aeson pipes-attoparsec pipes-bytestring safe-exceptions text + time transformers ]; testHaskellDepends = [ base bytestring containers di di-core directory filepath random @@ -170299,15 +170821,16 @@ self: { }) {}; "moto-postgresql" = callPackage - ({ mkDerivation, base, bytestring, moto, postgresql-simple - , safe-exceptions + ({ mkDerivation, base, bytestring, df1, di-df1, moto + , postgresql-simple, safe-exceptions, text }: mkDerivation { pname = "moto-postgresql"; - version = "0.0.1"; - sha256 = "0z5kxphsgywmnv33lf95by9gxlgr6i8y8lq7sqy495f87b1jv62d"; + version = "0.0.2"; + sha256 = "1n6xzcg6iqh9l4jkhq03hl11kh0614z41kv2pvw26bsknv4rp0cx"; libraryHaskellDepends = [ - base bytestring moto postgresql-simple safe-exceptions + base bytestring df1 di-df1 moto postgresql-simple safe-exceptions + text ]; description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; @@ -174545,8 +175068,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "7"; - editedCabalFile = "03nkhdrwki9j81clgfck4yl7ylv6dwa7gi77kknzq3s3nqlp728v"; + revision = "8"; + editedCabalFile = "007vgw2zaf2z9fyi9f0spmqn6fd8j438r3vnkgmazzvb43szmi0n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -175942,6 +176465,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-byte-order_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.1.5"; + sha256 = "0480asy7acf1bdc4n0761rax7dijbkjkyrqfl9rdwqvmbr3viy6c"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -176395,8 +176931,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "network-run"; - version = "0.2.2"; - sha256 = "1znf2pafcg1gcrb3yyc69h6y5mb8hilibr5khcwil09i5djsjyxx"; + version = "0.2.3"; + sha256 = "026l8j1nfgvs3lknn3fvsjj4x4niykhn99h5kywc47347b91xl3n"; libraryHaskellDepends = [ base bytestring network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -176941,40 +177477,43 @@ self: { }) {inherit (pkgs) blas;}; "neuron" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, base, clay, containers + ({ mkDerivation, aeson, aeson-gadt-th, algebraic-graphs, base, clay + , containers, data-default, dependent-sum, dependent-sum-template , dhall, directory, exceptions, file-embed, filepath, filepattern - , foldl, gitrev, hspec, lucid, mmark, mmark-ext, modern-uri - , optparse-applicative, pandoc, path, path-io, QuickCheck, relude - , rib, shake, text, time, unix, which, with-utf8 + , foldl, gitrev, hspec, lucid, megaparsec, mmark, mmark-ext + , modern-uri, mtl, optparse-applicative, pandoc, parser-combinators + , QuickCheck, relude, rib, shake, text, time, unix, uuid, which + , with-utf8 }: mkDerivation { pname = "neuron"; - version = "0.2.0.0"; - sha256 = "0f58yas3wmi2rv33lsxrj68yq3vvx8wl8gz5p93fd94zk7xgd46q"; + version = "0.4.0.0"; + sha256 = "1iw63qnq484zhi2fil050hswz1hl9cvygpqalhbbhnvry3f9bqkf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson algebraic-graphs base clay containers dhall directory - exceptions file-embed filepath filepattern foldl gitrev lucid mmark - mmark-ext modern-uri optparse-applicative pandoc path path-io - relude rib shake text time unix which + aeson algebraic-graphs base containers filepath filepattern + megaparsec mmark mtl parser-combinators relude text time ]; executableHaskellDepends = [ - aeson algebraic-graphs base clay containers dhall directory - exceptions file-embed filepath filepattern foldl gitrev lucid mmark - mmark-ext modern-uri optparse-applicative pandoc path path-io - relude rib shake text time unix which with-utf8 + aeson aeson-gadt-th algebraic-graphs base clay containers + data-default dependent-sum dependent-sum-template dhall directory + exceptions file-embed filepath filepattern foldl gitrev lucid + megaparsec mmark mmark-ext modern-uri mtl optparse-applicative + pandoc parser-combinators relude rib shake text time unix uuid + which with-utf8 ]; testHaskellDepends = [ - aeson algebraic-graphs base clay containers dhall directory + aeson aeson-gadt-th algebraic-graphs base clay containers + data-default dependent-sum dependent-sum-template dhall directory exceptions file-embed filepath filepattern foldl gitrev hspec lucid - mmark mmark-ext modern-uri optparse-applicative pandoc path path-io - QuickCheck relude rib shake text time unix which + megaparsec mmark mmark-ext modern-uri mtl optparse-applicative + pandoc parser-combinators QuickCheck relude rib shake text time + unix uuid which with-utf8 ]; description = "Haskell meets Zettelkasten, for your plain-text delight"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "newhope" = callPackage @@ -181856,12 +182395,12 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_3_2" = callPackage + "opentelemetry_0_4_0" = callPackage ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { pname = "opentelemetry"; - version = "0.3.2"; - sha256 = "0km45i5zv6v977ivv0rh7273nsnlqlwci79r5qnr9lhxwy8c0xsv"; + version = "0.4.0"; + sha256 = "1wp6r6625qangiw3lk2nj64khbb0jnp7rxb8s78q37icpdax9ck8"; libraryHaskellDepends = [ base bytestring exceptions ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -181870,29 +182409,31 @@ self: { "opentelemetry-extra" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , directory, exceptions, filepath, ghc-events, hashable - , http-client, http-client-tls, http-types, opentelemetry, random - , scientific, splitmix, stm, tasty, tasty-discover, tasty-hunit - , tasty-quickcheck, text, unordered-containers + , http-client, http-client-tls, http-types, opentelemetry + , QuickCheck, random, scientific, splitmix, stm, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, text, text-show + , typed-process, unordered-containers }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.3.2"; - sha256 = "1kkzi5cxv1mdb1i22bzrhr2vq4xb3kkkqs8smc6dps3pqswbxpyg"; + version = "0.4.0"; + sha256 = "07bzs9nz6hmy2cqa84wi3vbhfz0l6da5w5ihzmajxi7b2w940h0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring clock containers directory exceptions filepath ghc-events hashable http-client http-client-tls http-types - opentelemetry random scientific splitmix stm text + opentelemetry random scientific splitmix stm text text-show unordered-containers ]; executableHaskellDepends = [ async base clock exceptions filepath http-client http-client-tls - opentelemetry text + opentelemetry text typed-process ]; testHaskellDepends = [ - base bytestring opentelemetry tasty tasty-discover tasty-hunit - tasty-quickcheck + base bytestring ghc-events hashable opentelemetry QuickCheck tasty + tasty-discover tasty-hunit tasty-quickcheck text text-show + unordered-containers ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.asl20; @@ -181919,12 +182460,13 @@ self: { ({ mkDerivation, aeson, async, base, bytestring, clock, containers , exceptions, filepath, ghc-events, http-client, http-client-tls , http-types, network, opentelemetry, opentelemetry-extra - , scientific, splitmix, stm, text, unordered-containers + , scientific, splitmix, stm, text, typed-process + , unordered-containers }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.3.2"; - sha256 = "0zpp17dgblx8gl6xlban5gcs2y8qfy39k8c3spaif4gbw9qc21yv"; + version = "0.4.0"; + sha256 = "13glzxw93nx7gxqyisn7ikg2g9gl19mapl75p13binhip5ygcvpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181935,7 +182477,7 @@ self: { executableHaskellDepends = [ async base bytestring clock containers exceptions filepath ghc-events http-client http-types opentelemetry opentelemetry-extra - splitmix text unordered-containers + splitmix text typed-process unordered-containers ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -181948,8 +182490,8 @@ self: { }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.3.2"; - sha256 = "0l10bwrzpsn74l9xk6sdbdpjf49kf4ak9s3z95ib56vrhs0nrkz0"; + version = "0.4.0"; + sha256 = "00nvclimx6jh8sa3hfdrfag8sa29yqqknfqh3sg37sh0fbcqghjg"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -186898,7 +187440,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "password_2_0_0_1" = callPackage + "password_2_0_1_0" = callPackage ({ mkDerivation, base, base-compat, base64, bytestring, Cabal , cabal-doctest, cryptonite, doctest, memory, QuickCheck , quickcheck-instances, scrypt, tasty, tasty-quickcheck @@ -186906,8 +187448,8 @@ self: { }: mkDerivation { pname = "password"; - version = "2.0.0.1"; - sha256 = "1qxmmp0r8pkp6334213qai5y3wcg7w0jw9qp3m66mxaspjnfkpmw"; + version = "2.0.1.0"; + sha256 = "1f4bzjhpvxp3ms0nnh04g91wd77l09hvp1m7l6clc51frflh3j04"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory text @@ -188263,17 +188805,18 @@ self: { "penntreebank-megaparsec" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover - , megaparsec, mtl, text, transformers + , megaparsec, mtl, template-haskell, text, transformers }: mkDerivation { pname = "penntreebank-megaparsec"; - version = "0.1.0"; - sha256 = "1wjwwpb1i10kasqxn9gkn34cpyjs83znmr6ps5sjr0zhqyg3dk3j"; + version = "0.2.0"; + sha256 = "1238y2wya0ryas58n0b0l4gjmsrzl0dwns0f4gx5m8q6aq4d33c9"; libraryHaskellDepends = [ - base containers megaparsec mtl transformers + base containers megaparsec mtl template-haskell transformers ]; testHaskellDepends = [ - base containers hspec megaparsec mtl text transformers + base containers hspec megaparsec mtl template-haskell text + transformers ]; testToolDepends = [ hspec-discover ]; description = "Parser combinators for trees in the Penn Treebank format"; @@ -188769,6 +189312,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persist_0_1_1_5" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "persist"; + version = "0.1.1.5"; + sha256 = "19s0jpbcas6c64lzl9plhp1b3qk89g3jrqhj2ljxvkzk81dbr2r3"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 text + ]; + description = "Minimal serialization library with focus on performance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persist2er" = callPackage ({ mkDerivation, base, optparse-applicative, persistent, text }: mkDerivation { @@ -193062,23 +193623,18 @@ self: { "plzwrk" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable - , haskell-src-meta, hspec, mtl, neat-interpolation, parsec, split - , template-haskell, text, transformers, unordered-containers + , haskell-src-meta, hspec, mtl, parsec, split, template-haskell + , text, transformers, unordered-containers }: mkDerivation { pname = "plzwrk"; - version = "0.0.0.7"; - sha256 = "0llag2lgdb5d61961b6sjvl2v0mxbyvnz84ikzs87bf5gjm4v32j"; - isLibrary = true; - isExecutable = true; + version = "0.0.0.9"; + sha256 = "0wszr36ypaig8bijhn7v0d487vas423whrkxsv5q5l2xganr05cp"; libraryHaskellDepends = [ aeson base bytestring containers hashable haskell-src-meta mtl parsec split template-haskell text transformers unordered-containers ]; - executableHaskellDepends = [ - base containers neat-interpolation text unordered-containers - ]; testHaskellDepends = [ base hspec mtl text unordered-containers ]; description = "A front-end framework"; license = stdenv.lib.licenses.bsd3; @@ -195450,22 +196006,20 @@ self: { }) {}; "postgresql-syntax" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , contravariant, fast-builder, foldl, hashable, headed-megaparsec - , hedgehog, megaparsec, parser-combinators, QuickCheck - , quickcheck-instances, rerebase, selective, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder, unordered-containers, uuid - , vector + ({ mkDerivation, base, bytestring, case-insensitive, fast-builder + , hashable, headed-megaparsec, hedgehog, megaparsec + , parser-combinators, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, text-builder + , unordered-containers }: mkDerivation { pname = "postgresql-syntax"; - version = "0.2.0.1"; - sha256 = "0qp108cz7ch193hpfl03xffaxpn32zaaxhsv2fj5rbpvvyny3rx1"; + version = "0.3.0.2"; + sha256 = "1gl0k3idcgpnahh8mv01mjzhc4yx6i3f7shfa7mqhcgs6r1ccdhz"; libraryHaskellDepends = [ - base bytestring case-insensitive containers contravariant - fast-builder foldl hashable headed-megaparsec megaparsec - parser-combinators selective text text-builder unordered-containers - uuid vector + base bytestring case-insensitive fast-builder hashable + headed-megaparsec megaparsec parser-combinators text text-builder + unordered-containers ]; testHaskellDepends = [ hedgehog QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -197860,14 +198414,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_8_2" = callPackage + "process_1_6_9_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.8.2"; - sha256 = "1gdz227gmpax92xmwrvj9nrylybh4kk7m4yqr8qwa9i34dg1jzqx"; + version = "1.6.9.0"; + sha256 = "1shxwl392swdqffxdg2940y3yiml24iww9cy2pk89pv8r89x7yzy"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -204974,6 +205528,28 @@ self: { broken = true; }) {}; + "rbst" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, Glob, hspec, hspec-core, hspec-expectations + , mersenne-random-pure64, mwc-random, QuickCheck, text + , transformers + }: + mkDerivation { + pname = "rbst"; + version = "0.0.0.1"; + sha256 = "0f2pp1vqrwcn0lh0261acmhbwlcmc6sh2dkqhcl67xk2h62d9ipj"; + libraryHaskellDepends = [ + base bytestring containers deepseq mersenne-random-pure64 text + transformers + ]; + testHaskellDepends = [ + base doctest Glob hspec hspec-core hspec-expectations QuickCheck + ]; + benchmarkHaskellDepends = [ base gauge mwc-random ]; + description = "Randomized Binary Search Trees"; + license = stdenv.lib.licenses.mit; + }) {}; + "rc" = callPackage ({ mkDerivation, base, dde, hmatrix, Learning, linear, random , vector @@ -205832,8 +206408,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "0.2.0.2"; - sha256 = "14912rzn8bgrz92q7nv3yjxyfdjcznfgs2x1rnw1mc6q8imrfppy"; + version = "0.3.1.0"; + sha256 = "02fvr4smzmgksi8cvxz8yms0qzyxxzypcl3fzl0lsfsm9sdwmcaz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base64-bytestring bytestring @@ -206015,23 +206591,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, record-hasfield - , uniplate - }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.2.3"; - sha256 = "0pmy59xihjsn31ahq76cjsla779b4vidzf7m9g4j8z88pk65rk7z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra ghc uniplate ]; - executableHaskellDepends = [ base extra ]; - testHaskellDepends = [ base extra filepath record-hasfield ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2_5" = callPackage ({ mkDerivation, base, extra, filepath, ghc, record-hasfield , uniplate }: @@ -206046,7 +206605,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage @@ -206628,6 +207186,22 @@ self: { broken = true; }) {}; + "ref-extras" = callPackage + ({ mkDerivation, base, hashable, little-rio, microlens, stm + , unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "ref-extras"; + version = "0.1.1"; + sha256 = "0cv8h2v7vp6gv2lslzc7rpagaa871bi5drzml3090wna1kqnd0nq"; + libraryHaskellDepends = [ + base hashable little-rio microlens stm unliftio unliftio-core + unordered-containers + ]; + description = "Extra stuff for mutable references"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ref-fd" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -206976,8 +207550,8 @@ self: { }: mkDerivation { pname = "reflex-dom"; - version = "0.5.3"; - sha256 = "04xnalhrckz5idnx1d4d93nz8fnxnjsd03kciln36wwd895bcmrk"; + version = "0.6.0.0"; + sha256 = "1iimsk89akb7v2i1k1gaa6a6bhdyf2rsggac9k1xizxkylara5k4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207025,32 +207599,33 @@ self: { }) {}; "reflex-dom-core" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder - , bytestring, chrome-test-utils, constraints, constraints-extras - , containers, contravariant, data-default, dependent-map - , dependent-sum, dependent-sum-template, directory - , exception-transformers, exceptions, filepath, ghcjs-dom, hlint - , hspec, hspec-core, hspec-webdriver, http-types, HUnit, jsaddle - , jsaddle-warp, keycode, lens, lifted-base, monad-control, mtl - , network, network-uri, primitive, process, random, ref-tf, reflex + ({ mkDerivation, aeson, async, base, bifunctors, bimap + , blaze-builder, bytestring, case-insensitive, chrome-test-utils + , constraints, constraints-extras, containers, contravariant + , data-default, dependent-map, dependent-sum + , dependent-sum-template, directory, exception-transformers + , exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-core + , hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp + , keycode, lens, lifted-base, monad-control, mtl, network + , network-uri, primitive, process, random, ref-tf, reflex , semialign, semigroups, silently, stm, template-haskell, temporary , text, these, transformers, unix, wai, wai-websockets, warp , webdriver, websockets, which, zenc }: mkDerivation { pname = "reflex-dom-core"; - version = "0.5.3"; - sha256 = "0znymqld4d6fp8l14y0gn86nbffaw8b0ql0y7bj3vnx80crjc32j"; + version = "0.6.0.0"; + sha256 = "0819858z5p6847ac1rb1hsfr5ikn7x5xii8vgqbih4fg39mqfy14"; libraryHaskellDepends = [ - aeson base bifunctors bimap blaze-builder bytestring constraints - containers contravariant data-default dependent-map dependent-sum - dependent-sum-template directory exception-transformers ghcjs-dom - jsaddle keycode lens monad-control mtl network-uri primitive random - ref-tf reflex semialign semigroups stm template-haskell text these - transformers unix zenc + aeson base bifunctors bimap blaze-builder bytestring + case-insensitive constraints containers contravariant data-default + dependent-map dependent-sum dependent-sum-template directory + exception-transformers ghcjs-dom jsaddle keycode lens monad-control + mtl network-uri primitive random ref-tf reflex semialign semigroups + stm template-haskell text these transformers unix zenc ]; testHaskellDepends = [ - aeson base bytestring chrome-test-utils constraints + aeson async base bytestring chrome-test-utils constraints constraints-extras containers dependent-map dependent-sum dependent-sum-template directory exceptions filepath ghcjs-dom hlint hspec hspec-core hspec-webdriver http-types HUnit jsaddle @@ -207165,8 +207740,8 @@ self: { }: mkDerivation { pname = "reflex-fsnotify"; - version = "0.2.1.0"; - sha256 = "1ym220myy521j4lm0wrjydg18ya5fw71j0mv3md35vmn18n6r0d4"; + version = "0.2.1.1"; + sha256 = "0r7fv01dgg5l45yspgj3n2gh6yq0qkjv19hj9vq6284x04vldnqj"; libraryHaskellDepends = [ base containers directory filepath fsnotify reflex ]; @@ -207391,8 +207966,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.1.3.0"; - sha256 = "1200svlgpy4zqdfarx1b8n64vgskb9jl00p548ya4pwi0bsv95y7"; + version = "0.1.4.0"; + sha256 = "0z4yca6hh5rwgybsf6ssklhvpl34ikvi9j6wq99df5y0hpy9185f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208935,6 +209510,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "relude_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "0.7.0.0"; + sha256 = "1gx1h3656wz80v72acqky88iv7a2shinfv6apzzyjxii8lc22jf7"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers doctest Glob hedgehog text + ]; + benchmarkHaskellDepends = [ base gauge unordered-containers ]; + description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -210773,8 +211370,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "0.1.0.1"; - sha256 = "01giwrn6cxkpcjflarpphyvbz6japjq6xjilpg29wfq40c64nzyn"; + version = "0.1.1.0"; + sha256 = "1nzanirprfhyrh4g2miin89z3vmqsk3zacsfylns1ihdpcnpva4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211369,26 +211966,31 @@ self: { "rib" = callPackage ({ mkDerivation, aeson, async, base-noprelude, binary, clay , cmdargs, containers, dhall, directory, exceptions, filepath - , foldl, fsnotify, lucid, megaparsec, mmark, mmark-ext, modern-uri - , mtl, optparse-applicative, pandoc, pandoc-include-code - , pandoc-types, path, path-io, relude, safe-exceptions, shake, text - , time, wai, wai-app-static, warp + , foldl, fsnotify, hspec, lucid, megaparsec, mmark, mmark-ext + , modern-uri, mtl, optparse-applicative, pandoc + , pandoc-include-code, pandoc-types, QuickCheck, relude + , safe-exceptions, shake, text, time, wai, wai-app-static, warp }: mkDerivation { pname = "rib"; - version = "0.8.0.0"; - sha256 = "0chiqb2qg4wc37wby8srakr6yaja9hdrjy9jf13bxc91q2z9k82z"; + version = "0.10.0.0"; + sha256 = "129riz7843x9h2c9iz9wdcngj74x3rrvlbmd9y7ymmrh5d2kq1qv"; libraryHaskellDepends = [ aeson async base-noprelude binary clay cmdargs containers dhall directory exceptions filepath foldl fsnotify lucid megaparsec mmark mmark-ext modern-uri mtl optparse-applicative pandoc - pandoc-include-code pandoc-types path path-io relude - safe-exceptions shake text time wai wai-app-static warp + pandoc-include-code pandoc-types relude safe-exceptions shake text + time wai wai-app-static warp ]; - description = "Static site generator using Shake"; + testHaskellDepends = [ + aeson async base-noprelude binary clay cmdargs containers dhall + directory exceptions filepath foldl fsnotify hspec lucid megaparsec + mmark mmark-ext modern-uri mtl optparse-applicative pandoc + pandoc-include-code pandoc-types QuickCheck relude safe-exceptions + shake text time wai wai-app-static warp + ]; + description = "Static site generator based on Shake"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ribbit" = callPackage @@ -214016,6 +214618,8 @@ self: { pname = "safe-json"; version = "1.1.0"; sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; + revision = "1"; + editedCabalFile = "04bwgnv53acmiw50wj3k5lb791b4702mdzhsphshlwk2bc34ybqg"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -214773,6 +215377,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sampling_0_3_4" = callPackage + ({ mkDerivation, base, containers, criterion, foldl, mwc-random + , primitive, vector + }: + mkDerivation { + pname = "sampling"; + version = "0.3.4"; + sha256 = "1cwx64llg6x6dnsld6lx6bmb4cljz8abqp0d6vmh4wk11vzjsly0"; + libraryHaskellDepends = [ + base containers foldl mwc-random primitive vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Sample values from collections"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "samtools" = callPackage ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }: mkDerivation { @@ -217388,14 +218010,14 @@ self: { }: mkDerivation { pname = "secret-sharing"; - version = "1.0.1.0"; - sha256 = "16j4xz4kkcicqfl9r8831il310ns02kxwj7mga8pvssfnhzv9zpv"; + version = "1.0.1.2"; + sha256 = "0965nbzaiia0jbx1r149liyg8fsix7z5nlxybpavrkkn0b4ncn89"; libraryHaskellDepends = [ base binary bytestring dice-entropy-conduit finite-field vector ]; testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 + base binary bytestring dice-entropy-conduit finite-field QuickCheck + test-framework test-framework-quickcheck2 vector ]; description = "Information-theoretic secure secret sharing"; license = stdenv.lib.licenses.lgpl21; @@ -218616,8 +219238,8 @@ self: { }: mkDerivation { pname = "serialise"; - version = "0.2.2.0"; - sha256 = "17m1xs3hdvbkba1b8qjcv58drhl2wgvjkp7a2m38mkwn6xxvpg1k"; + version = "0.2.3.0"; + sha256 = "0vp4wyxpximpx10pssfgdsir1pc23zb62fg3kj3iblpzqfrryy69"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector @@ -222849,12 +223471,16 @@ self: { }) {}; "shake-plus" = callPackage - ({ mkDerivation, base, extra, path, rio, shake, within }: + ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake + , within + }: mkDerivation { pname = "shake-plus"; - version = "0.0.2.2"; - sha256 = "0yvwp3wzyzm8v2qihs96nsqlglhp7w1ndig04nzd13nqa726m6nd"; - libraryHaskellDepends = [ base extra path rio shake within ]; + version = "0.1.3.0"; + sha256 = "1s7mx4xsl31y8j4cm0hv7xwj6hf4smfby86d38fxw3mw3pcjw385"; + libraryHaskellDepends = [ + base comonad extra hashable path rio shake within + ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; }) {}; @@ -223438,23 +224064,6 @@ self: { }) {}; "shellmet" = callPackage - ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text - }: - mkDerivation { - pname = "shellmet"; - version = "0.0.3.0"; - sha256 = "1i39zl8khsriadi7k28rn0w2y8wf6jmnz5x3nlkdd9spkdy1qz49"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base process text ]; - executableHaskellDepends = [ base text ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Out of the shell solution for scripting in Haskell"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "shellmet_0_0_3_1" = callPackage ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text }: mkDerivation { @@ -223469,7 +224078,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Out of the shell solution for scripting in Haskell"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shellout" = callPackage @@ -226245,8 +226853,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.8.3.4"; - sha256 = "1fqjz2s8i9i235mrp4364ycidax2zl7xrgcahsqpbr4cx7vgy9qz"; + version = "0.8.4"; + sha256 = "08fy9c3ms6xwzxispgksf1cji9mvcyy8swaj3dwvc2dc66h06xky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226266,8 +226874,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.8.3.4"; - sha256 = "0jcryl83873jjn6lximl1pnshf84nlln1hdvrdcybhrpjyd56qdc"; + version = "0.8.4"; + sha256 = "0wyhiark5d1r1hi04xiq14ykikr9yd4dmzqbr7qswl05b0bk7gam"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228524,6 +229132,8 @@ self: { pname = "snaplet-postgresql-simple"; version = "1.2.0.0"; sha256 = "0an9b72vfnb562k49bz5wh72s637r3vrbm4x9brwf483rrmlmvrf"; + revision = "1"; + editedCabalFile = "1zzidcr5j6i6xnzrlzxlmpj6fs60knkbkjbagawa3y1v1wg3vmq7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -230051,8 +230661,8 @@ self: { }: mkDerivation { pname = "spacecookie"; - version = "0.2.1.1"; - sha256 = "0l3knzsqab58yyk6kafpxxh465ncgqr2gi388k89gxwrlcqkl8wr"; + version = "0.2.1.2"; + sha256 = "0cb51kji78vfg17mcnz3a5jlfbnyavh880x09b18y9syqwx4in7l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232017,8 +232627,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.1.2.0"; - sha256 = "1xm99zdgzdlaz48njpyl0ji9hmyxcf9zxjs0dg46si4lj64qavmz"; + version = "0.1.3.0"; + sha256 = "04nd7c34gsx6njiwqzzx14ff745naam1cxc0cr4s7yyr9h7ikdai"; libraryHaskellDepends = [ base ghc-prim ]; description = "algorithms around stable marriage"; license = stdenv.lib.licenses.bsd3; @@ -235520,15 +236130,15 @@ self: { "streamly-posix" = callPackage ({ mkDerivation, base, bytestring, filepath, hpath-posix, hspec , hspec-discover, safe-exceptions, streamly, streamly-bytestring - , temporary, unix, word8 + , temporary, transformers, unix, word8 }: mkDerivation { pname = "streamly-posix"; - version = "0.1.0.0"; - sha256 = "0pjrmpsm0925jhxnhqka3rlwllcww9xinyh1dg0k2g6b4pxr9gbx"; + version = "0.1.0.1"; + sha256 = "1z6hmnhgglr5zwsaakn7c6d0cgq32pwcdds8fkn28y9p3yc89bvv"; libraryHaskellDepends = [ base bytestring hpath-posix safe-exceptions streamly - streamly-bytestring unix word8 + streamly-bytestring transformers unix word8 ]; testHaskellDepends = [ base filepath hpath-posix hspec hspec-discover temporary unix @@ -235758,12 +236368,27 @@ self: { pname = "strict-tuple"; version = "0.1.3"; sha256 = "0dyiwgkbr1d97jbri7a2q4by7g0wiszpw3hgfgqv4rfp25lsv39j"; + revision = "1"; + editedCabalFile = "1bkizfki8v5p0n8sy59s4zqjmv1mnv3s45327cig9cr081ibv9yy"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; license = stdenv.lib.licenses.bsd3; }) {}; + "strict-tuple-lens" = callPackage + ({ mkDerivation, base, lens, strict-tuple }: + mkDerivation { + pname = "strict-tuple-lens"; + version = "0.1.0.1"; + sha256 = "1vvhbzbyfvkx76scygg8gwfp01cw6ks38hk0gb70xdl2lyzi80wg"; + revision = "1"; + editedCabalFile = "0875r7kva6ym17fdklh18vm4s04sd9pj0w55km8jv2kmbkmfja8k"; + libraryHaskellDepends = [ base lens strict-tuple ]; + description = "Optics for the `strict-tuple` library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-types" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , hashable, text, unordered-containers, vector @@ -235909,35 +236534,6 @@ self: { }) {}; "string-interpolate" = callPackage - ({ mkDerivation, base, bytestring, criterion, formatting - , haskell-src-exts, haskell-src-meta, hspec, interpolate - , neat-interpolation, QuickCheck, quickcheck-instances - , quickcheck-text, quickcheck-unicode, random-shuffle - , template-haskell, text, text-conversions, unordered-containers - , utf8-string - }: - mkDerivation { - pname = "string-interpolate"; - version = "0.2.0.3"; - sha256 = "0xmanjs8sgk3cm6f25wbpxsmzpgznf73pvviw0ig71mn2y2kx6bi"; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta template-haskell - text text-conversions utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec QuickCheck quickcheck-instances - quickcheck-text quickcheck-unicode random-shuffle text - unordered-containers - ]; - benchmarkHaskellDepends = [ - base bytestring criterion formatting interpolate neat-interpolation - QuickCheck text - ]; - description = "Haskell string/text/bytestring interpolation that just works"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "string-interpolate_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, formatting , haskell-src-exts, haskell-src-meta, hspec, interpolate , neat-interpolation, QuickCheck, quickcheck-instances @@ -235963,7 +236559,6 @@ self: { ]; description = "Haskell string/text/bytestring interpolation that just works"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-isos" = callPackage @@ -236828,8 +237423,8 @@ self: { }: mkDerivation { pname = "stylist"; - version = "2.0.0.0"; - sha256 = "1xb2vl4xjbgd52nqm378r43z4xlgzscfy9a7mqp522av3b4v61x7"; + version = "2.2.0.0"; + sha256 = "0pmyjxdg7m0fh9m0nrimi02q4lqk47kfbws65mb22rj7ckm7gw68"; libraryHaskellDepends = [ async base css-syntax hashable network-uri text unordered-containers @@ -240891,14 +241486,12 @@ self: { }: mkDerivation { pname = "tart"; - version = "0.1.2"; - sha256 = "1ik86xbai9513gr9k60m55xf5pj5bdw3wbjc0gd260j9k9j4p73k"; - revision = "1"; - editedCabalFile = "04xkrc0xfbx2kk6f8b41zf611s4k848ahczbbs85pd9lqqpkbhzj"; + version = "0.2"; + sha256 = "03pi46lr5b9qcc35ffwxwzv9ll51cyv526kjcvaags3ky917rxxn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base binary bytestring microlens-platform mtl vty + array base binary bytestring microlens-platform mtl text vty ]; executableHaskellDepends = [ base brick containers directory microlens-platform microlens-th mtl @@ -241057,6 +241650,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty_1_3" = callPackage + ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl + , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth + }: + mkDerivation { + pname = "tasty"; + version = "1.3"; + sha256 = "0c9vmy31z6i4ligrsk0lcn8ir9qajc2yp3zdn8nnjd0myzddzf3b"; + libraryHaskellDepends = [ + ansi-terminal async base clock containers mtl optparse-applicative + stm tagged unbounded-delays unix wcwidth + ]; + description = "Modern and extensible testing framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-ant-xml" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers @@ -241100,13 +241711,25 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.0.0.1"; - sha256 = "19cgzr1gcy1khvw2a6bfd620zmrc4szkdwyf3rfyacxgbgqy1b1z"; + version = "2.0.0.3"; + sha256 = "02qzyrn33ylfbk2mgwj08lphprxvzh85c0dz2540qp1j6xa5zxpn"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_2_0_0_4" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "2.0.0.4"; + sha256 = "0jryp6kndaaxfjd4vsws18igx9ivd36iqyqdbjpxmxbx34d1h6kn"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit @@ -241186,6 +241809,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-golden_2_3_3_3" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, text, unix-compat + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.3.3"; + sha256 = "1h0nz276fxhdxjiqnrkpmsndrsfvbd13r7i6i8arxgldl1n86h24"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary text + unix-compat + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th @@ -241214,8 +241861,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.2"; sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; - revision = "1"; - editedCabalFile = "0r4mijgy1z9rdi3as2a1a02xykwyqalhg5vahsjzgdgmf7bmmc6h"; + revision = "2"; + editedCabalFile = "1v4jp3xk5ikik638vkyf2jxkhaf2n6fsw8zxqxxjv65x60082kl7"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -241256,8 +241903,8 @@ self: { pname = "tasty-hspec"; version = "1.1.5.1"; sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"; - revision = "5"; - editedCabalFile = "1ramy5jn7a6xvxc6s8bvn34m1vzniks05277s3i80cp4qprwx8ri"; + revision = "6"; + editedCabalFile = "0xa7h0p5r41m2a3l5r9ggmm4bc2a6wzgb4qvcqfl0dd2yb922bkz"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -241521,8 +242168,8 @@ self: { pname = "tasty-rerun"; version = "1.1.17"; sha256 = "0hiafrknk700gi8rm675akz8q6abk8iwlmygwnlx1fy3znalkqad"; - revision = "1"; - editedCabalFile = "1j08802psflkj3wb5jhh4z5w1i852hw5fm9k5aczbvfx9873zyhc"; + revision = "2"; + editedCabalFile = "0jkkydcq8fx3ia92pn9dnbfhx18wz70366y7xlv9yj9zysqcr8yl"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -241683,8 +242330,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.0"; sha256 = "1ix1ksibdkqrycrcnyi6vablp17kg3ajw5kghff1ia7wd2nb9fbk"; - revision = "1"; - editedCabalFile = "1zwfdad5kp3l1lysz9x5hxwp0yphsdbhgbp33yczw8c8sai3l7xb"; + revision = "2"; + editedCabalFile = "18p5lk4p1ppq5ascykf7b89sc8c8g013w5j5i4q74iwxmah1va2g"; libraryHaskellDepends = [ base bytestring http-types tasty wai wai-extra ]; @@ -245609,6 +246256,8 @@ self: { pname = "th-test-utils"; version = "1.0.1"; sha256 = "1qbxj4zarw1nm0c2shrr4wrrkmqlxx2qdh9q3q9arkic4lwgsxcx"; + revision = "1"; + editedCabalFile = "0x4kwp1lj663dd4nfr348y2z5qq1hkly5r289wmqhy5dxlx7cb9n"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base tasty tasty-hunit template-haskell transformers @@ -248887,8 +249536,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.2.2.1"; - sha256 = "17g9pr25jhki9r3jfvgbx8avpjikcglb9hg45rfkvk9y50wxrk15"; + version = "0.2.2.2"; + sha256 = "091hqg4wxki8v7xkrzmnh1hpm81pif936pbmrzvr5p84sbbyyj91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249086,8 +249735,8 @@ self: { ({ mkDerivation, base, void }: mkDerivation { pname = "total"; - version = "1.0.5"; - sha256 = "0kv9jb2d8mh4p9b91jg5367ar4p837xclzlwgjrjgvxl62z7h84j"; + version = "1.0.6"; + sha256 = "0zr3b83pwjbarxsl9kva6va3cp9b4npfp77yp0nh9q1za00344vk"; libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -251372,8 +252021,8 @@ self: { }: mkDerivation { pname = "ttc"; - version = "0.2.0.0"; - sha256 = "1vl3fp0d9v674gg6zbmafvrb97zqxcjlpp5j77msjn1kl7ki6xs7"; + version = "0.2.1.0"; + sha256 = "1cx2v2rjb3d3qifa6ssnvxwd70cm3qacsr0i1ndrm1mrl8j1ffqp"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -251812,33 +252461,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, criterion, directory, doctest, exceptions, fail - , foldl, hostname, managed, optional-args, optparse-applicative - , process, semigroups, stm, streaming-commons, system-fileio - , system-filepath, temporary, text, time, transformers, unix - , unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.5.18"; - sha256 = "0xdkn6vhmir7sxazi5sxrgvwsi8zqyqbcyvjnqvckz0ac5d8zj68"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock containers directory - exceptions foldl hostname managed optional-args - optparse-applicative process semigroups stm streaming-commons - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ - base doctest fail system-filepath temporary - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_5_19" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, fail , foldl, hostname, managed, optional-args, optparse-applicative @@ -251863,7 +252485,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -253398,16 +254019,19 @@ self: { "typed-encoding" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, doctest - , doctest-discover, QuickCheck, quickcheck-instances, text + , doctest-discover, hspec, QuickCheck, quickcheck-instances + , symbols, text }: mkDerivation { pname = "typed-encoding"; - version = "0.2.0.0"; - sha256 = "1h1bnvw9j72mw2r4qjxsq4hvq1p8jkax4fhnhglcyskngmaa7ri5"; - libraryHaskellDepends = [ base base64-bytestring bytestring text ]; + version = "0.2.1.0"; + sha256 = "0z5wp666293d5nsajqa3c8b03n1s85kr3v5hrkvsqv9lq3s49jnp"; + libraryHaskellDepends = [ + base base64-bytestring bytestring symbols text + ]; testHaskellDepends = [ - base base64-bytestring bytestring doctest doctest-discover - QuickCheck quickcheck-instances text + base base64-bytestring bytestring doctest doctest-discover hspec + QuickCheck quickcheck-instances symbols text ]; description = "Type safe string transformations"; license = stdenv.lib.licenses.bsd3; @@ -253492,6 +254116,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typed-uuid_0_1_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable + , http-api-data, random, text, uuid, validity, validity-uuid + , yamlparse-applicative + }: + mkDerivation { + pname = "typed-uuid"; + version = "0.1.0.0"; + sha256 = "1smwrjn63wsvy7lickdapgfqbvndypvy1qlnfrn5iymi2mg1kyxi"; + libraryHaskellDepends = [ + aeson base binary bytestring deepseq hashable http-api-data random + text uuid validity validity-uuid yamlparse-applicative + ]; + description = "Phantom-Typed version of UUID"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-wire" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, gitrev, HTF, http-types, mtl, optparse-applicative @@ -254515,8 +255157,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.4.0"; - sha256 = "04amv54wrabzdmlig1mxi51ikq1lmfcm504184y0nm0xjahfssmx"; + version = "0.4.1"; + sha256 = "02wwn78fccb37lx95jvr0v2n55kv35nilllb0gj75y8bplya5blb"; libraryHaskellDepends = [ ansi-wl-pprint base containers contravariant deepseq exceptions mtl profunctors template-haskell transformers transformers-compat @@ -254714,8 +255356,8 @@ self: { }: mkDerivation { pname = "unexceptionalio"; - version = "0.5.0"; - sha256 = "04jrmv075cas6qs58m3j0q9h4w14kd4b87bp42k3x3v6hcl62xi9"; + version = "0.5.1"; + sha256 = "07py2nffdgxpz8sryvqcghzb2kiiagpdf5ja1dia4z0rpwi79smh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -254731,6 +255373,8 @@ self: { pname = "unexceptionalio-trans"; version = "0.5.1"; sha256 = "100sfbrpaldz37a176qpfkk1nx5acyh8pchjmb8g5vhzbhyrqniz"; + revision = "1"; + editedCabalFile = "0f15n8hqqczwjrcqxwjp2mrd9iycv53sylv407c95nb6d4hw93ci"; libraryHaskellDepends = [ base transformers unexceptionalio ]; description = "A wrapper around UnexceptionalIO using monad transformers"; license = "unknown"; @@ -255390,8 +256034,8 @@ self: { ({ mkDerivation, base, template-haskell, units }: mkDerivation { pname = "units-defs"; - version = "2.1.0.1"; - sha256 = "1ck50r8mhcvjyfx3wdkn8s89rrzjkxpn439zarg5s2vqmqji7gyy"; + version = "2.2"; + sha256 = "1g55hnhd9bgqp649jgmq41s5i5j0gfpn3iwqaxvmikwaasyr69ki"; libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = stdenv.lib.licenses.bsd3; @@ -255699,8 +256343,8 @@ self: { pname = "unix"; version = "2.7.2.2"; sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; - revision = "3"; - editedCabalFile = "1bbn41bx46b9h8hbri50rw69996h75nfhm9zgyvnr8lzgfhnk4p6"; + revision = "4"; + editedCabalFile = "092d2qzfk4wm7xaa5wjyxgb97knilsh86vhk420j8rd0qlygk4wy"; libraryHaskellDepends = [ base bytestring time ]; description = "POSIX functionality"; license = stdenv.lib.licenses.bsd3; @@ -257249,6 +257893,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "utf8-conversions" = callPackage + ({ mkDerivation, base, bytestring, charsetdetect-ae, hspec, text + , text-short, utf8-string + }: + mkDerivation { + pname = "utf8-conversions"; + version = "0.1.0.4"; + sha256 = "0j5jskj35njz5c9yqs3sc0a8zmmjmnil8996pwr8akghj282b4wz"; + libraryHaskellDepends = [ + base bytestring text text-short utf8-string + ]; + testHaskellDepends = [ + base bytestring charsetdetect-ae hspec text text-short utf8-string + ]; + description = "A string conversion library that assumes utf8"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utf8-env" = callPackage ({ mkDerivation, base, mtl, utf8-string }: mkDerivation { @@ -258227,22 +258889,6 @@ self: { }) {}; "validity-aeson" = callPackage - ({ mkDerivation, aeson, base, validity, validity-scientific - , validity-text, validity-unordered-containers, validity-vector - }: - mkDerivation { - pname = "validity-aeson"; - version = "0.2.0.3"; - sha256 = "0rvhlbnm27yfywavp46iyhvkbwxzcnwl8p82k8xpncy4gc2493b7"; - libraryHaskellDepends = [ - aeson base validity validity-scientific validity-text - validity-unordered-containers validity-vector - ]; - description = "Validity instances for aeson"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-aeson_0_2_0_4" = callPackage ({ mkDerivation, aeson, base, hspec, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: @@ -258257,7 +258903,6 @@ self: { testHaskellDepends = [ aeson base hspec validity ]; description = "Validity instances for aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-bytestring" = callPackage @@ -259263,23 +259908,6 @@ self: { }) {}; "vector-sized" = callPackage - ({ mkDerivation, adjunctions, base, binary, comonad, deepseq - , distributive, finite-typelits, hashable, indexed-list-literals - , primitive, vector - }: - mkDerivation { - pname = "vector-sized"; - version = "1.4.0.0"; - sha256 = "1rh8jjbpw8c6mprwqzd8x7n1kcm5kld3ajrrsahnm91aaw9z1cy6"; - libraryHaskellDepends = [ - adjunctions base binary comonad deepseq distributive - finite-typelits hashable indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-sized_1_4_1_0" = callPackage ({ mkDerivation, adjunctions, base, binary, comonad, deepseq , distributive, finite-typelits, hashable, indexed-list-literals , primitive, vector @@ -259294,7 +259922,6 @@ self: { ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage @@ -259735,6 +260362,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_5_4" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.5.4"; + sha256 = "1n6mayi2qinlv12bf83qskiazwzgl37d4nxvglmwmddb7lpyxbrw"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base megaparsec microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -261593,31 +262238,32 @@ self: { , blaze-builder, blaze-html, bytestring, case-insensitive, cereal , clientsession, cookie, exceptions, hedgehog, hoauth2, http-client , http-client-tls, http-conduit, http-reverse-proxy, http-types - , optparse-simple, regex-posix, safe-exceptions, shakespeare, text - , time, unix-compat, unordered-containers, uri-bytestring, vault - , wai, wai-app-static, wai-extra, warp, yaml + , jose, microlens, mtl, optparse-simple, regex-posix + , safe-exceptions, shakespeare, tasty, tasty-hedgehog, tasty-hunit + , text, time, unix-compat, unordered-containers, uri-bytestring + , vault, wai, wai-app-static, wai-extra, warp, yaml }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.2.1.0"; - sha256 = "16gm0r4jlmzx5qd4s03whqlc8siy139fwrb6q26a053c85n5lw0f"; - revision = "1"; - editedCabalFile = "14aicx9vvp5p77hxmx0zqmqmz4qgv7adr7rsvxy76k0rszz8s8d6"; + version = "0.2.3.0"; + sha256 = "0cah1g4j8vzncp00x0im5clhq198z8k4bq2q4hxcz9n7libz7l3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring binary blaze-builder blaze-html bytestring case-insensitive cereal clientsession cookie exceptions hoauth2 http-client http-client-tls http-conduit http-reverse-proxy - http-types regex-posix safe-exceptions shakespeare text time - unix-compat unordered-containers uri-bytestring vault wai - wai-app-static wai-extra yaml + http-types jose microlens mtl regex-posix safe-exceptions + shakespeare text time unix-compat unordered-containers + uri-bytestring vault wai wai-app-static wai-extra yaml ]; executableHaskellDepends = [ - base bytestring cereal clientsession optparse-simple warp + base bytestring cereal clientsession optparse-simple wai-extra warp ]; testHaskellDepends = [ - base binary bytestring hedgehog hoauth2 text + aeson base binary bytestring clientsession cookie hedgehog hoauth2 + http-types jose microlens mtl tasty tasty-hedgehog tasty-hunit text + time uri-bytestring wai wai-extra warp ]; description = "Authentication middleware that secures WAI application"; license = stdenv.lib.licenses.mit; @@ -262855,6 +263501,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_3_11" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, http-client, http-date, http-types + , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.11"; + sha256 = "09jqdgxpgkch3i9b8mqjp10dljidgmgyg5as72r9c908m75n7a21"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + time-manager unix unix-compat vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute lifted-base + network process QuickCheck simple-sendfile stm streaming-commons + text time time-manager unix unix-compat vault wai word8 x509 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -264214,40 +264894,6 @@ self: { }) {}; "websockets" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary - , bytestring, bytestring-builder, case-insensitive, clock - , containers, criterion, entropy, HUnit, network, QuickCheck - , random, SHA, streaming-commons, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.12.7.0"; - sha256 = "11jz0d7hgbl449dvz789gyf85gdwm6h0klq05vilmplpdx61h4az"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive clock containers entropy - network random SHA streaming-commons text - ]; - testHaskellDepends = [ - async attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive clock containers entropy HUnit - network QuickCheck random SHA streaming-commons test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - async attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive clock containers criterion - entropy network random SHA text - ]; - doCheck = false; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_12_7_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary , bytestring, bytestring-builder, case-insensitive, clock , containers, criterion, entropy, HUnit, network, QuickCheck @@ -264279,7 +264925,6 @@ self: { doCheck = false; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-rpc" = callPackage @@ -264656,8 +265301,6 @@ self: { libraryHaskellDepends = [ base shelly template-haskell text ]; description = "Determine the full path to an executable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "while-lang-parser" = callPackage @@ -265161,18 +265804,20 @@ self: { }) {}; "with-utf8" = callPackage - ({ mkDerivation, base, deepseq, directory, hedgehog, HUnit - , safe-exceptions, tasty, tasty-discover, tasty-hedgehog - , tasty-hunit, temporary, text, unix + ({ mkDerivation, base, deepseq, directory, filepath, hedgehog + , HUnit, process, safe-exceptions, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix }: mkDerivation { pname = "with-utf8"; - version = "1.0.1.0"; - sha256 = "07b3zpdnaqvp7ipbjnq17is5a70l2bncjqxlnhixpq91bbsczlrp"; + version = "1.0.2.0"; + sha256 = "0zb2xrxf1as38iykljm62kdq6in02miw8xvckh86sfn79csggjvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base safe-exceptions text ]; - executableHaskellDepends = [ base directory ]; + executableHaskellDepends = [ + base directory filepath process safe-exceptions th-env + ]; testHaskellDepends = [ base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog tasty-hunit temporary text unix @@ -265233,13 +265878,15 @@ self: { }) {}; "within" = callPackage - ({ mkDerivation, base, exceptions, hashable, path }: + ({ mkDerivation, base, comonad, exceptions, free, hashable, path }: mkDerivation { pname = "within"; - version = "0.0.2.0"; - sha256 = "08ddmh9zfb435q8ljsisszvd5hgjpsnxcv57kzadwcicy2wkj32b"; - libraryHaskellDepends = [ base exceptions hashable path ]; - description = "A path within another path"; + version = "0.1.1.0"; + sha256 = "107gi32zsp7srb2lgmbmrdzry2irgshnznkf81sw3f1n07qhci40"; + libraryHaskellDepends = [ + base comonad exceptions free hashable path + ]; + description = "A value within another path"; license = stdenv.lib.licenses.mit; }) {}; @@ -267992,8 +268639,10 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "2.1.0.0"; - sha256 = "0x33v7nc6swnizdmqmf2gxwr9afyrnra5kyywzp34hbawimd4apr"; + version = "2.2.0.0"; + sha256 = "0zd7irwy8fl9zkpzj85lg9xv4m01cr4dzvlxyz8nh6l1rwvhqang"; + revision = "2"; + editedCabalFile = "0h20v462sfq4cli5b9d574qjhxs1vgzh5yb2spgj6w9pmf7ydf61"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -269811,35 +270460,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.11.3.0"; - sha256 = "01lafh83rp0v49f052vyv4gcbdgzcf42cmg0iqlykk6c586ksvh4"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath libyaml mtl resourcet scientific template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq - resourcet scientific template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific @@ -269866,7 +270486,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -270069,26 +270688,29 @@ self: { }) {}; "yamlparse-applicative" = callPackage - ({ mkDerivation, aeson, base, bytestring, genvalidity-aeson - , genvalidity-hspec, genvalidity-scientific, genvalidity-text - , hspec, optparse-applicative, path, path-io, prettyprinter - , QuickCheck, scientific, text, unordered-containers, validity - , validity-text, vector, yaml + ({ mkDerivation, aeson, base, bytestring, containers + , genvalidity-aeson, genvalidity-containers, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, hspec, optparse-applicative + , path, path-io, prettyprinter, QuickCheck, scientific, text + , unordered-containers, validity, validity-text, vector, yaml }: mkDerivation { pname = "yamlparse-applicative"; - version = "0.0.0.0"; - sha256 = "1n2mm542zl4mji8la5xpyjj6cab3rqihlwm1x4d0xgn7xzmng02g"; + version = "0.1.0.1"; + sha256 = "089s5f3i3yz833g7q2rd55v9hn93cdzprhniymw37qdmhv5jw960"; libraryHaskellDepends = [ - aeson base bytestring optparse-applicative path path-io + aeson base bytestring containers optparse-applicative path path-io prettyprinter scientific text unordered-containers validity validity-text vector yaml ]; testHaskellDepends = [ - aeson base genvalidity-aeson genvalidity-hspec - genvalidity-scientific genvalidity-text hspec QuickCheck scientific - text + aeson base containers genvalidity-aeson genvalidity-containers + genvalidity-hspec genvalidity-scientific genvalidity-text + genvalidity-unordered-containers hspec QuickCheck scientific text + unordered-containers ]; + description = "Declaritive configuration parsing with free docs"; license = stdenv.lib.licenses.mit; }) {}; @@ -270401,8 +271023,8 @@ self: { }: mkDerivation { pname = "yaya"; - version = "0.2.1.2"; - sha256 = "179mq32b5gjlwfpldm4msqnxv316gb2gj3s0kzhkcyk0l3i3y8fi"; + version = "0.3.0.0"; + sha256 = "0jwk4pym5rclgk080lwc3ww1wa42xpzlnf31i8clwg1b9h05c8f2"; libraryHaskellDepends = [ base bifunctors comonad constraints containers distributive either errors free kan-extensions lens profunctors template-haskell @@ -270416,21 +271038,38 @@ self: { ({ mkDerivation, base, deriving-compat, hedgehog, yaya }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.1.2.1"; - sha256 = "18lyhb7fqdbp2p71y5jydcb8xzbahqzy1jmsnsb4hym8v8ax71cv"; + version = "0.2.0.0"; + sha256 = "1pc87r0angyg8mym450hwkswnkf3jv8gmxmyalrxwrf5dwh0029y"; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; }) {}; + "yaya-test" = callPackage + ({ mkDerivation, base, deriving-compat, hedgehog, yaya + , yaya-hedgehog + }: + mkDerivation { + pname = "yaya-test"; + version = "0.3.0.0"; + sha256 = "1jbj9z5bxf1r5c8sdsyrc66rwlf1pgw2xs7iy4bxs5h37l74bqg6"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base deriving-compat hedgehog yaya yaya-hedgehog + ]; + description = "Test suites for `yaya`"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "yaya-unsafe" = callPackage ({ mkDerivation, base, bifunctors, comonad, either, free, lens , yaya }: mkDerivation { pname = "yaya-unsafe"; - version = "0.1.1.2"; - sha256 = "0cvfrzqx5d56nld60p1n5qmwn4j4gbsvy7jf5lk4ar5da4w8a90c"; + version = "0.2.0.0"; + sha256 = "0j4cf7v5pzp4cck2mvs56xpsim7z3z9b8hgpivhp64g529wnzszr"; libraryHaskellDepends = [ base bifunctors comonad either free lens yaya ]; @@ -270438,6 +271077,22 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "yaya-unsafe-test" = callPackage + ({ mkDerivation, base, hedgehog, yaya, yaya-hedgehog, yaya-unsafe + }: + mkDerivation { + pname = "yaya-unsafe-test"; + version = "0.1.1.2"; + sha256 = "0qfhgb3mzm6s04y4rxlba9yz2yr37z5qmqwp1p6hkdbr38z5z9p5"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base hedgehog yaya yaya-hedgehog yaya-unsafe + ]; + description = "Test suites for `yaya-unsafe`"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "ycextra" = callPackage ({ mkDerivation, base, containers, csv, mtl, uniplate, yhccore }: mkDerivation { @@ -274002,8 +274657,8 @@ self: { }: mkDerivation { pname = "zeolite-lang"; - version = "0.4.1.1"; - sha256 = "0vhxlznprjmaf910j99s7yc0mjyk4jw6gdh49106v83xv3b5ak1m"; + version = "0.6.0.0"; + sha256 = "12g5dsyvc47r236yr4lqa9dzkjqcn646xszw92559w9j555a74lf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -274655,12 +275310,15 @@ self: { }) {}; "zipper-extra" = callPackage - ({ mkDerivation, base, comonad, comonad-extras, split }: + ({ mkDerivation, base, comonad, comonad-extras, exceptions, split + }: mkDerivation { pname = "zipper-extra"; - version = "0.1.0.1"; - sha256 = "07bhmqjd743x2zjay0q29jfms8xlhk2awc38x75h0cym3agi1m5d"; - libraryHaskellDepends = [ base comonad comonad-extras split ]; + version = "0.1.1.0"; + sha256 = "1hmbn4vs1k4w24szq8m1qkvsa042d19xvvxiaj4chj39w2wc9gjr"; + libraryHaskellDepends = [ + base comonad comonad-extras exceptions split + ]; description = "Zipper utils that weren't in Control.Comonad.Store.Zipper"; license = stdenv.lib.licenses.mit; }) {}; From a61cf82b6d836797398043a1ccd2fdc0be67f893 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 7 May 2020 19:43:28 +0200 Subject: [PATCH 189/310] hackagePackages.neuron: Fix build --- .../haskell-modules/configuration-common.nix | 4 ++++ .../configuration-hackage2nix.yaml | 4 ---- .../haskell-modules/configuration-nix.nix | 20 +++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 55934862c94c..aed4a2d9403f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1515,4 +1515,8 @@ self: super: { }; }; + # hasn‘t bumped upper bounds + # upstream: https://github.com/obsidiansystems/which/pull/6 + which = doJailbreak super.which; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2cbe100fa40b..a30e4d93e6a5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2733,7 +2733,6 @@ broken-packages: - aeson-diff-generic - aeson-filthy - aeson-flowtyped - - aeson-gadt-th - aeson-injector - aeson-iproute - aeson-native @@ -7801,7 +7800,6 @@ broken-packages: - neural - neural-network-blashs - neural-network-hmatrix - - neuron - newhope - newports - newsletter @@ -8895,7 +8893,6 @@ broken-packages: - rhine - rhine-gloss - rhythm-game-tutorial - - rib - ribbit - RichConditional - ridley @@ -10608,7 +10605,6 @@ broken-packages: - wheb-mongo - wheb-redis - wheb-strapped - - which - while-lang-parser - whim - whiskers diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e05f82bf04d4..6d0c93e85a56 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -730,4 +730,24 @@ self: super: builtins.intersectAttrs super { # Tests access homeless-shelter. hie-bios = dontCheck super.hie-bios; + + # Compiling the readme throws errors and has no purpose in nixpkgs + aeson-gadt-th = + disableCabalFlag (doJailbreak (super.aeson-gadt-th)) "build-readme"; + + neuron = overrideCabal (super.neuron) (drv: { + # neuron expects the neuron-search script to be in PATH at built-time. + buildTools = [ pkgs.makeWrapper ]; + preConfigure = '' + mkdir -p $out/bin + cp src-bash/neuron-search $out/bin/neuron-search + chmod +x $out/bin/neuron-search + wrapProgram $out/bin/neuron-search --prefix 'PATH' ':' ${ + with pkgs; + lib.makeBinPath [ fzf ripgrep gawk bat findutils envsubst ] + } + PATH=$PATH:$out/bin + ''; + }); + } From dcbcd742e06b8b7f2915dfa6f0450eb647bc89d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2020 08:27:24 +0200 Subject: [PATCH 190/310] haskell-dhall: update override for the latest version on ghc-8.10.x --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 9053d2d9e0d2..54e3557736b8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -84,7 +84,7 @@ self: super: { zlib = doJailbreak super.zlib; # Use the latest version to fix the build. - dhall = self.dhall_1_31_1; + dhall = self.dhall_1_32_0; ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; From 4ed93cc494f123643aad5d0c394cee92e4fd73de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 May 2020 11:55:02 +0200 Subject: [PATCH 191/310] haskell-ghc-lib-parser-ex: update overrides for the update 8.10.x version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aed4a2d9403f..6ce71eb4731b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1502,13 +1502,13 @@ self: super: { }); # stackage right now is not new enough for hlint-3.0 - ghc-lib-parser-ex_8_10_0_6 = super.ghc-lib-parser-ex_8_10_0_6.override { + ghc-lib-parser-ex_8_10_0_8 = super.ghc-lib-parser-ex_8_10_0_8.override { ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412; }; hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_6; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_8; extra = self.extra_1_7_1; filepattern = self.filepattern.override { extra = self.extra_1_7_1; From 4353027d0b535b9c22c3c5d0de58718590483a28 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 14 May 2020 15:26:01 +0200 Subject: [PATCH 192/310] haskell/generic-builder.nix: Fix C lib multiple inclusions Allow the darwin links code to overwrite libs that were already copied, because C dependencies can occur multiple times. Solves errors like ln: failed to create symbolic link '/nix/store/higpc9xavwcjjzdipz7m9ly03bh7iy2z-hercules-ci-agent-source-0.7.0/lib/links/libboost_context.dylib': File exists --- pkgs/development/haskell-modules/generic-builder.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 49cbe02b71e5..de5bf631bf0d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -383,7 +383,8 @@ stdenv.mkDerivation ({ for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do for lib in "$d/"*.{dylib,so}; do - ln -s "$lib" "$dynamicLinksDir" + # Allow overwriting because C libs can be pulled in multiple times. + ln -sf "$lib" "$dynamicLinksDir" done done # Edit the local package DB to reference the links directory. From e037eb4046df34520780af723a33bee3ee15032d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2020 20:12:23 +0200 Subject: [PATCH 193/310] ghcjs: mark build as broken ghcjs hasn't compiled for several weeks. --- pkgs/development/compilers/ghcjs-ng/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 7b6fbc460a95..6d56c410aabd 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -102,6 +102,7 @@ in stdenv.mkDerivation { inherit passthru; - meta.platforms = passthru.bootPkgs.ghc.meta.platforms; + meta.broken = true; # build does not succeed + meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; } From a4282b6dc1475cf51ddf296ae398d0f54dc570b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2020 20:55:06 +0200 Subject: [PATCH 194/310] all-cabal-hashes: update to Hackage at 2020-05-15T17:34:35Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index e937f3a0f702..932e400946e4 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a734b1438c8379ed3945412538ff4ec49823564c.tar.gz"; - sha256 = "0y1y818n10fh0qq7cg67p9l293js78fyahk5f6s9w3c21xn9wn8r"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6515ef12bbcf8fbac87e12b4cb30b7eefa9ce9ce.tar.gz"; + sha256 = "0plf0kk0wj1lbmks09afyqrl70z0miwxzfk3zh7y2qiw3g5l1v0x"; } From a91007dbc43774853d3e6dc2f0c48396d8a4b14c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 9 May 2020 06:33:29 +0200 Subject: [PATCH 195/310] ocamlPackages.ipaddr: remove at 2.6.1 This is a legacy version for OCaml 4.02 --- .../ocaml-modules/ipaddr/2.6.1.nix | 32 ------------------- pkgs/top-level/ocaml-packages.nix | 7 +--- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/ipaddr/2.6.1.nix diff --git a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix deleted file mode 100644 index a602393e920e..000000000000 --- a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, buildOcaml, fetchurl, sexplib_p4}: - -buildOcaml rec { - name = "ipaddr"; - version = "2.6.1"; - - src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz"; - sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; - }; - - propagatedBuildInputs = [ sexplib_p4 ]; - - configurePhase = '' - ocaml setup.ml -configure --prefix $out - ''; - - buildPhase = '' - make build - ''; - - installPhase = '' - make install - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/mirage/ocaml-ipaddr"; - description = "A library for manipulation of IP (and MAC) address representations "; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f21f3ca9cbed..80d49ca1f58b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -317,12 +317,7 @@ let io-page = callPackage ../development/ocaml-modules/io-page { }; - ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { }; - - ipaddr = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/ipaddr { } - else ipaddr_p4; + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; From 52d2e991826d94ac8ca5fc424f12848b9b3e5927 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 15 Apr 2020 07:58:04 +0200 Subject: [PATCH 196/310] php74: 7.4.4 -> 7.4.5 Changelog: https://www.php.net/ChangeLog-7.php#7.4.5 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 8ccb0e546410..142e8ea43b8c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -272,8 +272,8 @@ let }); php74base = callPackage generic (_args // { - version = "7.4.4"; - sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; + version = "7.4.5"; + sha256 = "0vrxy5ymfkpi2sxbnh6967nc4xnxcwlc27bivaa36g5nslrsbnir"; }); defaultPhpExtensions = { all, ... }: with all; ([ From c88290789c06e19453375ad85f3cd1d417b07ae9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 9 May 2020 19:11:09 -0400 Subject: [PATCH 197/310] doc: Rewrite python onboarding tutorials in manual Based on some feedback in #87094 and discussion with @fridh, this re-organizes the onboarding tutorial in the Nixpkgs manual's python section, so that we start with the simplest, most ad-hoc examples and work our way up. This progresses from: 1. How to create an temporary python env at the cmdline, then 2. How to create a specific python env for a single script, then 3. How to create a specific python env for a project in a shell.nix, then 4. How to install a specific python env globally on the system or in a user profile. Additionally, I've tried to standardize on some of the "best practice" ways of doing things: 1. Instead of saying that this command style is "supported but strongly not discouraged", I've just deleted it to avoid confusion. Bad: nix-shell -p python38Packages.numpy python38Packages.toolz Good: nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' 2. In the portion where we show how to add stuff to the user's `XDG_CONFIG_HOME`, use overlays instead of `config.nix`. The former can do everything the latter can do, but is also much more generic and powerful, because it can compose with other files, compose with other envs, compose with overlays that do things like swap whether tensorflow and pytorch are built openblas/mkl/cuda stacks, and so on. The user is eventually going to see the overlay, so to avoid confusion let's standardize on it. --- doc/languages-frameworks/python.section.md | 474 +++++++++++++-------- 1 file changed, 295 insertions(+), 179 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 00d5d0ff04cf..35ea480e6b94 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -36,66 +36,288 @@ The Nix and NixOS manuals explain how packages are generally installed. In the case of Python and Nix, it is important to make a distinction between whether the package is considered an application or a library. -Applications on Nix are typically installed into your user -profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the -package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`. -Dependencies such as libraries are automatically installed and should not be -installed explicitly. +Applications on Nix are typically installed into your user profile imperatively +using `nix-env -i`, and on NixOS declaratively by adding the package name to +`environment.systemPackages` in `/etc/nixos/configuration.nix`. Dependencies +such as libraries are automatically installed and should not be installed +explicitly. -The same goes for Python applications and libraries. Python applications can be -installed in your profile. But Python libraries you would like to use for -development cannot be installed, at least not individually, because they won't -be able to find each other resulting in import errors. Instead, it is possible -to create an environment with `python.buildEnv` or `python.withPackages` where -the interpreter and other executables are able to find each other and all of the -modules. +The same goes for Python applications. Python applications can be installed in +your profile, and will be wrapped to find their exact library dependencies, +without impacting other applications or polluting your user environment. -In the following examples we create an environment with Python 3.8, `numpy` and -`toolz`. As you may imagine, there is one limitation here, and that's that -you can install only one environment at a time. You will notice the complaints -about collisions when you try to install a second environment. +But Python libraries you would like to use for development cannot be installed, +at least not individually, because they won't be able to find each other +resulting in import errors. Instead, it is possible to create an environment +with `python.buildEnv` or `python.withPackages` where the interpreter and other +executables are wrapped to be able to find each other and all of the modules. -##### Environment defined in separate `.nix` file +In the following examples we will start by creating a simple, ad-hoc environment +with a nix-shell that has `numpy` and `toolz` in Python 3.8; then we will create +a re-usable environment in a single-file Python script; then we will create a +full Python environment for development with this same environment. + +Philosphically, this should be familiar to users who are used to a `venv` style +of development: individual projects create their own Python environments without +impacting the global environment or each other. + +#### Ad-hoc temporary Python environment with `nix-shell` + +The simplest way to start playing with the way nix wraps and sets up Python +environments is with `nix-shell` at the cmdline. These environments create a +temporary shell session with a Python and a *precise* list of packages (plus +their runtime dependencies), with no other Python packages in the Python +interpreter's scope. + +To create a Python 3.8 session with `numpy` and `toolz` available, run: + +```sh +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' +``` + +By default `nix-shell` will start a `bash` session with this interpreter in our +`PATH`, so if we then run: + +``` +[nix-shell:~/src/nixpkgs]$ python3 +Python 3.8.1 (default, Dec 18 2019, 19:06:26) +[GCC 9.2.0] on linux +Type "help", "copyright", "credits" or "license" for more information. +>>> import numpy; import toolz +``` + +Note that no other modules are in scope, even if they were imperatively +installed into our user environment as a dependency of a Python application: + +``` +>>> import requests +Traceback (most recent call last): + File "", line 1, in +ModuleNotFoundError: No module named 'requests' +``` + +We can add as many additional modules onto the `nix-shell` as we need, and we +will still get 1 wrapped Python interpreter. We can start the interpreter +directly like so: + +```sh +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz requests ])' --run python3 +these derivations will be built: + /nix/store/xbdsrqrsfa1yva5s7pzsra8k08gxlbz1-python3-3.8.1-env.drv +building '/nix/store/xbdsrqrsfa1yva5s7pzsra8k08gxlbz1-python3-3.8.1-env.drv'... +created 277 symlinks in user environment +Python 3.8.1 (default, Dec 18 2019, 19:06:26) +[GCC 9.2.0] on linux +Type "help", "copyright", "credits" or "license" for more information. +>>> import requests +>>> +``` + +Notice that this time it built a new Python environment, which now includes +`requests`. Building an environment just creates wrapper scripts that expose the +selected dependencies to the interpreter while re-using the actual modules. This +means if any other env has installed `requests` or `numpy` in a different +context, we don't need to recompile them -- we just recompile the wrapper script +that sets up an interpreter pointing to them. This matters much more for "big" +modules like `pytorch` or `tensorflow`. + +Module names usually match their names on [pypi.org](https://pypi.org/), but +you can use the [Nixpkgs search website](https://nixos.org/nixos/packages.html) +to find them as well (along with non-python packages). + +At this point we can create throwaway experimental Python environments with +arbitrary dependencies. This is a good way to get a feel for how the Python +interpreter and dependencies work in Nix and NixOS, but to do some actual +development, we'll want to make it a bit more persistent. + +##### Running Python scripts and using `nix-shell` as shebang + +Sometimes, we have a script whose header looks like this: + +```python +#!/usr/bin/env python3 +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") +``` + +Executing this script requires a `python3` that has `numpy`. Using what we learned +in the previous section, we could startup a shell and just run it like so: + +``` +nix-shell -p 'python38.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py' +The dot product of [1 2] and [3 4] is: 11 +``` + +But if we maintain the script ourselves, and if there are more dependencies, it +may be nice to encode those dependencies in source to make the script re-usable +without that bit of knowledge. That can be done by using `nix-shell` as a +[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix), like so: + +```python +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.numpy ])" +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") +``` + +Then we simply execute it, without requiring any environment setup at all! + +```sh +$ ./foo.py +The dot product of [1 2] and [3 4] is: 11 +``` + +If the dependencies are not available on the host where `foo.py` is executed, it +will build or download them from a Nix binary cache prior to starting up, prior +that it is executed on a machine with a multi-user nix installation. + +This provides a way to ship a self bootstrapping Python script, akin to a +statically linked binary, where it can be run on any machine (provided nix is +installed) without having to assume that `numpy` is installed globally on the +system. + +By default it is pulling the import checkout of Nixpkgs itself from our nix +channel, which is nice as it cache aligns with our other package builds, but we +can make it fully reproducible by pinning the `nixpkgs` import: + +```python +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.numpy ])" +#!nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/d373d80b1207d52621961b16aa4a3438e4f98167.tar.gz +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") +``` + +This will execute with the exact same versions of Python 3.8, numpy, and system +dependencies a year from now as it does today, because it will always use +exactly git commit `d373d80b1207d52621961b16aa4a3438e4f98167` of Nixpkgs for all +of the package versions. + +This is also a great way to ensure the script executes identically on different +servers. + +##### Load environment from `.nix` expression + +We've now seen how to create an ad-hoc temporary shell session, and how to +create a single script with Python dependencies, but in the course of normal +development we're usually working in an entire package repository. + +As explained in the Nix manual, `nix-shell` can also load an expression from a +`.nix` file. Say we want to have Python 3.8, `numpy` and `toolz`, like before, +in an environment. We can add a `shell.nix` file describing our dependencies: -Create a file, e.g. `build.nix`, with the following expression ```nix with import {}; - -python38.withPackages (ps: with ps; [ numpy toolz ]) +(python38.withPackages (ps: [ps.numpy ps.toolz])).env ``` -and install it in your profile with -```shell -nix-env -if build.nix -``` -Now you can use the Python interpreter, as well as the extra packages (`numpy`, -`toolz`) that you added to the environment. -##### Environment defined in `~/.config/nixpkgs/config.nix` +And then at the command line, just typing `nix-shell` produces the same +environment as before. In a normal project, we'll likely have many more +dependencies; this can provide a way for developers to share the environments +with each other and with CI builders. -If you prefer you could also add the environment as a package override to the -Nixpkgs set, e.g. using `config.nix`, +What's happening here? + +1. We begin with importing the Nix Packages collections. `import ` + imports the `` function, `{}` calls it and the `with` statement + brings all attributes of `nixpkgs` in the local scope. These attributes form + the main package set. +2. Then we create a Python 3.8 environment with the `withPackages` function, as before. +3. The `withPackages` function expects us to provide a function as an argument + that takes the set of all Python packages and returns a list of packages to + include in the environment. Here, we select the packages `numpy` and `toolz` + from the package set. + +To combine this with `mkShell` you can: ```nix -{ # ... +with import {}; +let + pythonEnv = python38.withPackages (ps: [ + ps.numpy + ps.toolz + ]); +in mkShell { + buildInputs = [ + pythonEnv - packageOverrides = pkgs: with pkgs; { - myEnv = python38.withPackages (ps: with ps; [ numpy toolz ]); + black + mypy + + libffi + openssl + ]; +} +``` + +This will create a unified environment that has not just our Python interpreter +and its Python dependencies, but also tools like `black` or `mypy` and libraries +like `libffi` the `openssl` in scope. This is generic and can span any number of +tools or languages across the Nixpkgs ecosystem. + +##### Installing environments globally on the system + +Up to now, we've been creating environments scoped to an ad-hoc shell session, +or a single script, or a single project. This is generally advisable, as it +avoids pollution across contexts. + +However, sometimes we know we will often want a Python with some basic packages, +and want this available without having to enter into a shell or build context. +This can be useful to have things like vim/emacs editors and plugins or shell +tools "just work" without having to set them up, or when running other software +that expects packages to be installed globally. + +To create your own custom environment, create a file in `~/.config/nixpkgs/overlays/` +that looks like this: + +```nix +# ~/.config/nixpkgs/overlays/myEnv.nix +self: super: { + myEnv = super.buildEnv { + name = "myEnv"; + paths = [ + # A Python 3 interpreter with some packages + (self.python3.withPackages ( + ps: with ps; [ + pyflakes + pytest + python-language-server + ] + )) + + # Some other packages we'd like as part of this env + self.mypy + self.black + self.ripgrep + self.tmux + ]; }; } ``` -and install it in your profile with -```shell -nix-env -iA nixpkgs.myEnv +You can then build and install this to your profile with: + +```sh +nix-env -iA myEnv ``` -The environment is is installed by referring to the attribute, and considering -the `nixpkgs` channel was used. +One limitation of this is that you can only have 1 Python env installed +globally, since they conflict on the `python` to load out of your `PATH`. + +If you get a conflict or prefer to keep the setup clean, you can have `nix-env` +atomically *uninstall* all other imperatively installed packages and replace +your profile with just `myEnv` by using the `--replace` flag. ##### Environment defined in `/etc/nixos/configuration.nix` -For the sake of completeness, here's another example how to install the -environment system-wide. +For the sake of completeness, here's how to install the environment system-wide +on NixOS. ```nix { # ... @@ -106,121 +328,16 @@ environment system-wide. } ``` -#### Temporary Python environment with `nix-shell` - -The examples in the previous section showed how to install a Python environment -into a profile. For development you may need to use multiple environments. -`nix-shell` gives the possibility to temporarily load another environment, akin -to `virtualenv`. - -There are two methods for loading a shell with Python packages. The first and -recommended method is to create an environment with `python.buildEnv` or -`python.withPackages` and load that. E.g. - -```sh -$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' -``` - -opens a shell from which you can launch the interpreter - -```sh -[nix-shell:~] python3 -``` - -The other method, which is not recommended, does not create an environment and -requires you to list the packages directly, - -```sh -$ nix-shell -p python38.pkgs.numpy python38.pkgs.toolz -``` - -Again, it is possible to launch the interpreter from the shell. The Python -interpreter has the attribute `pkgs` which contains all Python libraries for -that specific interpreter. - -##### Load environment from `.nix` expression -As explained in the Nix manual, `nix-shell` can also load an -expression from a `.nix` file. Say we want to have Python 3.8, `numpy` -and `toolz`, like before, in an environment. Consider a `shell.nix` file -with - -```nix -with import {}; - -(python38.withPackages (ps: [ps.numpy ps.toolz])).env -``` - -Executing `nix-shell` gives you again a Nix shell from which you can run Python. - -What's happening here? - -1. We begin with importing the Nix Packages collections. `import ` - imports the `` function, `{}` calls it and the `with` statement - brings all attributes of `nixpkgs` in the local scope. These attributes form - the main package set. -2. Then we create a Python 3.8 environment with the `withPackages` function. -3. The `withPackages` function expects us to provide a function as an argument - that takes the set of all python packages and returns a list of packages to - include in the environment. Here, we select the packages `numpy` and `toolz` - from the package set. - -To combine this with `mkShell` you can: - -```nix -with import {}; - -let - pythonEnv = python38.withPackages (ps: [ - ps.numpy - ps.toolz - ]); -in mkShell { - buildInputs = [ - pythonEnv - hello - ]; -} -``` - -##### Execute command with `--run` -A convenient option with `nix-shell` is the `--run` -option, with which you can execute a command in the `nix-shell`. We can -e.g. directly open a Python shell - -```sh -$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3" -``` - -or run a script - -```sh -$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3 myscript.py" -``` - -##### `nix-shell` as shebang -In fact, for the second use case, there is a more convenient method. You can add -a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script -specifying which dependencies `nix-shell` needs. With the following shebang, you -can just execute `./myscript.py`, and it will make available all dependencies -and run the script in the `python3` shell. - -```py -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])" - -import numpy - -print(numpy.__version__) -``` - ### Developing with Python -Now that you know how to get a working Python environment with Nix, it is time -to go forward and start actually developing with Python. We will first have a -look at how Python packages are packaged on Nix. Then, we will look at how you -can use development mode with your code. +Above, we were mostly just focused on use cases and what to do to get started +creating working Python environments in nix. -#### Packaging a library +Now that you know the basics to be up and running, it is time to take a step +back and take a deeper look at at how Python packages are packaged on Nix. Then, +we will look at how you can use development mode with your code. + +#### Python library packages in Nixpkgs With Nix all packages are built by functions. The main function in Nix for building Python libraries is `buildPythonPackage`. Let's see how we can build the @@ -262,6 +379,7 @@ An expression for `toolz` can be found in the Nixpkgs repository. As explained in the introduction of this Python section, a derivation of `toolz` is available for each interpreter version, e.g. `python38.pkgs.toolz` refers to the `toolz` derivation corresponding to the CPython 3.8 interpreter. + The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, you will want to test a Nix expression outside of the Nixpkgs tree. @@ -312,7 +430,7 @@ Our example, `toolz`, does not have any dependencies on other Python packages or system libraries. According to the manual, `buildPythonPackage` uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is exclusively a build-time dependency, then the dependency should be -included as a `buildInput`, but if it is (also) a runtime dependency, then it +included in `buildInputs`, but if it is (also) a runtime dependency, then it should be added to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies and passed to `checkInputs`. @@ -423,10 +541,11 @@ Note also the line `doCheck = false;`, we explicitly disabled running the test-s #### Develop local package -As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); -instead of installing the package this command creates a special link to the project code. -That way, you can run updated code without having to reinstall after each and every change you make. -Development mode is also available. Let's see how you can use it. +As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) +(`python setup.py develop`); instead of installing the package this command +creates a special link to the project code. That way, you can run updated code +without having to reinstall after each and every change you make. Development +mode is also available. Let's see how you can use it. In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using `src = ./path/to/source/tree;` @@ -455,7 +574,6 @@ buildPythonPackage rec { It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode. - ### Organising your packages So far we discussed how you can use Python on Nix, and how you can develop with @@ -481,11 +599,11 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; meta = with lib; { @@ -497,8 +615,8 @@ buildPythonPackage rec { } ``` -It takes an argument `buildPythonPackage`. -We now call this function using `callPackage` in the definition of our environment +It takes an argument `buildPythonPackage`. We now call this function using +`callPackage` in the definition of our environment ```nix with import {}; @@ -548,7 +666,7 @@ Each interpreter has the following attributes: - `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. - `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. -- `executable`. Name of the interpreter executable, e.g. `python3.7`. +- `executable`. Name of the interpreter executable, e.g. `python3.8`. - `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. ### Building packages and applications @@ -643,7 +761,7 @@ following are specific to `buildPythonPackage`: appears more than once in dependency tree. Default is `true`. * `disabled` ? false: If `true`, package is not built for the particular Python interpreter version. -* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. +* `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs. * `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped programs. * `installFlags ? []`: A list of strings. Arguments to be passed to `pip @@ -730,7 +848,7 @@ Another difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. Because this is irrelevant for applications, the prefix is omitted. -When packaging a python application with `buildPythonApplication`, it should be +When packaging a Python application with `buildPythonApplication`, it should be called with `callPackage` and passed `python` or `pythonPackages` (possibly specifying an interpreter version), like this: @@ -761,7 +879,7 @@ luigi = callPackage ../applications/networking/cluster/luigi { }; ``` Since the package is an application, a consumer doesn't need to care about -python versions or modules, which is why they don't go in `pythonPackages`. +Python versions or modules, which is why they don't go in `pythonPackages`. #### `toPythonApplication` function @@ -875,7 +993,7 @@ thus be also written like this: ```nix with import {}; -(python36.withPackages (ps: [ps.numpy ps.requests])).env +(python38.withPackages (ps: [ps.numpy ps.requests])).env ``` In contrast to `python.buildEnv`, `python.withPackages` does not support the @@ -932,7 +1050,7 @@ pythonPackages.buildPythonPackage { Running `nix-shell` with no arguments should give you the environment in which the package would be built with `nix-build`. -Shortcut to setup environments with C headers/libraries and python packages: +Shortcut to setup environments with C headers/libraries and Python packages: ```shell nix-shell -p pythonPackages.pyramid zlib libjpeg git @@ -963,7 +1081,6 @@ have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. - ### Automatic tests It is recommended to test packages as part of the build process. @@ -976,7 +1093,7 @@ example of such a situation is when `py.test` is used. #### Common issues * Non-working tests can often be deselected. By default `buildPythonPackage` - runs `python setup.py test`. Most python modules follows the standard test + runs `python setup.py test`. Most Python modules follows the standard test protocol where the pytest runner can be used instead. `py.test` supports a `-k` parameter to ignore test methods or classes: @@ -1052,7 +1169,7 @@ let newpkgs = import pkgs.path { overlays = [ (self: super: { python38 = let packageOverrides = python-self: python-super: { - numpy = python-super.numpy_1_18.3; + numpy = python-super.numpy_1_18; }; in super.python38.override {inherit packageOverrides;}; } ) ]; }; @@ -1127,14 +1244,14 @@ If you want to create a Python environment for development, then the recommended method is to use `nix-shell`, either with or without the `python.buildEnv` function. -### How to consume python modules using pip in a virtual environment like I am used to on other Operating Systems? +### How to consume Python modules using pip in a virtual environment like I am used to on other Operating Systems? While this approach is not very idiomatic from Nix perspective, it can still be useful when dealing with pre-existing projects or in situations where it's not feasible or desired to write derivations for all required dependencies. This is an example of a `default.nix` for a `nix-shell`, which allows to consume -a virtual environment created by `venv`, and install python modules through +a virtual environment created by `venv`, and install Python modules through `pip` the traditional way. Create this `default.nix` file, together with a `requirements.txt` and simply @@ -1149,7 +1266,7 @@ in pkgs.mkShell rec { name = "impurePythonEnv"; venvDir = "./.venv"; buildInputs = [ - # A python interpreter including the 'venv' module is required to bootstrap + # A Python interpreter including the 'venv' module is required to bootstrap # the environment. pythonPackages.python @@ -1163,7 +1280,7 @@ in pkgs.mkShell rec { pythonPackages.requests # In this particular example, in order to compile any binary extensions they may - # require, the python modules listed in the hypothetical requirements.txt need + # require, the Python modules listed in the hypothetical requirements.txt need # the following packages to be installed locally: taglib openssl @@ -1183,7 +1300,7 @@ in pkgs.mkShell rec { } ``` -In case the supplied venvShellHook is insufficient, or when python 2 support is +In case the supplied venvShellHook is insufficient, or when Python 2 support is needed, you can define your own shell hook and adapt to your needs like in the following example: @@ -1229,7 +1346,7 @@ in pkgs.mkShell rec { ``` Note that the `pip install` is an imperative action. So every time `nix-shell` -is executed it will attempt to download the python modules listed in +is executed it will attempt to download the Python modules listed in requirements.txt. However these will be cached locally within the `virtualenv` folder and not downloaded again. @@ -1290,9 +1407,8 @@ self: super: { ### How to use Intel's MKL with numpy and scipy? -MKL can be configured using an overlay. See the section “[Using -overlays to configure -alternatives](#sec-overlays-alternatives-blas-lapack)”. +MKL can be configured using an overlay. See the section "[Using overlays to +configure alternatives](#sec-overlays-alternatives-blas-lapack)". ### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? From 46b3eca5fd3f1fbfa00a344d59e992da228edf1e Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 15 May 2020 04:36:26 -0400 Subject: [PATCH 198/310] solc: 0.5.15 -> 0.6.8 --- pkgs/development/compilers/solc/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index a1cf5b2debd5..ac4bc324868a 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, boost, cmake, ncurses, python2 +{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null , cln ? null, gmp ? null }: @@ -16,12 +16,12 @@ in stdenv.mkDerivation rec { pname = "solc"; - version = "0.5.15"; + version = "0.6.8"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y"; + sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0"; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ] ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python2 ]; + checkInputs = [ ncurses python3 ]; # Test fails on darwin for unclear reason doCheck = stdenv.hostPlatform.isLinux; @@ -56,13 +56,7 @@ stdenv.mkDerivation rec { pushd .. # IPC tests need aleth avaliable, so we disable it sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh - for i in ./scripts/*.sh; do - patchShebangs "$i" - done - for i in ./scripts/*.py; do - patchShebangs "$i" - done - for i in ./test/*.sh; do + for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do patchShebangs "$i" done TERM=xterm ./scripts/tests.sh From 5195aed6171249a830c95401a88687bac4eb7193 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 6 Mar 2020 12:01:39 +1000 Subject: [PATCH 199/310] rkt: remove --- nixos/doc/manual/release-notes/rl-2009.xml | 5 ++ nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/virtualisation/rkt.nix | 64 --------------- .../virtualization/rkt/default.nix | 78 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 7 files changed, 7 insertions(+), 145 deletions(-) delete mode 100644 nixos/modules/virtualisation/rkt.nix delete mode 100644 pkgs/applications/virtualization/rkt/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 341b304cb9e2..1d24553b08db 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -381,6 +381,11 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; will have changed. + + + The rkt module has been removed, it was archived by upstream. + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5adbc26522cf..89677970dd9a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1002,7 +1002,6 @@ ./virtualisation/podman.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix - ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a946268494ed..7776c648af8a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -48,6 +48,7 @@ with lib; systemd-logind API). Instead of using the module you can now simply add the brightnessctl package to environment.systemPackages. '') + (mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream") (mkRemovedOptionModule ["services" "prey" ] '' prey-bash-client is deprecated upstream diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix deleted file mode 100644 index fd662b52df52..000000000000 --- a/nixos/modules/virtualisation/rkt.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.virtualisation.rkt; -in -{ - options.virtualisation.rkt = { - enable = mkEnableOption "rkt metadata service"; - - gc = { - automatic = mkOption { - default = true; - type = types.bool; - description = "Automatically run the garbage collector at a specific time."; - }; - - dates = mkOption { - default = "03:15"; - type = types.str; - description = '' - Specification (in the format described by - systemd.time - 7) of the time at - which the garbage collector will run. - ''; - }; - - options = mkOption { - default = "--grace-period=24h"; - type = types.str; - description = '' - Options given to rkt gc when the - garbage collector is run automatically. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.rkt ]; - - systemd.services.rkt = { - description = "rkt metadata service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${pkgs.rkt}/bin/rkt metadata-service"; - }; - }; - - systemd.services.rkt-gc = { - description = "rkt garbage collection"; - startAt = optionalString cfg.gc.automatic cfg.gc.dates; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}"; - }; - }; - - users.groups.rkt = {}; - }; -} diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix deleted file mode 100644 index f3b68e5c2276..000000000000 --- a/pkgs/applications/virtualization/rkt/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools, - cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }: - -let - # Always get the information from - # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1478.0.0"; - coreosImageSystemdVersion = "233"; - - # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. - stage1Flavours = [ "coreos" "fly" ]; - stage1Dir = "lib/rkt/stage1-images"; - -in stdenv.mkDerivation rec { - version = "1.30.0"; - pname = "rkt"; - BUILDDIR="build-${pname}-${version}"; - - src = fetchFromGitHub { - owner = "coreos"; - repo = "rkt"; - rev = "v${version}"; - sha256 = "0dqf83b7iin1np8k8k1m8i99ybga8vx932q7n2q64yghkw7p6i00"; - }; - - stage1BaseImage = fetchurl { - url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq"; - }; - - buildInputs = [ - glibc.out glibc.static - autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd - makeWrapper - ]; - - preConfigure = '' - ./autogen.sh - configureFlagsArray=( - --with-stage1-flavors=${builtins.concatStringsSep "," stage1Flavours} - ${if lib.findFirst (p: p == "coreos") null stage1Flavours != null then " - --with-coreos-local-pxe-image-path=${stage1BaseImage} - --with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion} - " else "" } - --with-stage1-default-location=$out/${stage1Dir}/stage1-${builtins.elemAt stage1Flavours 0}.aci - ); - ''; - - preBuild = '' - export BUILDDIR - export GOCACHE="$TMPDIR/go-cache" - ''; - - installPhase = '' - mkdir -p $out/bin - cp -Rv $BUILDDIR/target/bin/rkt $out/bin - - mkdir -p $out/lib/rkt/stage1-images/ - cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ - - wrapProgram $out/bin/rkt \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \ - --prefix PATH : ${iptables}/bin - ''; - - meta = with lib; { - description = "A fast, composable, and secure App Container runtime for Linux"; - homepage = "https://github.com/coreos/rkt"; - license = licenses.asl20; - maintainers = with maintainers; [ ragge steveej ]; - platforms = [ "x86_64-linux" ]; - knownVulnerabilities = [ - "CVE-2019-10144: processes run with `rkt enter` are given all capabilities during stage 2" - "CVE-2019-10145: processes run with `rkt enter` do not have seccomp filtering during stage 2" - "CVE-2019-10147: processes run with `rkt enter` are not limited by cgroups during stage 2" - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5767878dc659..7bba5fb630b6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -453,6 +453,7 @@ mapAliases ({ recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e87f34a02842..44e4bf599797 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21691,8 +21691,6 @@ in ripser = callPackage ../applications/science/math/ripser { }; - rkt = callPackage ../applications/virtualization/rkt { }; - rkdeveloptool = callPackage ../misc/rkdeveloptool { }; rofi-unwrapped = callPackage ../applications/misc/rofi { }; From d18d18a45d175e97380ed5f64c9b01e27ca6b2a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 May 2020 20:23:09 -0400 Subject: [PATCH 200/310] linux/hardened/patches/4.19: 4.19.122.a -> 4.19.123.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 76d27e295081..80010cc61d43 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.180.a/linux-hardened-4.14.180.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.122.a.patch", - "sha256": "0jh5wyrwrmm9rqqi8fn6d6bd8lzkhj1aylnphsajyyx5v28hn1b2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.122.a/linux-hardened-4.19.122.a.patch" + "name": "linux-hardened-4.19.123.a.patch", + "sha256": "12z4f0nph23110dpk0c8av9bjr8q9qhmyzzj2chrscfwybmld76h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.123.a/linux-hardened-4.19.123.a.patch" }, "5.4": { "name": "linux-hardened-5.4.40.a.patch", From 6fd700adf1ca2c5904773feb9a682c340232ce08 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 May 2020 20:23:15 -0400 Subject: [PATCH 201/310] linux/hardened/patches/5.4: 5.4.40.a -> 5.4.41.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 80010cc61d43..9c56f633664a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.123.a/linux-hardened-4.19.123.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.40.a.patch", - "sha256": "1w9yc0j8vshjyvb2qgxjvrdgwiy5lmjn3s1rmlch649vqp97j9w7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.40.a/linux-hardened-5.4.40.a.patch" + "name": "linux-hardened-5.4.41.a.patch", + "sha256": "0rbp0radqcs2bqapp9k0hvafxn3wlzkc50wnw1145w76mkvpc91y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.41.a/linux-hardened-5.4.41.a.patch" }, "5.5": { "name": "linux-hardened-5.5.19.a.patch", From 2c74af6d977125add18c64c1826a8e0f2bd033a8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 May 2020 20:23:17 -0400 Subject: [PATCH 202/310] linux/hardened/patches/5.6: 5.6.12.a -> 5.6.13.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9c56f633664a..19517fd9ea30 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.12.a.patch", - "sha256": "1b6cwffb2b21h9xh2acm9q9j55cay87zbv9jjayv69znry4mzsx3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.12.a/linux-hardened-5.6.12.a.patch" + "name": "linux-hardened-5.6.13.a.patch", + "sha256": "1z1f15h0wpajkiaqagnx8r25vmabkpc69rzn2h0p3k6z72l6iri5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.13.a/linux-hardened-5.6.13.a.patch" } } From 469f14ceecf94dd13527c9153c25984d674768a7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 10:21:58 +1000 Subject: [PATCH 203/310] go_1_13: stop setting GOPATH a1e13f6140a568b73c1c36bb9ef79d7876ccaae3 --- pkgs/development/compilers/go/1.13.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 8fee93cc4abe..57be5672bf64 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -229,8 +229,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - setupHook = ./setup-hook.sh; - disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { From d1e7b0049ca5bfb48a3fd597278acdc5b97b700f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 10:23:00 +1000 Subject: [PATCH 204/310] go_1_13: 1.13.8 -> 1.13.11 --- pkgs/development/compilers/go/1.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 57be5672bf64..b524d3d6b093 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.8"; + version = "1.13.11"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; + sha256 = "0y86q2k00lh8c7wj3lha43g804iwr61nap8j3i907l2sway1mvc9"; }; # perl is used for testing go vet From b39717abffae28c363ba5440fa38fd59fd601c1e Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 16 May 2020 04:34:01 +0200 Subject: [PATCH 205/310] wasmtime: 0.15.0 -> 0.16.0 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 67d54af7bb2a..00b0fc6f9d85 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1df99iak0psydlg9m8f8qq4zyh4wbi5l4qgsdjr2lm74ci3483xy"; + sha256 = "1zlljqkkcw8h94ff1w47sqn9pn0zal06s06i8nciv5i2d1xaqg5n"; fetchSubmodules = true; }; - cargoSha256 = "170bz48jrc1k2ylfmd3bcry0xpcxx8p3rzzv9mprlfmrfpb0b28r"; + cargoSha256 = "1hb7l7a76lgbji0qm9qd80m35cp346hyi4rphfk6p80v142cw8hh"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ From d89ae377d4b57415b1b00f2aa8e5a1655a1724b9 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 16 May 2020 04:56:26 +0200 Subject: [PATCH 206/310] wasmtime-0.16.0: re-enable tests on Darwin The issue https://github.com/bytecodealliance/wasmtime/issues/1556 appears to be fixed. --- pkgs/development/interpreters/wasmtime/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 00b0fc6f9d85..dd6e3eb4a7f4 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -19,9 +19,7 @@ rustPlatform.buildRustPackage rec { lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - # no test on darwin due to - # https://github.com/bytecodealliance/wasmtime/issues/1556 - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; From adb9f60c13ecdf857216b25801fe8ee051ee1eff Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 13:12:50 +1000 Subject: [PATCH 207/310] doctl: 1.40.0 -> 1.43.0, switch to buildGoModule https://github.com/digitalocean/doctl/releases/tag/v1.41.0 https://github.com/digitalocean/doctl/releases/tag/v1.42.0 https://github.com/digitalocean/doctl/releases/tag/v1.43.0 --- pkgs/development/tools/doctl/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index f9c555555364..9bbeb3c24a3e 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "doctl"; - version = "1.40.0"; + version = "1.43.0"; - goPackagePath = "github.com/digitalocean/doctl"; + vendorSha256 = null; subPackages = [ "cmd/doctl" ]; - buildFlagsArray = '' + buildFlagsArray = let t = "github.com/digitalocean/doctl"; in '' -ldflags= - -X ${goPackagePath}.Major=${lib.versions.major version} - -X ${goPackagePath}.Minor=${lib.versions.minor version} - -X ${goPackagePath}.Patch=${lib.versions.patch version} - -X ${goPackagePath}.Label=release + -X ${t}.Major=${lib.versions.major version} + -X ${t}.Minor=${lib.versions.minor version} + -X ${t}.Patch=${lib.versions.patch version} + -X ${t}.Label=release ''; nativeBuildInputs = [ installShellFiles ]; From f0fbd9deec95a6f71a31f4516374c006a16d18ad Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 13:37:01 +1000 Subject: [PATCH 208/310] umoci: install manpages, switch to buildGoModule --- .../virtualization/umoci/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index f07bb0fc164e..d8a1f36dd5d3 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -1,6 +1,11 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib +, fetchFromGitHub +, buildGoModule +, go-md2man +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "umoci"; version = "0.4.5"; @@ -11,10 +16,18 @@ buildGoPackage rec { sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3"; }; - goPackagePath = "github.com/openSUSE/umoci"; + vendorSha256 = null; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postInstall = '' + sed -i '/SHELL =/d' Makefile + make local-doc + installManPage doc/man/*.[1-9] + ''; + meta = with lib; { description = "umoci modifies Open Container images"; homepage = "https://umo.ci"; From 89b6d5f175e276acdacfdaee2b0bb2e141076ab9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 14:03:51 +1000 Subject: [PATCH 209/310] .github/CODEOWNERS: add podman team --- .github/CODEOWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 211779a470e3..93688a326fed 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -187,3 +187,9 @@ /pkgs/build-support/build-pecl.nix @etu /pkgs/development/interpreters/php @etu /pkgs/top-level/php-packages.nix @etu + +# Podman, CRI-O modules and related +/nixos/modules/virtualisation/containers.nix @NixOS/podman +/nixos/modules/virtualisation/cri-o.nix @NixOS/podman +/nixos/modules/virtualisation/podman.nix @NixOS/podman +/nixos/tests/podman.nix @NixOS/podman From 2434754d1c0ab7876f0495c6d422c7639fd637e0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 09:00:30 +0200 Subject: [PATCH 210/310] simple-scan: format with nixpkgs-fmt --- .../gnome-3/core/simple-scan/default.nix | 56 +++++++++++++++---- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index d38339425ce7..b96b0f4a2052 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,6 +1,26 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3, gobject-introspection }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, itstool +, python3 +, wrapGAppsHook +, cairo +, gdk-pixbuf +, colord +, glib +, gtk3 +, gusb +, packagekit +, libwebp +, libxml2 +, sane-backends +, vala +, gnome3 +, gobject-introspection +}: stdenv.mkDerivation rec { pname = "simple-scan"; @@ -11,14 +31,30 @@ stdenv.mkDerivation rec { sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; }; - buildInputs = [ - cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb - gtk3 libwebp packagekit sane-backends vala - ]; nativeBuildInputs = [ - meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 - # For setup hook - gobject-introspection + meson + ninja + gettext + itstool + pkgconfig + python3 + wrapGAppsHook + libxml2 + gobject-introspection # For setup hook + ]; + + buildInputs = [ + cairo + gdk-pixbuf + colord + glib + gnome3.adwaita-icon-theme + gusb + gtk3 + libwebp + packagekit + sane-backends + vala ]; postPatch = '' From 15b3d9d2773b6ff919b324d756e23f0f8bf9fc3f Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 16 May 2020 00:34:11 -0700 Subject: [PATCH 211/310] python3Packages.venvShellHook: add postVenvCreation (#87850) * python3Packages.venvShellHook: add postVenvCreation * python: docs: add postVenvCreation explaination --- doc/languages-frameworks/python.section.md | 12 ++++++++++-- .../interpreters/python/hooks/venv-shell-hook.sh | 6 ++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 35ea480e6b94..838426afa04f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1023,7 +1023,8 @@ are used in `buildPythonPackage`. - `setuptoolsBuildHook` to build a wheel using `setuptools`. - `setuptoolsCheckHook` to run tests with `python setup.py test`. - `venvShellHook` to source a Python 3 `venv` at the `venvDir` location. A - `venv` is created if it does not yet exist. + `venv` is created if it does not yet exist. `postVenvCreation` can be used to + to run commands only after venv is first created. - `wheelUnpackHook` to move a wheel to the correct folder so it can be installed with the `pipInstallHook`. @@ -1291,10 +1292,17 @@ in pkgs.mkShell rec { zlib ]; + # Run this command, only after creating the virtual environment + postVenvCreation = '' + unset SOURCE_DATE_EPOCH + pip install -r requirements.txt + ''; + # Now we can execute any commands within the virtual environment. # This is optional and can be left out to run pip manually. postShellHook = '' - pip install -r requirements.txt + # allow pip to install wheels + unset SOURCE_DATE_EPOCH ''; } diff --git a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh index 3185b1f9fae9..1fcc0bbd4b13 100644 --- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh +++ b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh @@ -4,12 +4,14 @@ venvShellHook() { if [ -d "${venvDir}" ]; then echo "Skipping venv creation, '${venvDir}' already exists" + source "${venvDir}/bin/activate" else echo "Creating new venv environment in path: '${venvDir}'" @pythonInterpreter@ -m venv "${venvDir}" - fi - source "${venvDir}/bin/activate" + source "${venvDir}/bin/activate" + runHook postVenvCreation + fi runHook postShellHook echo "Finished executing venvShellHook" From 21351cfccf5e6ab0b67c2353d5683e7c3602a3d9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 May 2020 21:31:48 +0100 Subject: [PATCH 212/310] emacsPackages.ocaml-mode: Remove broken package --- .../editors/emacs-modes/manual-packages.nix | 2 -- .../editors/emacs-modes/ocaml/default.nix | 32 ------------------- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/ocaml/default.nix diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 2f0112fd9228..d2e17f1ed967 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -136,7 +136,6 @@ emacsSessionManagement = callPackage ./session-management-for-emacs { }; hsc3-mode = callPackage ./hsc3 { }; ido-ubiquitous = callPackage ./ido-ubiquitous { }; - ocaml-mode = callPackage ./ocaml { }; prolog-mode = callPackage ./prolog { }; rectMark = callPackage ./rect-mark { }; sunriseCommander = callPackage ./sunrise-commander { }; @@ -146,7 +145,6 @@ # # Ideally this should be dropped some time during/after 20.03 bbdb3 = self.melpaStablePackages.bbdb; - ocamlMode = self.ocaml-mode; jade = self.jade-mode; # scalaMode2 = null; # No clear mapping as of now flymakeCursor = self.melpaStablePackages.flymake-cursor; diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix deleted file mode 100644 index 4240263dd0b8..000000000000 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, emacs, ocaml }: - -# this package installs the emacs-mode which -# resides in the ocaml compiler sources. - -let version = stdenv.lib.removePrefix "ocaml-" ocaml.name; -in stdenv.mkDerivation { - pname = "ocaml-mode"; - inherit version; - inherit (ocaml) prefixKey src; - - # a quick configure to get the Makefile generated. Since - # we do not build the ocaml itself, we don't really - # need it to support any features. - configureFlags = (with stdenv.lib; optional (!(versionAtLeast version "4.02")) "-no-tk") ++ - [ "-no-curses" "-no-pthread" ]; - - buildInputs = [ emacs ]; - dontBuild = true; - - installPhase = '' - cd emacs; - mkdir -p "$out/share/emacs/site-lisp" "$out/bin" - EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags - ''; - - meta = { - homepage = "http://caml.inria.fr"; - description = "OCaml mode package for Emacs"; - platforms = stdenv.lib.platforms.unix; - }; -} From 2cbfe21649a10cc838b91b749b88aa59aff4fcc6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 May 2020 21:34:35 +0100 Subject: [PATCH 213/310] emacsPackages.haskell-unicode-input-method: Fix build --- pkgs/applications/editors/emacs-modes/manual-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index d2e17f1ed967..dfe287a7f402 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -98,7 +98,7 @@ sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; }; recipe = pkgs.writeText "recipe" '' - (haskell-unicode-input-method + (emacs-haskell-unicode-input-method :repo "roelvandijk/emacs-haskell-unicode-input-method" :fetcher github) ''; From df70dcb6fb506bfca51f509700b2e7378f8eadcb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 9 May 2020 08:28:14 +0200 Subject: [PATCH 214/310] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F11.ocaml:?= =?UTF-8?q?=20init=20at=204.11.0+=CE=B11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.11.nix | 6 ++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/4.11.nix diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix new file mode 100644 index 000000000000..db77d989c1df --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "11"; + patch_version = "0+alpha1"; + sha256 = "02sbwm00h2zxzyq5q90lg2a6m93zr797azshkb2qcwcf1kr7ddqg"; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 80d49ca1f58b..033e9239d3b4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1231,6 +1231,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_10 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.10.nix { }); + ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { }); + ocamlPackages_latest = ocamlPackages_4_10; ocamlPackages = ocamlPackages_4_09; From e534efaae8061c0f3ba0b989d6b83c8b6bd77c10 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 May 2020 04:20:00 -0500 Subject: [PATCH 215/310] protobuf3_12: init at 3.12.0 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.0 --- pkgs/development/libraries/protobuf/3.12.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/3.12.nix diff --git a/pkgs/development/libraries/protobuf/3.12.nix b/pkgs/development/libraries/protobuf/3.12.nix new file mode 100644 index 000000000000..00d9ec7f96fc --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.12.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.12.0"; + sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51dec492b21e..7e32522158ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14075,6 +14075,7 @@ in protobuf = protobuf3_8; + protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { }; From 6f71eaeb8c3080bd55080b83e114dc116105a346 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 May 2020 04:20:00 -0500 Subject: [PATCH 216/310] tflint: 0.15.5 -> 0.16.0 Changelog: https://github.com/terraform-linters/tflint/releases/tag/v0.16.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index bcd4f7daec8a..2873c49447d7 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.15.5"; + version = "0.16.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi"; + sha256 = "1yqssc5rzxzrlzms3mn9djcvjcx6m7xblpwdl05pmym617v3xaxc"; }; - vendorSha256 = "0kjz9v7r7g4cg11w77ijfmvwnbbkrvrfwwsfsmyxrlhznmb3v0wi"; + vendorSha256 = "016k067sqqncgddam63p3jvp9g1ayjsc8v0w8hfzxc7jvn4jf9fb"; subPackages = [ "." ]; From a52a066524e518c8706a780f1289f9cbc8a864d9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 May 2020 04:20:00 -0500 Subject: [PATCH 217/310] pueue: 0.4.0 -> 0.5.0 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 52a47954776c..3882debd9980 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "050cx9ncs1hfb14llly0wm3h5s4377s3sinmkjc52xm2z2gc7m5f"; + sha256 = "17v760mh5k5vb1h3xvaph5rfc5wdl6q42isil2k9n6y8bxr3yw84"; }; - cargoSha256 = "1hw0y6c1ypp470cca3yw6fc7xvligy3av8hsa9bhdm5can46hyzi"; + cargoSha256 = "1m659i3v3b5hfn5vb5126izcy690bkmlyihz2w90h2d02ig7170p"; nativeBuildInputs = [ installShellFiles ]; From b022ecbf5dbe02089dddb4dafa9e46a518026d02 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 May 2020 04:20:00 -0500 Subject: [PATCH 218/310] lean: 3.10.0 -> 3.13.1 --- pkgs/applications/science/logic/lean/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index c80c163562be..ed077b039087 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, gmp }: +{ stdenv, fetchFromGitHub, cmake, gmp, coreutils }: stdenv.mkDerivation rec { pname = "lean"; - version = "3.10.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0nmh09x3scfqg0bg1qf8b7z67s11hbfd7kr1h6k1zw94fyn2mg8q"; + sha256 = "1ak5l40h5yjlbzz92l724l6bm5q341cg6k1yk13sbwn42l8szsar"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { cd src ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/bin/leanpkg \ + --replace "greadlink" "${coreutils}/bin/readlink" + ''; + meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; From d028c74c3c07a9108379d123644b6b8ef5847075 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 16 May 2020 09:22:24 +0000 Subject: [PATCH 219/310] androidndkPkgs: expose libc in cc.lib (#87737) Fixes cross compiling gdb that uses targetPackages.stdenv.cc.cc.lib. --- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index f8be40eecab5..04420370ff1c 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -82,7 +82,10 @@ rec { }; clang = wrapCCWith { - cc = binaries; + cc = binaries // { + # for packages expecting libcompiler-rt, etc. to come from here (stdenv.cc.cc.lib) + lib = targetAndroidndkPkgs.libraries; + }; bintools = binutils; libc = targetAndroidndkPkgs.libraries; extraBuildCommands = '' From 554d5228f0d79c41f5bbbe16c7dfc2b612330713 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 09:01:49 +0200 Subject: [PATCH 220/310] =?UTF-8?q?simple-scan:=203.36.2=20=E2=86=92=203.3?= =?UTF-8?q?6.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/simple-scan/3.36/simple-scan-3.36.2.1.news --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index b96b0f4a2052..1fefa7dd393d 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.2"; + version = "3.36.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; + sha256 = "u4zldQzQQF4U5KyLCfSlh8L6OkGGFK1CWmaUyYG7ASs="; }; nativeBuildInputs = [ From dc610562e00ab70430bad1859757790797e0ea2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 11:35:53 +0200 Subject: [PATCH 221/310] =?UTF-8?q?gnome3.gnome-logs:=203.34.0=20=E2=86=92?= =?UTF-8?q?=203.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gnome-logs/3.36/gnome-logs-3.36.0.news --- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 7eda4a706cab..3c35f6fce373 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m"; + sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA="; }; mesonFlags = [ From 4007543e660a0d3de1dcaf470da1047e066f910f Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 16 May 2020 12:01:27 +0200 Subject: [PATCH 222/310] nomacs: 3.12 -> 3.14.2 --- pkgs/applications/graphics/nomacs/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index f0d9329bc5a9..a6bda01ebb64 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,25 +18,15 @@ mkDerivation rec { pname = "nomacs"; - version = "3.12"; + version = "3.14.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i"; + sha256 = "1vms13kyg7cpqi2hxvrrhlnl7cq92ijr7dm1kl5ryglpcagqv811"; }; - patches = [ - ./nomacs-iostream.patch - (fetchpatch { - name = "darwin-less-restrictive-opencv.patch"; - url = "https://github.com/nomacs/nomacs/commit/d182fce4bcd9a25bd15e3de065ca67849a32458c.patch"; - sha256 = "0j6sviwrjn69nqf59hjn30c4j838h8az7rnlwcx8ymlb21vd9x2h"; - stripLen = 1; - }) - ]; - enableParallelBuilding = true; setSourceRoot = '' From 3871cee01c75510dce7152f7c1e55de80471e63f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 20:10:39 +1000 Subject: [PATCH 223/310] direnv: switch to buildGoModule (#87932) --- pkgs/tools/misc/direnv/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e261b95fde5a..1b6b87984c6f 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash }: +{ stdenv, fetchFromGitHub, buildGoModule, bash }: -buildGoPackage rec { +buildGoModule rec { pname = "direnv"; version = "2.21.3"; - goPackagePath = "github.com/direnv/direnv"; + + vendorSha256 = null; src = fetchFromGitHub { owner = "direnv"; @@ -12,17 +13,12 @@ buildGoPackage rec { sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; }; - postConfigure = '' - cd $NIX_BUILD_TOP/go/src/$goPackagePath - ''; - # we have no bash at the moment for windows makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [ "BASH_PATH=${bash}/bin/bash" ]; installPhase = '' - mkdir -p $out make install DESTDIR=$out mkdir -p $out/share/fish/vendor_conf.d echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish From 692d924a7835da57e1602d7b8acec58ee78cb35b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:02:23 +0100 Subject: [PATCH 224/310] emacsPackages.rtags-xref: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 681ade367e5d..81039a5ff994 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -308,6 +308,8 @@ instantenous and formats commits for you. rtags = dontConfigure (externalSrc super.rtags external.rtags); + rtags-xref = dontConfigure super.rtags; + shm = super.shm.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; }); From b17e80a4f1510de7af86a8cd8e959e61425aa78f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:07:57 +0100 Subject: [PATCH 225/310] emacsPackages.treemacs-magit: Fix build --- .../editors/emacs-modes/melpa-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 81039a5ff994..560e69d1ce1e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -330,6 +330,12 @@ instantenous and formats commits for you. ''; }); + treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; @@ -540,12 +546,6 @@ instantenous and formats commits for you. inherit (self.melpaPackages) powerline; }; - treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - vterm = super.vterm.overrideAttrs(old: { buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; cmakeFlags = [ From ae2a2be11d648e5ac6aaf91b37e31f0d0e2a41e8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:11:46 +0100 Subject: [PATCH 226/310] emacsPackages.dune: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 560e69d1ce1e..45348e954c82 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -85,6 +85,8 @@ instantenous and formats commits for you. inherit (self.melpaPackages) easy-kill; }; + dune = dontConfigure super.dune; + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; From a779efcaa068ae3d4f76f95299afdbb6c1c40dda Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 13:23:23 +0200 Subject: [PATCH 227/310] php74: 7.4.5 -> 7.4.6 Changelog: https://www.php.net/ChangeLog-7.php#7.4.6 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 142e8ea43b8c..4b112de1f0e7 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -272,8 +272,8 @@ let }); php74base = callPackage generic (_args // { - version = "7.4.5"; - sha256 = "0vrxy5ymfkpi2sxbnh6967nc4xnxcwlc27bivaa36g5nslrsbnir"; + version = "7.4.6"; + sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6"; }); defaultPhpExtensions = { all, ... }: with all; ([ From f99e02946b4c2c61d8d1fcbaddb2d2f11927536a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 13:30:39 +0200 Subject: [PATCH 228/310] gnome3.gnome-logs: format with nixpkgs-fmt --- .../gnome-3/apps/gnome-logs/default.nix | 50 +++++++++++++++---- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 3c35f6fce373..acd4386d2e73 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,5 +1,22 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, glib +, gtk3 +, wrapGAppsHook +, gettext +, itstool +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_43 +, systemd +, python3 +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-logs"; @@ -10,17 +27,32 @@ stdenv.mkDerivation rec { sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA="; }; + nativeBuildInputs = [ + python3 + meson + ninja + pkgconfig + wrapGAppsHook + gettext + itstool + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + gtk3 + systemd + gsettings-desktop-schemas + gnome3.adwaita-icon-theme + ]; + mesonFlags = [ "-Dman=true" ]; - nativeBuildInputs = [ - python3 - meson ninja pkgconfig wrapGAppsHook gettext itstool - libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - ]; - buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py From f1bd1b9fdd074a32b1a83d70acb4992b32cb686c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:17:59 +0100 Subject: [PATCH 229/310] emacsPackages.forge: Fix build --- .../editors/emacs-modes/melpa-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 45348e954c82..ed1550de768a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -128,6 +128,12 @@ instantenous and formats commits for you. inherit (self.melpaPackages) ess ctable popup; }; + forge = super.forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + flycheck-rtags = fix-rtags super.flycheck-rtags; gnuplot = super.gnuplot.overrideAttrs (old: { @@ -449,12 +455,6 @@ instantenous and formats commits for you. (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - forge = super.forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - gerrit = super.gerrit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; From 9da932fc0d1dd7b9b513fdcb47d2a67967b69687 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 13:33:49 +0200 Subject: [PATCH 230/310] =?UTF-8?q?gnome3.gnome-clocks:=203.36.0=20?= =?UTF-8?q?=E2=86=92=203.36.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/commit/48f29ab8230bfcd15ea5dfb682192d8e1c33cd39 --- .../gnome-3/apps/gnome-clocks/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 7494d66cc0d9..b64094002bb8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -27,22 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc"; + sha256 = "8RsbIuwfKF5QmINoTAsfSlFJauoQVZEjnlsm+JhnUeY="; }; - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; - }; - }; - - doCheck = true; - nativeBuildInputs = [ vala meson @@ -55,6 +46,7 @@ stdenv.mkDerivation rec { libxml2 gobject-introspection # for finding vapi files ]; + buildInputs = [ gtk3 glib @@ -76,6 +68,15 @@ stdenv.mkDerivation rec { ) ''; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-clocks"; + attrPath = "gnome3.gnome-clocks"; + }; + }; + meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; From d42a58ffaa0cf5a56792bfbb7abb51accc4d0288 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 14:43:23 +0200 Subject: [PATCH 231/310] php.packages.composer: 1.10.5 -> 1.10.6 Changelog: https://github.com/composer/composer/releases/tag/1.10.6 --- pkgs/top-level/php-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0fecf30e7360..41a8472db8b9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -57,12 +57,12 @@ in }; composer = mkDerivation rec { - version = "1.10.5"; + version = "1.10.6"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0a9iwhd7ijm8gkp3zadxza0xb6xwa5ps0d16pz4mz2p21gfzvwym"; + sha256 = "0yzfzgg9qlc388g91bdg7y7rp1q8vqb5hkwykwmr1n1lv8dsrg99"; }; dontUnpack = true; @@ -202,7 +202,7 @@ in maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; - + phpmd = mkDerivation rec { version = "2.8.2"; pname = "phpmd"; @@ -230,7 +230,7 @@ in broken = !isPhp74; }; }; - + phpstan = mkDerivation rec { version = "0.12.19"; pname = "phpstan"; From 294ce528e27694d858022f08735ef5be5cfdbefb Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 16 May 2020 14:56:08 +0200 Subject: [PATCH 232/310] zulip: 5.0.0 -> 5.2.0 --- .../networking/instant-messengers/zulip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 8245f5febc4c..1adfb71dd9b6 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.0.0"; + version = "5.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0qwlhkzb3lbzk3piyfx8nn827kcafrl3j1nxrn18f8px9gwasinz"; + sha256 = "0rgvllm1pzg6smyjrhh8v1ial0dvav0h2zccxp4p5nqmq6zdvs3h"; name="${pname}-${version}.AppImage"; }; From 198653e57e919854bf1d3716d4b6bbb13f57dbac Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 14:07:56 +0100 Subject: [PATCH 233/310] firefox-beta-bin: 76.0b8 -> 77.0b6 --- .../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 a0a0b7003be9..272133beedcd 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 = "76.0b8"; + version = "77.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ach/firefox-77.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f4b15745610d97f3919b644ed47b515eadfeb654eb81c5a890a2d225f1223f2f554612a5df14c4514f0f835b25f44649a923d09fdd199db4b052384075df89ad"; + sha512 = "84dccf5a3120dc7ddab9d44c5418bda90ebd1dc7ef2bfb56bcfb6d0921fa482c858fa8a147f24f9e88d881575962cff9d39efdabea2d3867f71b75834fb1f04c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/af/firefox-77.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a39343493647a46579ea6f37e5da14ed59ab5ef91a4e47b9b7f43cd3f469110b9544ef660b214b7a5f3df6373a9f6bf9b55656586a96a7f2991b4fb9a66abe42"; + sha512 = "f0c7b86ed71b45df8abe85b6d4f168f1749a08a5018b1b524edfa793e386ac43c116a6af88e27410638db1d2ad54970507c67b303fb38c18c314ed2aa08fa7ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/an/firefox-77.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ff0655c7fb043f01c8c4cbde006a7835a6f0271133a9dd07b90b3e0bf369233f9dc0ed0caf38421ea9b1870f1daaa598508865a239f5f2391eccfa6c0341c94e"; + sha512 = "73307a457a19f983741683bf5c6dd94b101c177d93392285bae81e40f8013e6d1ef4ea6b939a986b8f319c84368ed71bfdf223ff319bad1dfaebd71dff933d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ar/firefox-77.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b89d38b6a44ebe00806cf7b16a29264c324d6afecf4d83e20ae4b35c502b13ee04a052a879d1c68e084e99ebd9850a9b597b6d4ea19350e0005c8d006d5cfbc3"; + sha512 = "55e91f31d725f6b1c9dfe92b226a36b8e4afc9456fbaa3bad770cc7fb9f59556485fa9d287feb7e80bb25864a2d0821f282812673b2c835b90a426e007e5981d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ast/firefox-77.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "34a6db5926e8bc90e47e8ed8c413e3c47fe35d119aa3c2315c01b0ea38a04a8acb44551e689b798dc030902b9d3dba3f62971b2d927ed4cdc0f965657a189af6"; + sha512 = "c2ebcd341901ac3412c4bdd3b8e9be1372ac8bf082f1d42c5127f99a33f71506db88254bf8cf815ea0256cb96411eb985e13a17003f28011988d2c39b0174017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/az/firefox-77.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3a1bd479e251ad695dd397d019b3f492915f8051984ba399fd93035455070eb9a2b05bc43d87506e671ff80c4b2e4f17808f37e959d94dcb6a3067f8761f617f"; + sha512 = "48b5183cfa70cb271733d88930b1e0412b8f52d0ae7a46dc2931c1cd56774e004372fd999198fe5ffc6d8d29c22a0701b39af87b3b06e84ad03811e6c06fd6da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/be/firefox-77.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0c53c0abf67079d254b5da7c3d7edee506678bc3be55d24b61865e18f8e81b9e26f8ec98d08e7e8aacfb47a231460cafa52e065a4d216cadfaae70ae0a9202f5"; + sha512 = "0f1ba7cf56a316124fef51ffbf408268abc453c5c37023f009d9b3feae9dd05491392e696f415e78e2304d7b12939d4ee88ecb96b191f3567532a8ce686b4d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/bg/firefox-77.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b608676213c5ce9cae42d18af0f6a836586d990d58042ac8bdd0112590f3aed30abd4272d4581a0cbb633043b4f0cadca7a90ac40777e5fdb7afe807fff1c2ac"; + sha512 = "842f182e3d3199fe3904097816657a6ebc113da578fb91f25d36ba9eee526a7e5b514e5aafaffed31c153464d75a238a413f264e4310861d26de1971eabf2b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/bn/firefox-77.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "44fc7a158689424b3c781812e46b38efefae4f49098bce533c1abfcf9cae78a6be2369fe21f6be12c96fd85afab875b8a6f77af399348f82a1cce3ad4b0279f0"; + sha512 = "98e3916f29e5a1201ff607535f19127d2a180efe19b7d58db2782e7328b6c96e5c502d80ed24a0b13a62beabcd5f36dd32321765adeee78c894b8a9652a4b7db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/br/firefox-77.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f9f3bc634fe7c21e1cf9800f8875979e9f77764f71861926b67e9addd604e88b22f90cf31da5dc93b3ebb2dfac8c04ad423b9b21416732c9000e9747ab588a11"; + sha512 = "40d3b7ff553759c6bd8bccc1ab3454bec51d8e2a422d01b2ba8d10385f0cbd913dabac2c816c3aed68e0f22e2820b2aeb54058554baf3ad1b1a2a4a37f8bda6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/bs/firefox-77.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "3558b3eb7da562ba50f1273ae461f753a95d42eca3714eb1e044bbca3e63de16ce1f040f5b34709c8a0e86fc59ac6c9d65f1dccf3a0fdc30e96c0f7490867d7d"; + sha512 = "0bcfc38ee18b7b5db82705c858f8e65d96ba68857ae5562e488c6259e3d22f6983147d833e29eb2d3b5bdd085dfee9c2a200bf0dd5b2ad00365146e90e13ac16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ca-valencia/firefox-77.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "b79f0e814ce7df9de0f2a488a3a798ce9a33c840c7a39efc6a749a07e568ba881bd2e42b4a49fbe7ccee0ddbb3e7768382181ce16379a6b24551ad555685a792"; + sha512 = "3081b3d5bae4490a047bd429642d2ba7128c30b3d1c39bb65d8809d6cc17d814584e9ee12a6b3d95c7be945073db1f640c96269b6be6675912f7783e1f7d565f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ca/firefox-77.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "69a6c978b4c896091f6118b55783988fc505c819d74cd455ec6274d54fb6994a012f41d09d9b574be90bc10e47b8d186b8021421d86d05db6945ecda1e51d127"; + sha512 = "e7d6d89e84f3f719590b12cf3dc4fd60219523e79155d1a0d396d877b62ea1e48d0b2510ec67877d40ef66c278ca3ff32136cae1d823336c0b0d820fc9cda566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/cak/firefox-77.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8253f68114e9bb035edb0d718439f0d28f04e6afa7ea33d1001a1457723c4cbcd17362c0b517a23ca78a53ad2dfc847be396e28beb3a302f2380a6dad5eedee5"; + sha512 = "c345754fc6cc4b242d0c620fd4a0ebfcdf86a294b09cc040c016582bbbb3eb62e66e20d3358ad9f368e618d3b7e63c1609b459e33dafc4e2bfa007b2d9909bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/cs/firefox-77.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1413cbd3345770ce7597ef139242b72fcc9b7c53bca4b7cbfa707f00bc3d2778305f617047ba24fa22f808c0168524166a6fe7cc7db6ea0c5cd30b609e80d404"; + sha512 = "f352152581ccc9f78cd4c87a9be7497e1bdebb1ee5f2668520743a413f5ff57ffe619df34b27f737c56f6b50a06f9911dbc03cd7695ba1ce355a0595ef5d38e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/cy/firefox-77.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1628a73872c268d4aa8ac78bffe6ab49341735c6abd5c8f805c86129ca0fcf5d03251e962fcd4c9ecdda6af125b8d4f9d095e42b2ff5c185267cd41f3090acd0"; + sha512 = "48ceb246d3cf3aaed596d7a30ec8e835b6254b31189bad350e6fcd1badd9a77f677b84591d74a41baf9c16859e5963bdfa5383f7eb9bc9e12b63ffbe5427b620"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/da/firefox-77.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f51f300911731acd439068bcbbab712ce4920345b481b8db80b3f6ca1c1cf18fd201a9e639abc78db97933d4872c7241324591a9c045bc1c6d71898e2a2fca93"; + sha512 = "d632a8b6361c2338a7b821483b7bf3dc3a5489c6c9fb5aaa8ad92d5954b1c7345ca3409e9d20a8284d090a0215c4c6266c91bb18f0bd78cc6e08cd6fab6bef69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/de/firefox-77.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "196ce93a18112d7e0df8a8c1e444d503d3b0a2d11e70907963197760c2127c4f827ae9a0eb79fa7745190c92be10c7828a42414d33ec9ccea1f0b7194ffcc325"; + sha512 = "cf966d92801eede8f2abcf34425b286b9a2feaf5c11dd4470de3519ed6bad2df9356e4cfb3b1d4fc7e05fae2a3daf81d605a926e70bb65dbd44254450eb77999"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/dsb/firefox-77.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "da6f0afd218345ffa1bc0b037ca20c9aa6b18597471d35d5cc8f4fcbd4f39f91e2839fe35f186577ed4445d34e76d4c8175f2df24f7bc0795f606cc6ab47db7f"; + sha512 = "c7070844a604d6d615b182049b01a33ed68ba2492c91e1081a2934d8b3f329897961eafb22dd5116180272d4ece0b26f841ec306978bf40123e6d0e9aa1165e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/el/firefox-77.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4ea4754aa0b337e94f3fec5b108c703ac80827d514e64e3e6c890e050107249367c4167b58f21177c3071c11301c37de08703136f03edc0aa901a22e2126b279"; + sha512 = "7c37cb5564b5cbcb71b1e675d1ab33fb4fe629fabade62f574c4fe4bd2a11e21d04e9284c518d4505e74be4d2e4b26e17cf5cf33562ad3485325dea045ba8c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/en-CA/firefox-77.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "f6f59d13148c7e5510a03e93644b38a788911ed904e088be48cd1bde071ac372b4b047f988714ed44d1f64ca6a32502564f01780be80f6c49373119ff7021454"; + sha512 = "fff6a172d9d54fff9bc88b6c87e2b9228e3e1e75c0f99f1c0eb59282c1731c0371f539df5032b814e7b7753f562268571bd7e527cb306f69cc52cc027aba62a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/en-GB/firefox-77.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "fa42017d8111e96c4d81ce515577e1307e187493866c04f3687746647904f2f89a3f0df822ffdc2004bb0fa06aeba102e29b660e250737b2264b5015010ab869"; + sha512 = "82242c259944277127104c34b970d8af5a1cdc4ff87ae4cd9b2e63be216021aa8f00a9d5c7d115a8bac3da0a33f6d23291858b78729accb518ac8ebe460fbd21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/en-US/firefox-77.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "5f47dbf433ab20c2db027542eb0a3dcff7fb0b526ec93908f182e1dadde112da327f84edbaf44ccb26d36c120a414d64ebb9b10a77501644d9f1c9c3d34b7346"; + sha512 = "dd5004e65d581cd54d311a9fdaa02bc16f9bdf6e969d4791dacbc70f790b19080183d675c8f66ffb67632bd87348510fc9a1ad132504a7d74df2ecf962b84dde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/eo/firefox-77.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "3cd5e9e99b73694aeded24d9acc7c594bcc582eafca5867a7123c5067e34f7e96781164fd7db2b53366bd0d0d66fc495931cad42b1e3d56726c8e5f82c8aea4b"; + sha512 = "5a8b036be51fd8fe7bf1f2fa52fb9d6e6e3353ad7caf25c1bd83ac25fca4e2733d17be87c2468726c1ad8b3b845cbe6881b27e06d54005fcb7eaacbbd2d6e7da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/es-AR/firefox-77.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ae43f7147a3ce843488623c4558d9088690fe6ecf7153ff30da09051e9e9fe90df28bf6529a469b8d799554c8ee3ef92006e73a2cb9e68a5b71ab392a977e849"; + sha512 = "43d4638a1cbfd46c51324c5215132e63086f4034bc710916a5d11ecce9be4b7595c7d988b82bb4ec6994e074387ddd70aa1930d90b0392e162e28f0ce68c18dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/es-CL/firefox-77.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6ccde441b5c44514da5bf7cb9aa959f818d5c499fa8d33487102cb1a1cb98a501b1575ecc28f8288cbc4b69dc70bc76f365e9b52d4329b685f25a1ba9d1ff063"; + sha512 = "e8621d14b4afca14b0c745f37cc178162ca5149c83c9b6a30b708ae27cddd2778801e2810fe2ba2fd235f243baf26a9ab98f62abf286ec736d2a0581cb42d07b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/es-ES/firefox-77.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3800ba267d51d9046999c931b5bd9a743d2a3481486a7ee713f76c003c863b8579d44ca53ea56f5b32c8022ffd9ee0184b7c734e5671b412f60d04653ca2c8fb"; + sha512 = "ba70399b202c6b7206ca96819848fab9118e5961bc72bb91c7b15319ee8a13b8b93575b67e025908b5a8610e031030b9ad3d0c671c087c8e02c672db321d1104"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/es-MX/firefox-77.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "600a1aa9a0b97fe66947107ee9018740e2f7c07bd3ac51b03c0c6d52728d72f93062c9dfebb97042c9a23a85631c88502feaa6a8cee395953ef23c2addf6a99f"; + sha512 = "9a8e417e04bc8e1a111e45b16512fe92bce2479d544a2a93101f88c6188d8d56a59fa03712245425b17662dd5198cc516ac88e197491e531e9d6d0fe0b1de00d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/et/firefox-77.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "498f59dc3a6faf067c8c3d23eb5754dc8cf0478b50379359122b7a8e6ead6d7c6c39856cb34f3510f7fe1a11af3e0533a3805821ba49cb7cbf1d40b1caf36b3f"; + sha512 = "fff62942c3836a730bfcc21939a3b1cf7c23208dabf688b5dcfdf3b28bd7cfc257440c22fba0af08a37d69f4ae3addf74eb50c96f360bc40b3e1d3fb65555f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/eu/firefox-77.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a5d58868468f9ccf22afe78734121e1f81961efc9c7add2a065ec9b9d5d68d8fe96b5f563a85b960ea7ff94c70e1c3aa3a9f0f1bb23cd175df549375c1479072"; + sha512 = "8d31e248f711b920ba127f804b56a4f1675a535179e99a2ef8dccb4ebbdfde293042c002cf58e8771d327ca399e4d2e169539629e95407646156472957ddece5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/fa/firefox-77.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "02a5d946542aff81bea82ec73fe30919fe4a1d1acbd18ef194a7c8879d9b70e319abaee2e4d8b3a2671cecd28fffaa37a182f7dfa06884f83d765b8701c60a9c"; + sha512 = "58fdbd2aae9fa87f00559063eddd27eb477a492ecb83592a16c22496e5bfd03900740d6a7b87913f9cb59b69954f1839dc38832b646716870a32dc510c276bf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ff/firefox-77.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4ab405c47fbdb83eace54b0db61c734941d5ae6c5735d50dc6800271dc59cd82de9df9e1e98f238c4726ff9319c31a8879b2f0330792289db5e4b01cd3caf3da"; + sha512 = "cbbbdfe760395eb4cb5bf8ea3ec740f2db5a4660e9b9767ea0db898a8068327687c567da400ce47a6b3e40c22d77f6c6f2312f6d1d04116f7f3e1c33bc40a469"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/fi/firefox-77.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "82f95d6462097fb2975285326ef6b35a572b4c25bf07517f3ad680a978aea95f5cd4ab946275dd74cd6aa98566d1a4288761c985c39e1cb3d9e963b892a37544"; + sha512 = "255d660b5cbd0a2fd01ab939d5ed22d450aaa5fe9b6daac2452b59b044c224e427e4f6e7a28328289d1ac86af938821f617a6fd33b64a53a1299e1fd0d7a2494"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/fr/firefox-77.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a6df8eea8918292c18b281f5118a0373bc69aabc585d3a711ff77355a1aa95f5049d31df3bdb72087931dfc347050f4ccd791a9729f7bd3d95cab20c78da8a59"; + sha512 = "a2065174de7de61ddd147965cbf84b6e9910314bff4ca738b496f8c8b550cd75cd1d43c9011191ff93304f3c90e4fb21cd3cfdb68d8de9c329561e765ce706e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/fy-NL/firefox-77.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d5cbb68867369a82d84ade5a847d8574ff687c0cada8714c8a072291aa02eef748dc109b42f1b246980f1ca14060b799098885bff2d7e4c55e7ff644ccc01e9f"; + sha512 = "c71194f5357a5288a1e580096c6b23aec403bbf28a554526d08d5948585e25ce2bde95e7924d5b47410fccfc05acaed9da41d247cbea0774c3197ccb60e770d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ga-IE/firefox-77.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8d9a299c49949609f162f9bba7db369fe7c34f2b29d3075c607afd3c3bdb5ffa0ae0d9bb9d5ff5a5f0cd28556eeea5265b8f9809a2db36ae11209b9cbcb5b8c6"; + sha512 = "97b94e04b83eb62001ee6325e4fde3bae2b2c7d8e89bd35ead0e8b3c44593716734ead8369a479f65cdc5ca2eb719813d854976fc22ec62eb928de2d16a68758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/gd/firefox-77.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4431eeb86c0e3920bd08db00c10185941bc7fb3f5b055b8ba114e63bdfd7b64ccb8cdffcb754453557bec011d08d87e08b6a2ce022c77fe32add49269f3ac6d6"; + sha512 = "8e57376b86e64ca4bdab0ba594ca3537b5a69442de76910f56317b1c104851636f23f44c1bcccf280a4d68722886b62a1f75b3899db2f57de312df6ab839832a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/gl/firefox-77.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0963628808ab6f6ce65f70e09c12ca38c524992c82446a2654eb42917ee2d32dc1dae94b15578ac5209e12e0fc4cbd2f56265ae8c259336415d4a56b560be96e"; + sha512 = "bddd419b7340477887dae5b1b6609d06e7b3651ba43017203c7f6a5c760aeedf9d73570550bcb9947e472bf19b20b9cab808ad5cc62e33eaf1e47f4b295ff6f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/gn/firefox-77.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "1b19d9ca238eb05709007ddf00ff40596b49ec771839f6b1ac21162796101701fb523c0b8ff18dc6d3428eca3ed2ac0fd3bf17c5ea91efac998ebe4b8ece6c9c"; + sha512 = "b910fd5cbd4c109a97dba57d28634c9352547557edbe783216aa2b6f1c5483571cc8f4360b7caf3794e2910171b8e6d181729781077f01ad59f963fec9bf24f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/gu-IN/firefox-77.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c0d2fa00166926927e1985ce112a035980ad24771d4ede83143c4bb9012006c811aed2612fb1f2c4b1bfc852a7c7799309f4b579aaf86fc5b11ab216239911b5"; + sha512 = "4afd88472d92ce718c2a7475eac23a06bd0ceca8bc36567bf386c967f238b18ef56ac992e8007c6d1db29ac19175ed34b35f28ace5b72f6f81e4d25aa4e61458"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/he/firefox-77.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b2a5440b57ef85a3e3ee607e9e497e6b70e3652c7f258a2c7e98e18b5a95c8d34de908d64e464be9ad224aac7869efde785e38462fad3c284649bb9c524574b9"; + sha512 = "9e57471c3957b01284119342a75ac071dfe31444e5dca73ab2cc9560bcda4653d05615858d930c7bf88ed358e5c247b0f85a2e884a1c6c7015c953a49a2b3ba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hi-IN/firefox-77.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "2ffeeb8d559097e9d67f7603c34585d8b4d1571a23ef5a9d04c47407b03c4db2d4633637e8352ad96989facbacf6796aa48eb94ad81b70b0be3f0955b8a0e32a"; + sha512 = "f1db8de06d1e085cca81b75165ab8a16a79c551ca2f36eded8acaf64dea5e715af0713ca575d4c32b7749cb14261340013cf4208a9f2f7464071ba6cc7a40eb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hr/firefox-77.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "91ef9459edcf44b88e9bb6c5bdf1a1d5689c99e5a44f14f4700d0821e0274e9f8c3f79388c7a97e0aa235b8ffe1099ac80a523b4d62420eba5163a608d48aae6"; + sha512 = "2ee0e7d9f7d256633198dc9ec7729e0529b2ee22e4ab275f4f777d8bf722d0b240ebec9459b72cd81b179c77efb55ddff32e8d1959c20ae5bdf497863acfc27a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hsb/firefox-77.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8173f8c47566f7aa486266b8c0e83eadc11c484f597334aa48eebd3ed353f5910eef527bde508e98f082240d01804006ca4771aa7992290b254601d2eec6a206"; + sha512 = "ddffbac976e3978590b24b68cc642e43a8633156ec62f665b273233b960cfb7086cb2628cbd532e78d58092cdf24a72b3299862b06f3a863fd40213caa3d0243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hu/firefox-77.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7ceb26c11204ce6b1e6c3596d9dc3e6146422cc3eb0d1ef9c06251430e32f2353ee42b4363204852d6374cc845f8b84997958d2e66af3e770aad679d0ad3e66b"; + sha512 = "bf25d7817d68fa922c9763ee484f3cfcd28f2fdf92fa175f3c85f3c30f1ab095d4ab2b9328d23a3ffbc99f79a1d4656a9702e2a0df973c796c3b13ef543ec60f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hy-AM/firefox-77.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "cbc66db54c574aca15f8e2726ff68910d19a67cbbed9e2b63518976e3f614b4f5f6928bb7cdfd5c357d7152ef04ffe1a311656125ff5cb62e471ae59213b79e9"; + sha512 = "45401697dc04cb113b5182abd6a3716c5f21d477edd8297f1b073cfd2624a4a410ec08d0e927fb1de9dcf70e714cdde13fd921866bae9b47c45eb5a142744600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ia/firefox-77.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "19325c8a1aa3067fa8df803b93f124427519020903ace8cf12585711634f8d546662166f11b3944880dca5eb79ae87a9e2d0e4e273d95543a4641e9cf4324ebd"; + sha512 = "73990b0658142040ab43692066ac1b9511bca1dc4c17d317b9015ed373ace16c49f41aaf45dface74949b2a862d7511192bd5d5cb5989f23a34b52a0371d8e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/id/firefox-77.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b74338470d7eb1aecfc75ead675e2408df33fd4841ab4953cadadfb9a7f6169f8a10c4896d4d48fe86113d3f1ff312c4298976ef8b997c26d6406f8598b19a5e"; + sha512 = "eb5617301fd091c376e95affea0ae79b7f85880cdc2bc7f6b7bd1d87bbe490b5018cf047c9955d23be5cb481a2a7549944caed09b20439fffe8fc1fcfd1a8919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/is/firefox-77.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cb3cae07b27f0d485f9eb70805671ae50325491d622dacace2a39606efd7a72e46220e4981ff012f115183641b8e00271ab06c5ab2e8bcf3baeda040546c8b12"; + sha512 = "c201c279bc337612f0c2bfe8656c40989b0081b226f2ad0db1fe63618a2376a1cb2b7dde7ab7bc9227c17f95e9f8f8dc3e51baaae0fd5a7899fe397207722a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/it/firefox-77.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "83b7175ff91bad6733db2cd095172ef943867aa2dd911c6ec857dbeaad8cf4cd906278f3b8fd488e8905cd5d5574f727066ae73e92948d22804dabe16b4a11cf"; + sha512 = "c8785eeb316e4be84bd177120b54ee14324f8aa8476e0146cfadf12d673048753ef6c26417e9d20bbeb3bec17f0c0b68378166d41dfb2aa43e97b3de1c6dfb04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ja/firefox-77.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b97a3c637b1632b6a6285af946eb0a2c178d8fd901cb3a9b0fa5b62d14e3bc314acedd504153ae111557b78a2edbb056bd4a255f5971e1ebad3e335879dec40b"; + sha512 = "610a9508ab284ce0a8b75416165326e18a4dff7382a0aee544a0a65a7caa6e7477ac6f1407144a51c5f87e80898d5d970723e403c79d14db1d3adf6f78f66692"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ka/firefox-77.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2f5ae830c52bcdef8fb47880c6941d5aaf4830139b77c59c8e188e82036d315f57732633ea785c54a950d086ea02423e97ea2ac01105b5d2990821c7a15036be"; + sha512 = "5fc5a2d1b650809aeef7109a1aad6d19936bf2f1812f3ead113acae43e435399ae54ea5b573b9347f9e884a64b51a3faf054ee42fa554bf55bd1fd029565dd6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/kab/firefox-77.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4be9c49a6b6203f2f3b3aa3b5ee2c3246d77409da5a7b7cde2c14a3fa592eba87715199447df96688e95d9905d6f1eadaf867ffe1d01be9a12feb03255848c84"; + sha512 = "4148eb8947d292ee4119165ace08451f6bf432d85fbdcb7442fc7558c56a5e2a1aaad48b0b5d904f1704b7fd507f9387a4ceeedd824d660f8b2fef86dad4d275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/kk/firefox-77.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d15c5f6fbbe9b16510e94d1cf49f36fb758a97af5e75069f38b33aab8be007812d88babdb8aa365fe3e4c17a822be234111885a2d71ff335bd7ec6703e81434b"; + sha512 = "c2a7080ff954f22154cef744bb5e300b1c20106c85546394cd2be2f40ff7182bb47694e700c0170bc347b5c7563763e5de9e9b6c2bfe24fbfcbb914629894671"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/km/firefox-77.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "351facfee64d07ffedd0e5509e8b796d0432c7b44ad29d109c50668adb8fb13f408026166a49f37a92f99bdbf7e032929a22088d4bc42c14169449234841dc90"; + sha512 = "cf82eb49d6d21561608a23e3627833c3f0358e4c9a59214f9ef3a7ff39cac4b153d85701efe3ad02b033149848ffac6fa5a4fef8e95bac3949cf1bca88ce45f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/kn/firefox-77.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "dab3f1437cea072c466c9407fdf647f368838bbb7c30177642bc1247a8002874f832d0661e8a3aa32df8c0017f8c664caf6125b6989a113cd08f9c874753dfa2"; + sha512 = "e477fcdc9bade0325e40dc765d7d41fa69620fa5976a6c9a8785d36270cf85beccced14d479d4ffb1bca4832294e3e134961caf334ae1f524709410da15aeb5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ko/firefox-77.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b62dde501b06b4d825d9ffa8008b45a40bbfc93123df07136128f22c7f6e1f1cc42a0ea7e97c1a962a7b1a1a23bccd5eb66785a246781769b22bb43b8ef451e3"; + sha512 = "a524a4a121915f69e84f63e4f4ecd8895289dadd9d5987e47d7ebd6cd4a3d5683e594e1aa6efa4dba41589042b3b802fb3e088afd73da285206265240503bed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/lij/firefox-77.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9fe6488ed61c360ec1ba0d784409938159637c96abff94ebe18f198a8c0a72b052b5b0e6b5946339cdc5b5b3288c8e76811704366a4e9f9c498a9041955f7df8"; + sha512 = "71ae1dd537d967641947aea05165075cff17ecee0fabe0c7f3d4a40f645d0b83386aa74f23776bfeeca070c1bd635c7129e903ab3153ce00dd7554043e2e1213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/lt/firefox-77.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "804c3639ec0275d844f9ea37b1ccf5f259c50301cd5ee719b6be07a5097218937b5337a25d375c0d534d59143af3fdb338809fd9490a898d226e9cbddf39b6c8"; + sha512 = "fca434624a32b7daf9a62a1ac880f35b6f007901857a546f2b1c8998c93c4b719d1c9aea4a32349428b81cb15f46541f0af90463bca03bb0bb3305a2a380fef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/lv/firefox-77.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "14b263e7abfdad1ce738d58bc30f054f80099a7513ae443d32aa8dcde6b12f2daac56aefe9d3cbc2db9f9cab573a5ef2b046b8e8df9d5417cffea44d109d1403"; + sha512 = "964afab55c1d2a630fc4145b41b16f7b353d531aa5cbe77a0f2d6e26bb9451bb9aa3e4d816aede3422490586f09fec8d724f0d12c31dce7320203ad3fb5b3094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/mk/firefox-77.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "068eae194df8e756a668b8e372a0790ab8fdcbd5c54b823c82106230a9cba32b5b6e530de7a981273c67af25e5d329da2c543c8a5c96c91f010d19b6ecb25bb9"; + sha512 = "e5d8a008bfcb0895c8048d38174086551a176c9210e3e8a9235eef35328708e470f6ab343e72dc9b06c76d15c5d4ed5ba2307ba639e8a65916823482e8e5033b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/mr/firefox-77.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "6775e61398e028c2a6dcf9171ffb3d8fd4746653beb58e8c012f3256685e545abf4a62d53d67aaed3a2f04f216dedbb14a09920f24c2b6bc288fd29caa1ce2f9"; + sha512 = "43e08ecdc054faee0a6a13e73cdc1878ab694bbdb7d054fb1704422ce3ae12d3191817811e1199117557a1ad81fb16a56d0012429ff571fafc64d09a7a9112c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ms/firefox-77.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "b66a91988d816963731c823f16d001b89ce14928caa129ef90dfd1f01e3c54cea2ddcf0e5f7fe34ffe23b265c0a64715c3877fe0c5c8365f80b859d3e06e84ea"; + sha512 = "833cb1e12e108d574b9e359ceb3484b7b00078e482ffad0f3198b8e27d4940afa8055ee1f47f9313962295d129ce7370f3cdff2b34c12abc6cdddaa2899e721f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/my/firefox-77.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "29796ba9076ab6c46f16fc06119a267861b34652322397e77872a7570e8375e3efe88c3c08731cc8909d817d3eb71e269f7d245e691b8ba4778bb653a766914b"; + sha512 = "7b0b110972cdb5f2904b70fedc67ceecdb7d28aa345ed562cd2a1e6ca629b45331f55493c9ebcddef3a69b0d19b5279be0c9dc94745f9012a0d42972e57e9344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/nb-NO/firefox-77.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d7fe426dcbd53043a94d143a038fd901875630627e98547997be62b3319d5f2c2172ccf9315886d97d30c4a041a099e0ad8a229e840a0f4061faa9d6d3c64361"; + sha512 = "71e963a198774a42a5169c4d257963f750a10a50233daa05cc8f53cd8b5844a143114def8bda4c62157962e854202921e3fe60d4b844791e16bd376824be653f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ne-NP/firefox-77.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "093ee3c1d513adaff69bf84f5b9236c245c4580ae25f7caa642be239a591ad9242b329f15e2dde0969d12223cb6ab8decfc657ca440e344a87e42dd880450adb"; + sha512 = "e8199eac341f94cdf77cabb63d39fc6c3453044ecb418708761b14c55fb08d81746c57c167d3cb624b9a47d3c39d2bc96484666f316028bcc5014821599c4348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/nl/firefox-77.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e912de72ee10ac764cccf1243c0c1f8fcf159d6ade88c7ff575a5f7a5175efe8086d8b4ad4c9a72cd65d59186665d0e11abc4399b0692428bb8c93d025de2f9f"; + sha512 = "5e1b177f981db92ee2df2cdf1dc27d62491e922f1157a5f90301221ffb36cd497f04726e52d688c2dd59494dbc788556468092b67796435cb99cc78bb23e820d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/nn-NO/firefox-77.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "52c57e140593211af5abdf729d4dd45be242539aaad4688ab081d311804d56afe05ac6ae3e21c439a560f5213e49abd1ae0e5650f091215948ca514ad3eb7e20"; + sha512 = "056a928ed92402fa85e782f047c4e698a415e70c38d05dd572917d8ae84c4f15a4dfef479aa5dd297642546557771bbf86867209742aa301d9d4ddc04966c4e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/oc/firefox-77.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d249ab86026370ce7f417ddb7d7cc0a4fc58563a1c12388a4e1628938e3af8a1428f2e43cf7ace0c9e455e4b4999942221fc3d96723bd927c50f7e45c7bc1a1d"; + sha512 = "a2f6d7bf1b8833e934e6f109d7e972d139a99d22b9ed33fffa04a9f6629575d4db9876dc1c36dee15014e0507cc24827dc1071884cfcdb3e3185d7630c9b4fab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/pa-IN/firefox-77.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "7d5d1861559627f9a77160106dd5c527d09656be5586791c2bf2a61292b1cb1150c545ff1f39a6744453af58bd44777b9668993a10e654ed4c8edddddec12467"; + sha512 = "d61f6171b1e7795e86187a9be8c42d5a1cf761558bf75cf5c6dc88cbaf9b9f73409d796f5087c82c99a5b11cdd957e24bd74ec6f2d6b3563b4d6c1df68b4835f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/pl/firefox-77.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "24a419ca7b8c82112bac80aa9d956f3198cb324991492f9f66bcf0d64fcbe5618a2e654849dcb5794399dad32de91bf48bd3bba70003e02b9bf28634b8d4b267"; + sha512 = "e39989accabef74c67a31b554daa3aa31c0e27f9360d002f2553b6692356b4e04c2cbfd95a47bbebb7009de9d567aaea2ecee90c36808ee8d0a50c2fcd1e4332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/pt-BR/firefox-77.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cf33be7018dfffc891e4cac9950ead0274957b9a44e27bd7924abd62f93e69b575dbaab1a663ebf829a05283f957dae0a7442abe76e8e1a8a6e35e12be6e2821"; + sha512 = "8a0f66dc7112c0f012bacbc0138e512f66b9dced497dee161488964f29e56080cce03f9fa71ea6bb6b05e1d72b2810f31301a134cf9207a2e5426440b3d29421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/pt-PT/firefox-77.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c368498ffa8eb48801634fa6b50a74a563a28d4fcd23e4634eea52fb6ecf2872e4cd91aef5799afd8dcbf6020c7f694dd3eeff1197c3cfdac63bd72acfa7d7cd"; + sha512 = "3c66792f9880458a237bc4baf31e401d5ea3551eaa8e984d69ce75f62fa7ce3518c56d461c5803dd37eba199d5d93c86ac1d31f3638196a631d89cf6a8095fb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/rm/firefox-77.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d2064ab0dba1c122a599954efb01e4a68f189a1ce1d5059d60373e8c4b89c860d6b6a68c1e58afebe65107c3f8c5c5f87e771cad61efe7449e86f8ce25bacc5a"; + sha512 = "9fe665eb9f3dae56fb332f8ecc0700f3fbc9da71ad34aee927a5b92d98e97f987419417ed610bcec94778e47758d03dd997da9c704857d517e7bc583d0999d75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ro/firefox-77.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "64d566ac3acb823cc062dddaa33e1ae321edd3a4e54b02e317a04595bbc145ee4cd06f3f84b20d1853ad6d0eb4cb7b13bb10bfc8383799264342a409e2254dd3"; + sha512 = "cb52dc74bc09a08fe7d53ec3a61c07f38e0644f78859b6c59d7e2cb11fab9d607642d32981143ce457604196f55a01199f57733e5eb91c67b6d70018904f596b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ru/firefox-77.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2240c612c9d746774fba47019068391d6e08fc4933b082670269cab1416ce538b2bf9b948aac994e81a31a52b91a11df6968b847ce0e843615a75b8841443c23"; + sha512 = "b69a543d0282f36eae49076b90efa8cb538a99df255d618d85231c7d150f93c26bf13ac5cecde54208bf425319477536b958a94f043baba9f27b5b5e9de065ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/si/firefox-77.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f579d1d21cb45d91394b9a08e1b960a43ddadd7040e417c20e66e1dd4d3f7ea3a8963ab8334e49cb22ad6eb2ef81ba98eae1298acab3abfa512fffb6024da622"; + sha512 = "fd2b626896e0a8be67bd6c99d01f0144eae1d0adc8cb7cbd0062c2afe8ee902d09325eaebd762bfc56e89d969027e34ccb7209aa42e3088602f10796e5dadd7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sk/firefox-77.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6d2436ef789404b6d7247ca222cda81ccf518b91bb854d7f53b6c2c1c68b96cf5785bf6b768e49a0b0a4db02fc899c72969ac0c1441ad6bfb8ddb944e2388d8d"; + sha512 = "6f0a31a83df05ea5770d21885d6783dfa5307dbe3ad63164f2dbd5117827ae3428358b1e4f02c6c9906f9c801418f8c51af1afd60e5f2255e1d1e4a5095e4958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sl/firefox-77.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4ed452c03a08506498ec2663b6fab477b2aa52c9505085b493d799b19e5215ac72a90ab642ab2ba3520c609909b93a5b176d5f13c79066598492e7babd94ecaa"; + sha512 = "5e7d1fe3a3eb179d5a8ce578ce963b1d445e4d76758ec4a7e21f38e17b81046f15b9b5ffbdf9f83b665465cd938369e40da7d60919a05261a00012b2f4dc264b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/son/firefox-77.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d3c77c8a85dbb280f75068ca49891de95fc081b4074cfbd569c773fcfd4d0b017e2b734a6531dabc41dfb3e3f7accb51d47e7cfcff2bae6f230fed8d69db2073"; + sha512 = "c9d8d31ec45fefac3c6fbe0d0acf845978e743330a526eb83f39bad1f0d5f9262d58dfe2cee7ef69fb959c3c41ca2dfcbc4dbc87633e1b58dcecfafb013e1306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sq/firefox-77.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "94aa56c2d731533105c9e1c7d20862ca9cfd5729fd474b2ca784e2528f798915e9dc177e5966e2b5bb77d6eebc7962e6564f1494ecc284a91175565d25451cdf"; + sha512 = "55582b1ee4115e5ee22abf1576180e1a1ef90e48c7052fe6d296d8666879835519e42f6d21e79f848563bc71ab16502dcd81553445e7ce90d90182e06262fa9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sr/firefox-77.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3785e6ba189c2ec41f56282ca8925c8eb14d68157c5c035e90fab09f27941e67c9286298c07c31ab0792488f2cba86bce166adf76259d10cc3007f5047847392"; + sha512 = "5040bd47f5aaf6373d723edbabfd0d34953f03a09c81671c9f0ffb0ed5051fa3b8de51d867f35a94f5897219422ddb68ac358ba4a3d4afa74b89a5526f275246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sv-SE/firefox-77.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a98ea8c31d5e6ecf3d3c4b0def2d2921aacd901d095ab53aed1da202937022c073834fcb1d3ced826c294c18660d2e4888473b2f8f9e91083bbfd0e040fa6ae5"; + sha512 = "e59efb80bb3f0bed33c807482d3f23ca33e98bc18f41af5d31a7d1751ac6ccde677eda01521d1b2f39eda2276aa0530576341f51507c19aaca54c677d9ddec83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ta/firefox-77.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "5c64882b2fe34cbff29ebe7668ba96526abfe29cc599881331e048da2655ec735f8425d98f64475073e86508626b464364e3a7212b44ac297e6a50c7fdb5b4f9"; + sha512 = "d1f995570b54803c16820cb19ccb8a140c8f9df43779cfa7ad9b4a2e4cbfab7fb918701ba4ab3c135652e6d1cdaae59ea471796419bbcbb97bd5d2d6187f9670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/te/firefox-77.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "1506161ae00a4fa203cce5b31779a38f0e7df94021123cbd57197cff807a4a6ab2ee9907240b70b55e6795574b4074a83bd692d2b4ae208438a12357d6a898d5"; + sha512 = "2467f5384f1c9f9e79b7fb5d831b3ae35d2d25edc0bd5dbd709a36f40839e6b3ce37c73289b8267156140f6857647063d44bd4423ff261d2f820a23adce38288"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/th/firefox-77.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "97950bd4c56df1defdcc7f6f1693dd6fd0065805d63145aca80242e2d5a83186585dc1a165e7fe9a0dde52a8f60fa6b32ee097fe0febdbac5937a410e654b20a"; + sha512 = "1685154cefd3acb7a7ba6d53b92bf57c90185902e0fafbc06b02c9da3c67c04c1c92e38135c2a00df83181d8e6a225aa184100c5d0076be9338e3b25af289608"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/tl/firefox-77.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "994980dc3ad618140b0b422db46cf19cdaeb99c4d3202c426c415494812b5cac525b43c4b290fcb58ea66ab9330680c4add11e8ed92a5e36b7daeab19c96b4bf"; + sha512 = "a027d423fa66d418597fcd97166160fc28bf4a825dff1f51fe93be1543c9fa441f1525798a08c4c5eb176d56a09e2f4e0399c87f27e82c5e1777baa1c729ab34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/tr/firefox-77.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "65558235961baf87812242607d8b77f6e843bc5828e79002d55dce462bb2d40a00ccc97a9e83de56777d1e0ca35991a2c577ce40217964c481930a4081955289"; + sha512 = "96f3f0865311ef647d4431f7a5c5890a59cd36cd7da926229425f5d66d4a83d9ed8d693937f41bd542ba4ae2df16cff8e72e7a2a188f783e0980de5a809654d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/trs/firefox-77.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "cbc3c626919406af47ea8a00e01fc8146838042a8b7a04fde88f39e8b21bb3ec8c15b9ed2b327f5df1bae621427c8c2917837a29c95f27b1bade9d82e4eb93ef"; + sha512 = "63e235e001218ef291d7bf964ccbb04dc0ae60a7a6f938c4c51e9f981d3bd52f1e01d455bc6524a625fc7c4961c6d754810dc18a92d93f3aba3c34bfae718386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/uk/firefox-77.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "70ac4bcb16191992de317cc6dbe2f3e8d6ccd0b7bee0568d7a2272429bf164610621f53d6d3817ab6b3c7643d63db243273f6e99dfc5c5133dab4645f9824174"; + sha512 = "a37000563c2f7db995871cc83ce351eb1f0d44e4960362f7501155c0815cad2e021eae2f3f227b58fe5113bc6f847c33dab9cf717a7da3c1bbdef2989c01173b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ur/firefox-77.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e66011a9db9ff2512dd3b2a338440ecf268141200754b0dc09c484d1504534b109aeb83364181b3bee7b534ea078c879ebca1860af63c388689517397055f670"; + sha512 = "1360f66fdefc56f1a6a692c4ddbdba8ceb925d0a66690c37ca6cca5cc6488cef4fa17397e47f19c9f9f4cad719c03ca3df2028de78889ea34f421eef24584fa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/uz/firefox-77.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e09d595c56d8fb54592a046a6e4f9868a1bcb2bb638cbecbb87f94000127d0f3acedca67ea7f8db15445cd2142052873bf73ddf4df2fcea16373c614d6501728"; + sha512 = "b0426590b2ce54acc4ff683c82f40110b6d2965aa32c4df4c17b7550ae412ac4f1c30b6a716a640c33a8ee53104c5a5013fc03b2f5ceb4172c85c7aa89f7e08d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/vi/firefox-77.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "04d5647b360d52ddb714c25443b55558b3d54fdb31a385513832fba336e7db28a8dc27653ceef32e72a4dac7cb771e82178b6161b55917c07da839e80523a8bf"; + sha512 = "487854b40537bb3ee78f0163ef03f64e181f976c0b6c26def4d6e176eb661f8609cf7f941ddf5e07ab21a1559aa4ce8425da9d1373b62970e10a3b3146b03dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/xh/firefox-77.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "bc564788b8fa57981b7963b584a445d69e4c198ae83d8d6ae1a5e4402796492bc2cf92d0119a9db067f75577240b0e9d6afb2f38fa94e3e101ce6481b8406fe2"; + sha512 = "98391beead5f679c1e72213c81e304f3ea195e6497561388b80b3e1d2676a2396f38361c19063d7454f3261d54fd2174c0efc6b6ed5232f57a6e1fa4d5880d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/zh-CN/firefox-77.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "38fc3b4eef5cc6ffe867665d82dae4156ea2676749a9dd0b15bfbd9e01798829570bba75e0023ffdcf9b104ebe85911586eaba95868ab0773b22e121fc75679e"; + sha512 = "43f495798c8b6f2be8694459bf1ae788985fcbb38ad4461e63ee521371dc9325f4b70bee6e961a1b7e8a214a2784859a61de5ac0b088f64df390548da06a2a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/zh-TW/firefox-77.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "73477a782280c18dd42d7d62e26cfc5674201d3904d155c2ac712251ef8b65f422b522804104d7374865cd7e8286a8ea9291cbf7da37d412a1cdf8d24d18a3ae"; + sha512 = "a1697017b04890bc8b789659cddf9b7d4750b329d87e5f80193fe95c0a7497cbc17a8b53074d35b44847a561d818aebfe38be93450cd72875dcfccc3d2df704c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ach/firefox-77.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a35694c831c424eda7b6e5069c1b03d1e6b2fba051b3a29a7e8ebbded9b3b12fc1fbd39131d86f1c0d28a728a9ef2b7c8f903f6ba792d522c5e96490cf68563f"; + sha512 = "6163b94abd9e800302132edd7401eabae6f854d32e86a9a7e422fc4796c4bd4ce41f65cc7506341d34618531fe48ce925103e1aef40778121d1bb98703c510d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/af/firefox-77.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "9fdc8e1e39d2fb69d3afb64f676fa85fd674b45eb86d4d4735df403bca27eb499be9e7a6f5f9e67cd3e588352adb29ee805b403f35a859c3226507684a69ecc2"; + sha512 = "b0cea9990fa77380104a99eda971fe8d24162f8db807104d071aed1ebf799f8bea336858caf2af5547e143f018ada461f60769fc56ff85ea5457acd556983b13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/an/firefox-77.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1da6aa658841d59069bf57960f9c5888e879056777e4c227037c1745648417356bd87bf062de6afe41058a290998e7e080ea7fec895cbc86619d0466ab0bf64a"; + sha512 = "c62704c4e41fe1f48b84986a6810510400111b150bbdb8cac3c55f9dd810166c764cd41728f767c2792cd9d8d284b3a656064dd49095b05494bf8b4dde2ea125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ar/firefox-77.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "8cfc1c08b728727053277a60c19e289f0d0407e01cb2da5632cbbfe5ab48f751298f4f83930dfd5907d4be8973a4aeec3f3a719dae16827f48f0eb0d4151cd03"; + sha512 = "513794b8973338f232e6ef6f9b35430904253b13a2ff43d13810dfa4a2df01bab5d61df809bf31750860e87554cd91c63443adbe9ff2db92a4f7328e8002e9f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ast/firefox-77.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "96c7451450e0d6e133a6576b098b37dfab5059240a6107fb95be17a82e9600ffc4003b60918f4ccd8907d8aef814d55a79a61107504f41fe086fe3d6c83232b1"; + sha512 = "aecf7d90148e172ca7fb040a1a6a55187b408a4deba555dce2db498944231805ca252c02da4f7812cebe98d6e1f9bfb3b39e16ed225930208088f9e6792dc0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/az/firefox-77.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0211b3ff84eb9e7e9f6a0c81a141273009a2afc7ff237bdad751bcd68a24b60c9e9c896a836068d3373f0a0e6469fc77ce8f502197cdf9701ba033ab63eb5e03"; + sha512 = "58b917f9327097681f007085895d5817a4a4eb08354d7934b84151e4c3f03a8cffeaef4030a62c6e3180a8f36a2ad7b037e6b84af131e8124808d8dbfb6601b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/be/firefox-77.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e268741abb735b0425d42fb21a1a70b7035f915122c64e45418f2e61a3fb5f9c123b53e93979c96e7a183b8511cfeea4c3c6e3af87756622f4f8d049657a7a4f"; + sha512 = "c0f7867c4b4b7b42758c61c15cb322fe75dd1af1608bd9be19756c7dd161983fcf53894f21f7daea39017b662faf288821a725c84da1493cb86b1640fd8a3750"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/bg/firefox-77.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "3de7753956fcee2d2697f2c8a3cde18719621ae4c728b190d43b7e936c39543d6d6dae3ca593698931fb17b0270a19840377ec9392d1eb8bc591dcc7fc915404"; + sha512 = "472ac4e5ead67bedb528bf9bc7ac5afa0bc0c03f5f5ad4b69d074909d1d5667a3045362d5255b97fabec291cb97779d903a6f7de058bcf3c3eb829eda22d92f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/bn/firefox-77.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "ff9b2217e043c7cbba98f9993c729d23dea838e6f120c6adcbb4d03ff127484111ac2be2426de2134dc914aa765550ae62a464822ed31b24231fdfb50d295610"; + sha512 = "933d1c05260beffdf060c13f684dd641271511a5cd8ff9850c4e01e9aa49d09022e644f81f39559975ff2f47c1337c3b4f1593baeafa83925553ea8b06b97884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/br/firefox-77.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "805d85cad7af9264c1e8e3534b6c6248573ae445410616a8d74402cda2273b68dfeae4d47240e0247fb29b56bcf6f2d627f4a872afa8eda3d8156f14bf8851af"; + sha512 = "f58f61cea065b732b54a90440af3acfdbfb0a47b2f320982670c279483b4d63238356d7eac8c3cc21f9069da038451b8cb91bb929eb9db63100fd281e8770ec1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/bs/firefox-77.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "40f56cc3fa11d85b7e9e8d770ac5bec91ba5b8203e11a0cf898ef6bc94d58ddc73d6919e5c56a2e79a846393f28922233211784e693f3da63ae9315f3befc80d"; + sha512 = "e324b92fcf9bcd14b1550ce8ae5f679d7ee782dc0983d5deb979855cd02572bba3ceca5faddf19c084c48225536c60ce62b7cab707fd03807dc3c6c276221f8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ca-valencia/firefox-77.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "00dafbfb3095d7b76d1bf08bdbe5e99cfd207b39ae2a787eacb39ca412f1b2ea7c4fade4c99715f44cdd774823c4929d0efb65b40757f1b86faec738d4f11493"; + sha512 = "2c804886072e3749c95f9cfa2eefaf43a0318603aa1f3bc7c63e03b189c0c07d9397ae528bc39b5bfa1c0d71b348c9966ef4c8e9ce38e91e8cb5d5558eb569e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ca/firefox-77.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "24c21262e498e8840cba3f8411d8f46108f736f10bba2a0c37ad9fab6e0bc773f38ac086334d3d572e19223309e9d106035d3458e05c9b7b8db237b7bb1e1984"; + sha512 = "02edf33f6f7c976ec344bc8f99af928a7f80a2d9d968ef81e64a92bc57492cd62540bc1c68221e73b08241dc55d522c364eb00643e62c813e4e23030110122b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/cak/firefox-77.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "fa849173b8af4d6be6a499734042763d2ac532e213cb863a611e66e405acb5df7a51649bb1f9509ec637e15c055fdaac63e380128290623b6d3818e528a9c532"; + sha512 = "5bf3c6ba3e8d9e9a9410eaf128bd5193152493b786d2b4e2fe04ab7cc58fd2500918cc11d3239848093eca0e46bab2a31cd845995d7a0d5f8254519f9443097d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/cs/firefox-77.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5b718c2dc82230343e35b8d45725e9f7c331cdf5716d973d671b7465e06d50e92e0a353c73c7c31c33cec1115b9332e2457f17f6e5fcf8f033bcf7e222802267"; + sha512 = "2ed0b57124fef0753ec20e726d0d07a8b949a5b5b0c07c34f62e7d9eb0e7ed8c39d4d7665e5252862d565b232a5608e96cd71bb949a970c5ae15fac84a778f6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/cy/firefox-77.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7b037bdbe658d26c2ea75b8da80b4040b9a0c4cefc00784bb94512481de435463605c565eda38f0e958725adea11f09a9ec5a37d9513c16118214d0486db9031"; + sha512 = "dd051eb3f9998b30278474e9ec3b86793460094f741778f35ab87bef75e386ba2308121088f6a360b2c20538b9e65879993e4419a3a8f19e42e366c0ad02651a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/da/firefox-77.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9752b73c59784ea54a95b0bbf63123ebbbfdfb7d2742e3418a872982c0d8198fc0450b3c33f4fc569fcd43a633cead3ea1893057b6d7e8c6ab78632fad3555cd"; + sha512 = "b104222194470fba31288adda0f46afec35d6be4af04dfdd59c224bc5c2a8a829fc7bda89b40496ee6d837078e5273b903b714dd8352198c7c85ffa5bd65755e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/de/firefox-77.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "067ad7a8a5a4c6120c1f1be2f9b4066f1ef830e3cb49ba850478d18693c8e4ab12d54a07036d23ddf3e138837320728f1fd6bbfffed760b530d8ab6addba6b20"; + sha512 = "203facbc30078ae089c8567b289f1c6a3cc8f0bbd93a36781cf5ba0a7dff60d47e63c73a9488eca2fe309cb3ffff8ab30d0930091fd9abafec29663c11d33f0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/dsb/firefox-77.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9f4b6f73a3966a7aa60c168c16d88382dcfb278f934f3fa485e691a6b6af43a14f49395a3f8177b4ca9802275706b2cf701aba2310262149b0bb42cf6d096c25"; + sha512 = "c51f672ec8b9f10bb2f1acb2d064a95d2a02957f3d2c4039b7d4c22acb8d4646e39dd1a7afc7b7452ff94ed7f678d988abc7d11b9c4ef668b0c7e6b94a7220b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/el/firefox-77.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "43a0710f463542a1389e98b5993d1d1b35f443f0a0ccabca65ec5505d19c28311d91cdddee4f9c102b6f4a25a87e4c2c6ad7be89252f60a724c7af935e30f675"; + sha512 = "4598e9929164e85f9b18c6052e7764295dfa8c64f14fa82ba7070f74f0c4aeccb5a80ce90988b0363269bfa9b880a1be1a2c755de19a133d804dae5526e049e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/en-CA/firefox-77.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6717d9c590e5f06d3b02f643ad4eb27f48499ca759c41144aa5e0351e478bacc54163378faedd731042ce56ff5e8f55b2c6b6bde7768d3576b70a0abaf4c91bf"; + sha512 = "bcd6f5a064873bc300a447a57ec68b6a2019a117a3712d2f51d7a61ceedc42eb22b07e294a2b44fe55bacb6e3bc83e0a7bf9b64dadce8289ca8faaddd1c1eff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/en-GB/firefox-77.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "320a50b2461d617962093c1d7eea94517c56a93d6857a4d4efc4183e76f24dc9320619f9c3143c9dda017ec5e8e3d71c730a27d532bd7141c750598edbcb0121"; + sha512 = "b17ce17d3675598c72121d57386aba8f218724176a840ccbf3200503c62e56c19df89a2dba678fa7bc21f6354bc969a911562e94dabcc3d153f1a0b9cb203625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/en-US/firefox-77.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ea7f210807e2306d3578c39d1d58ce12525c47cb9dff3198dc9153683f8e49229e19dfd9fcfd3d76e109cda4f92392e4f9f1fac2cffbd59e6430105ebfc705f5"; + sha512 = "beb519bbb3b6497c497f23fb1c08f79d67175e91e39dd0039de5a4392c7f72986b150601dbb051028eeee811df35f099b8c906f0118e81e95db6547acc8cafec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/eo/firefox-77.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bd1dbf20cbd4aadef8bafa74f308f097b5dce955ba7f2299cddcb1cc9cc9d8805e399684cbca1af750535ba0ddc939757f4d38331035e4a708ffe1c252da9c82"; + sha512 = "44be964acb600756bc475922d3486745f1e53c7376b59fe87c3f289a09cfd7ec9d6829d6691f272d8cda8c4a30e8145373e35bb316dd62a86dd92343f8724ebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/es-AR/firefox-77.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "1e7a48ba49c4f96ff0d16efa3798e4254b7f38f0da8f51e62a4bb71c13e3f066a64c2c6d778da18b5db83da52684dc39067f6c765987d95921df2b3118de2c6e"; + sha512 = "2f787bea6daba52fc3d04567dc5e6bca75ac8dc77a9b72af98c08277fe53894444acbeefeb8eca8a1257534fb72ff65ffc9e5e67ea39812a9b7a4bd86cc361c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/es-CL/firefox-77.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9c7e6456459a4e2b6c7aba254afb145ca3c8efa4023f7e023c3cf326b0e0afd88149888265856e9f28179b686e1a458d453acace73f635a5fc8c90419e6fa043"; + sha512 = "32bc2c644bf940fa7eba3d857f12ff43e7fbf37f7051ac796731689551682c810038d4f3614f34b0c0c8e2410690ccfe56182395edffe16f9071a0066f59d7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/es-ES/firefox-77.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "95e2d89e0f94f9ac95489f8a084d0857aa5339c8257fc1bbe7c7ecba31694963831917461537cb12199fda05372e1304e6820683802efc0b4ec02324194ec2de"; + sha512 = "5bcd620fdce6ac1bf1a789cc5d7d490444f1e8999a0f133e4103df02d75f0f1f51a807b86f0bf07c1b743d84605d9fac7a2c25fae1b1206d7f98d6b1bbecfd4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/es-MX/firefox-77.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5fc41cbecc716fb024df2d13e9fffb2b656e18f47adcb496d3f8f3d61580f97fe801435240576f1403805151c7183c208425e83a2ac56373051f0e82031115ba"; + sha512 = "9639a12dc3be3667558854143de6240b29fd368ffd959d14b3e8717e7cfb2918d770a040e9c9291c9c085ac0ac4b4bd95d4b5db212c64a769f3c8b56b8b16a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/et/firefox-77.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "16c5eb3e9739e100dbce0eb93f209fecb11b5b024ed62f18a47b00927452d8823b77a14fac1788d9c4bca9062e85e724a78c39630694b0d692b3867e4f62f7fa"; + sha512 = "6b5655d9ed90d612cb89009c280ba0a129ae5c3e7092b5dbbae0b76722743bff79e4fd738278992bc8dcb00e15ac7fd084ff2cecdcb1e720694d56fcc2674213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/eu/firefox-77.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "0352971bb2d43782052f20341f8fff0f6e919ced7909e6a860648e9772101e5f79bfdf0f912647d3593a0f6dc9dbe84fc193519c3b24ddcd13742f01ec59d1af"; + sha512 = "fafc506f9bf2cb94822cd7cb782dd1dcf65af46f3c3f0afb3d5b8717c75780e56dcd8a09882879208e5df1145c11ec9f3c8c93f81a01e63b1260871ee3497da8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/fa/firefox-77.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4856a0b482dd0676cdb5d46de7bcd96a4c9aa61bd976f3b46205019493b8933c78d7b253c41f4c2178e2f79b000dea8a9cf13e1fc7a31a5242432e1c9205d445"; + sha512 = "4b54eb3d7e903cd2571f85e001a6acae223240bfda2f9f7606a1816aebfa4e0fc6b433bb83c0cbb002bba08d3c1d18c894a59c0f0e79da5b2bd9aa29008baff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ff/firefox-77.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e85757478feafe009085ff55492913944d5d8490426f93cfca481cbd97842bc3c6dbf709e17c372b5b51b14fea3b057415120b6fe145de928a108c7464de9af4"; + sha512 = "91b078d08b8320053a9bc41afdf567737eacc21019db4960b32e2371d1c7547c05c40204c33c32b284222c1655779ece8e66c7ad913ce2c5a235a3c58a204cfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/fi/firefox-77.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f479d48fd6176baf30b0d648120669ba47ae2ec5d681ac6b610d6f0b0a617a0f259db863966625376b63a6b871d56049adc500ce8e8e0e27da3520a953bf1736"; + sha512 = "42eb28f46f07e0573dd74ce8e5deee96f5d1fca27afb6f8abb133ea7fb0f15dfebeae079bbee7cc22f6c17453ebf0da4f78a96fafc0ff9ed8f4d17cdba207dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/fr/firefox-77.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "4caa574275e5c0756ae787e73398f73a2702b36d4d3f49d3a3dfad8cda8393cef24ec0375d65d0cee4f41be8fc94b5419a3b613dda287d884f8e7b6317e3fe13"; + sha512 = "23eb239dd26d461f15383bf26a33ea4fa51f5ecbfa2a64ed2cf65adba4e56519ad0a84469776aaa023882f1387065214fee7a04e1c286232488fd33f2808f680"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/fy-NL/firefox-77.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "28d31bc60979c84d874f444555e6157b906b9d34399cb87608099e67127dc7480d6789b855c38615b075f5b07f8a6b222f04dd99e5690ae36d56490953135149"; + sha512 = "3e73aba91bbacd790c214b25214739c17f14ccd814bf117b8f80aa8a02f02d13cfdf0ace765dee41f0b9bc54759237d4ca48133732f4df22f14365ae888b8e15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ga-IE/firefox-77.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "b83c50b728bb1e4febc53ceb3a4fb8a6589751b5ef77ef81f03941ff33d3e289c8986b501d95afeb56feb8f94be7d9a7b38e5330ca359543948d762e71402f75"; + sha512 = "0f1c6b131335490910f1fa66efde4755fa94f3315dddf586afeb8d99c9d90f0bef124aee5fd86e89d78e1f3e08e93e0a3c3f929dd951f6bab0eee750aefde2f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/gd/firefox-77.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e1b2535e07364a29cedf36047b99dffeec8937b775a247b605532376b3a43a8c0037e2cc9a6a461a9b68e00eb67ac1d337bd40ee7110ce9890cf862dde3cfb60"; + sha512 = "6eb0476ba8d87b7243bd573a0d7af1d6ae5309b6987d728eaa4817e5012878c2093f7fc9581a5513f10cdbbfd0fb57e0f3d46c1a6f4c3fdc9d84384660ce47a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/gl/firefox-77.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "776e2fb5cd75a8f5dd1e6340af21356141a24be87eeb6968ca926cb3d3aec1b48adde0881a7e4413a83fdf45f5caa3e829c0ca1754cf7176eebf2b9e3ccbb02f"; + sha512 = "33e18e89fe4af2fd66b438cda80bd9946b29aa36eb8e8a5e7f87cd2a614c714aa761ba29ffb6b0d7141a388f9e4a94e6577ee6aa28cae8711cf7dfff824fbcb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/gn/firefox-77.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "bd3bb0d416557c94a57c8b364ad08ddcc1885bf55a2435f5a2f74f5af1607a828795fc68027a470cc95bf46d553d84eed1c0af3de1ae9d72546587b486a1bafa"; + sha512 = "e109b42999a56a2173a2d5aa9042ce3229e9e353d1126269f7cc3558c86419f22f449ec9940c5a7f61c0d0db0929f4d15d28c4c7929b8dfc5bee737d15fdd81e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/gu-IN/firefox-77.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b789f7adc37302354f797988e052957fd95f270dce838352636a367e03475ea92a740ab5ed49c9561eb5e90b106e38a767d6d3b4e8f1b3f07db7dada400b6aa6"; + sha512 = "2eebc24e19900eb9226cf9bc06fa9617fc6386da526e7a9b37be6bca047e81616d3b84610ca7923268241d79e256fb7d5d8fc0544d1b816d732d18681d11566b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/he/firefox-77.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "afbb11407ee19f4d3846673c451848ebd4efaf5795d1f864871c57f7e5d36d26e38c7107e326c5843109f89a315cbc38f25df1622f97d6c355f824d06986341b"; + sha512 = "ede805447b9c71fb1f311550d82b229e6de9df92c289a7e9e6f0765dd137eca893dd95f6ea91ea37af70ba4de4e1b44d4e2bb781f3b29395098233f7f185e27f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hi-IN/firefox-77.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "03c32d07601cf4b98d02495baf97b70a38a8e82abc8685ed507f0c9abb907468b1e8b8403b2272c9c06ea8b0cb020bb330f70f8abe5b5fe0c757fed710c912ce"; + sha512 = "10108407cf7aab5acf5c9bce0e01919badb7d6e5a79c2a33f32232f6afaad038f0e0abd1384eb3d5ac8eec938e931237845ac3ba195e8b7d18a009ec047767d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hr/firefox-77.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "47c923096c22e509063298e9229f3b74df60142aec4296d7008b5e49c69ee9542915e639b52ef8aa65a7ab9f118d1d23117874a3b717b37930d8a988386b6ae7"; + sha512 = "624032b07ce5e04a7a25a39a1e1dfca18df8be07d840e971f8ed95606edcf57e86425f3ccf048efc5e7d816c0242bd97c380f980e2fe2644851bc043b2bf56f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hsb/firefox-77.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2e2b3c390ad20fef9860c4e3516a32a66b091e1f60a0dc71916172de3a667cdeab3d712f8f2a5baef8857da3d9211fb7bea808b975cf3cce1920e8ef2d73614d"; + sha512 = "25f2ccaf7e43c83383d4b1fdc51e4ad0db715318adcc126defc209f07b2e7e12a3784ba37683365383b5637a45e47aeacdb2fa9e187c205b7a0e34195c04d229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hu/firefox-77.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4c5e5fc5e859751cfdbe1eea6217b92dcd3bf2a30b4967965d0242de72deb6d497823b0d17c170be1e7113a15f9d607a6890a5283c47c254ef2c94022397b977"; + sha512 = "c99cf77145c2a7473cfc094b3fb819bf46fd3919e18f776055185e497d19ba0e228b2741ccb973d5fdfb39ec0403f6ba43b5cb84169bc2ad8f94fd6f3c7c9d61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hy-AM/firefox-77.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6953bf0ef7dfb0b703d4aa1ab9c26b85fc049c12a04d669121e9e98005ae870d92df9ce16bd567aa1586d02162ee94fd01800d4d291f5a0c1b6e0cfdafd89c8f"; + sha512 = "20f2a99725c111431b19c56c8afb174f30262e719cde9ce4f67b0768d630d39fcc19c4b4f8bb0eae6938fce205bb51f08108de38697033589290efaffc296a84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ia/firefox-77.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e7bb763c2049dfb8081384059313e977ca44eb3d147caa2fbba755e288e45d6ee5e47b6aef1267e23d4e8c6a625f9dbdda7b938a9183a7012b3d943b857645af"; + sha512 = "ca1b9ee145b9a3f23522980256c9dd7e796ce5ba88329f7e64c78c98a26bb2379a58179fb34afc485dc507a133da2a161f96549d78c71c73e4b02175877d9163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/id/firefox-77.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a4139cd488a85cd70e595bcbd3f8fce96fdebcce2c61c04c06b70ea0f2a99348ab69590f1ccabbf803798952fd436a30bf6c103beb3006ecbd14f70d6c3ecf93"; + sha512 = "c7e7e6b8ce1ee969fa4412fdb0dea1dc91645b23dc7a62bef062873587b2bc54781da9796e349bec96aafeadf58d79378ae349bb938338632cddf8a71bdab7a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/is/firefox-77.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e485e4b6f5a8ae5fda9be8ebcdfa102bad2c55ccee6d9dfbaf2778f92c68e68133a26a599998e134314186b296df68fc0dba7c849a109f699d3198a2c5a31001"; + sha512 = "a5bb8998ceae01b038569abbf1afc1c873529f1b99bdd2aab3886c269c291d5810b3505cc8e5dc2e961a64387e5e5911d88aa25e88dfd13c271a7eca55a015d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/it/firefox-77.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "032e3e3b854a0be7ace835d71dfa864c0c84004c87ff09314615e633d64011f8676118ea73797b725bcb1c1e079fe632e16c15eeedf78602201c7ed371222e2f"; + sha512 = "75e511d103ba2d89ffc51210f2bdd92b75a55053055f88bfdef8b9c34abc54797093934c88a0cf1a10a3e81e596b373ba0b924f44d465152883fc37c7b2a2438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ja/firefox-77.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "dbdf163abdde2bfc22f5574d2be4e3daea52c7cca394a9b0f1f1b8af19c65593383a112a2fc7dc55e224ea6f5d63537f03be8d2cf02fd3d3566963bd0d51d204"; + sha512 = "a347b2a75b523d93bf2d4778bc9ef67203ee01c4f22a4e5881199f2fb74aa55faa4df79ce89c96cbdc5dbd708dfbc9cf4ca33c4d0c1ed3448914fe2088d20756"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ka/firefox-77.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "2cd1446890227f1ba4d7f50ef778731b350f694646b6cf33e1407325784b071db4bc2fe43eeefef2ed98ffc5353538d42df48ff8e546f4495a366d5acbc2aace"; + sha512 = "31bd09c50ecc82445075fb193ff30a8087b0aacec75668b06228043055282013494c6a0c4d09b8a4f4111600a5e6ff886d039ee8e749a40371294a1d69f5629f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/kab/firefox-77.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "87c131e32ad46194175e8ca8061cc1399813b2259c9c3e83e612c74bac27c9364cbbc63860c283eeb8416e3b108297ced4a1d9755c0a273c9143cc6b468f5cbc"; + sha512 = "25602f2aecede8972b7ea1316afb09cd288b4004884c3eb37613f66bd2541fdf21bd923e5aea23b110674d39a37f90827f32ccae8d0e9a0372e9931a6a3c04d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/kk/firefox-77.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6977a2478623dd8963121a1cb3da0a8669d1cf17357ed85475f61384a9e1ffc2c1b4286b3d7150386031786e365c33c188cded495036012a63dcf2db44e19d50"; + sha512 = "971acf4ef23a0dd3404370be3d11236b59e634e1960a13c953c8bd7e2f38c6e494a275720ac35d177236ab5e617f500f25e8ba5c9d76cc1455d5c84198193a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/km/firefox-77.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4893ae9bb4695b227a6906db91c1df7997c866953ae3960a334856f9a1c99e05937518ecea2e59c5bdf12a4ccd3e644ce328e99294dae53d7a9d9a9f5e2e483a"; + sha512 = "9d1ee23d458fa637504fcfcbb2ce09c10c8f7b0459ab3e1aa956c4012054383bb5cc081df1652562ad236ef26c51293a534d2b1f38eea470d1b00d4c7e31ebb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/kn/firefox-77.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "eb78a32ea736f139fe1c5cf0a1ae59df33272c6078e643a571968d0a5e4f3801c280aade938a5a714a7695700dbd2db84116f6e5ccbb7362d394ee929a2d9efe"; + sha512 = "af57f390cf12a7e93400a745dd739e98514a535fb88867f2e91a7c04f1e148ec6527baf2d031217d9066d14c852db4e70e82cc0422485444b23c755bd474f967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ko/firefox-77.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3bc572b109fe9c5b14cb94d7705ab7fa972a99e914eabddfbef4901e5be9f058ee6412c59b2173fa0620166612c982ed6bccb1f4fd684189845a5446c93364ff"; + sha512 = "90561a209184560ed20122146324ebb63940b6237587699a0de8cbcc97938352698afc265ad18e9285ff81a77393855a89dc59eed180569d9059846bf2c8859b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/lij/firefox-77.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9364ab431f931727157b0722ed021736bb8a2771a01fd8e12e616c02d7ff8a2ad23add11ea720b1d462e727df51c985b5fcad908307af04ffb57af5d25674c24"; + sha512 = "43a08c17d0f6abbade205d630470cc56b4ef4d536fb10630f57f8baf816bb9b396409a61f83679f7fa04402cdd3a8c13c54e1d1f98aa705dad151a5e795e4d72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/lt/firefox-77.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c2ebacf0d93c38d51d16cda493aa1152f8a682aa41b7f6626422596f21038ae16d3419873dd253f60f59971486568f3a71420df4d2c503a79aef80ec413adbc8"; + sha512 = "98b98383fff5a8ed92e8c2a71c742c953b9d534f22a546c8de961f919ea3027d8f9dfd8b1fa81dd3a1f97f320c653a74fd1a03e685cf09983f52a0c94d883bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/lv/firefox-77.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a1e0962bd4a10f1c1336650e97ce79fccfba6e752e2929156f60ae10a9b3a9e74b9e2cb8c265d7b1c242b2a34ec52f2368d07777bf7c687dbdd7914daae55c6c"; + sha512 = "5d687d8412313b37d47b2167eb6ffca92747abb450c910c8c0e9b755b8e651c61f5fd9acf2066d7d13a00878f48dc422f54b7f21eb30ad244dec86c4185700f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/mk/firefox-77.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e6b4cc5658ffdcc1a52979845abda4870917f8d036588daf1c1db93645696c85cbddc8a8dfcdb6f6166c43276ff52069c3c4289db38e9e98e7592b0d83fe3d08"; + sha512 = "6a27e2103582185acc901d4b62214a4793ddbcbd2a1ba782b5798c070992dd5395cbd4c2c4c6dfaf3b85842196da820fb337fae69f7b529dbfeae19b0c2f2d03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/mr/firefox-77.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9d4cad2c1b192b199ac9a7c0ba233c0096546de7be31a21c4ee5789c82fa8fbaa5b9c5a37ac4001ef9bd774b62f57d33aa5760fbb0ee6ce60000f256e91f7054"; + sha512 = "8caee655cd45dc46c426262cee605a7e71e08f39a16e895180f4dbca8f6f70a15128a57d82160f70ef537f09f4d6de77b1d3842ca39be30069d5481bd0132d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ms/firefox-77.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "56d8a03ac84fab825c387ce84a45efd656abae43f9ea965ee45a09b417bb2634ed1f7fde0874294cb09ff3e3789782df7db19b6fce4598073a81854a91a6f800"; + sha512 = "d21a906a3c75ef3cea2d21c4249af4c43d04d2eae7b0f64c2b2949d8b7950468376dc6a888f38f4f7c949a40c95f86151735be41b63581ab3ac3e475eeb4673a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/my/firefox-77.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "a9768618490611f5073438986de4265bbc7bf3a2613f4314b78533430d1f830f83b7929c74d431d8bfaa2ee9d5ef64b189695ac838c52c5ee6dadde88d3a3606"; + sha512 = "8e62eb51a324251d1c33638be1c7ac35deb960b583c7040b4f87a22a03d9707ce82c72a49c026b03df32d5b666a30a58411a79a07a5f180b28d9d5cdb391df1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/nb-NO/firefox-77.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4a413a17a3796f4ba4b0b783c4226419f7fb800ce4965288129cae2f1f087a11226376764afe51e09c57a23a85df762bbe833d167a13b6c93c22fa378f0ae47d"; + sha512 = "0ea101855da1a81f5d6dbf30dc8793f42064e0bdbbc92a37c17f0b69a6b44f86c5107a74bce3a3b4eb3c8aaecf2f07334cdd66c910640594848db760a4fdbaab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ne-NP/firefox-77.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "899e26c0ab61e7dcd4ba97b4df082b13fd93d07c22e849a02dcbd887f870df0a6de4b05517b200a4917fda6f7cc83d7ff603d8e0bbd96a39ff016adacb669c32"; + sha512 = "e1a38ae9463c66444b9f15cd7707ddc28cb7fbda130dcaa83d65757e71175afa2412868674493792453bde9024f0d401e9ddbc1300523644f62e15d1139ec70b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/nl/firefox-77.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "59b6885bce4c6cb95288e1338d6df199e8710313bd569dcbfa2cd2029b02bdfee9e28d4aa11f561765ef9e51d982a999d689935e18fbdd0d60d8ec25cf4544e3"; + sha512 = "1421d90adfce08fe5f21276a3865de5f919f39e7420815f022416045b9df1fe2aa456982b1cc79ab5da90a9c8af9a3ccf49aa4b88a7a540503c896d6db601bd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/nn-NO/firefox-77.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "40e62963d39f0b23498a438c3ad184d0367cdceff9a2674e565153c70bc450992d11145e5f651bbb53f389d5a74eb3d7413968c608b7d7650e9d553ee26d5cb7"; + sha512 = "b918c0463b5967599a00bacdfc6a69a943f43af312c7326150fa2aaa0b0ccdfc975db5e49c712384faf79f39bbfd541a79360916fd839ffadf1e19a0b27ad69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/oc/firefox-77.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "3ea480ff19ffafa1812069ef7dd1ff1852b10abf2ec4cc094912173937b82c744f29f1480de2e95dc65ee1062a766f0ec33d234e3e3d714f49972458a09705f7"; + sha512 = "243ddf2550c888b9e688931947b4587f21a971c786bef8ca914e511a4bad6bf359ba2aa5e1dc1aba84aa330c5e3e5cf91f31ad9a463ed55db10c2d6a9341585d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/pa-IN/firefox-77.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8a13731a6072abb0c34241f206898fb59d91dc26eb3f4c0627d2aee2e6a53fba8b3735d8f5f2b36dddca9609ff4c1d9c5d441c350e9164aecc2ce9a69b1f0c5e"; + sha512 = "d8198664bdd803e8cc39e4190e322a89626ff7c3463d1b0fb76ca2112745d02a8f60d06afa06e8aad6caf50dd0a541a452cfe9b3b88edffc1736d9360fe874d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/pl/firefox-77.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "853bd27d468111e512907ca3226f399ba0be48c3332836342ff15b4a8bc4e3253e31fe91a31f462863f9a6559273ad6693f1bf65a1763178aa3488185779da91"; + sha512 = "e2cd51b578f4f92e204a18a3173e0ecf9013b64fa2e30eb9bc0f046be20883c303166ac6978edfd8b7d5ad595b29a51048448f3369cc689e4528d3e186766169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/pt-BR/firefox-77.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d70bde7178c6ce76eedbd8a8e33617ddc7e7271aff41afae4d190e5f28bddec2094c1450c3782ae7dfe8ea7a6b844d50602e27294454946ab5c65a44b3553f9b"; + sha512 = "49296c51a717b8cbfc8cfd9ef0cc66a59e54a77418e9e9398168c86dcf8c6aa7e1c2a3cb17520e0533bd0b46f48aa9ec225e1dafecbc122ff984a509d9b9eb02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/pt-PT/firefox-77.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6e8e2f7519e88809dd38d694f5a293379af1529afe7fdfd6f19e09e240bfd184291720ac48db382308c8d79c38c955916c57bf88d85ec2d220de7bd872954f43"; + sha512 = "b1e3d43898d41b871d7bc72f163b5209a79c7b5418f8c6c35420832cc200689fe47e91eb8e32eb337fe4c40c585109b8ff9c7a20ce6442a0c5b9b3e242790d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/rm/firefox-77.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "928018a321f1c0b86d13c092a5390652fe5d13bc63ee19274b6d3a107e2c5157fc969683e59055a13798c5982c75e02ae0e5cb40f5c94203a052c7898d1ad607"; + sha512 = "0f8397495c89e1221bd022e81f4e73a7e9c49e08c89d4ca997f3b087a67338b90661fdfaf19355ea44ffc9fee1ce8085d51056faec0135474c5160e45bee1a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ro/firefox-77.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b2fe56c56cb25471fd7cd40d9fbdaad10d25438b94fdffbbd81ab93a7340befd1678d904a3629a28c8db6fa10d969243c27b003817ef3c9b38030d6f43f39f9c"; + sha512 = "cc71bb6e97a3723cd44016be6203bd6a7ca385bb64980068a3ba9e79ea83489258c4c3cdd1d75332e62e4656de0294216d4a40c8ac151498127640a3d84362c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ru/firefox-77.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "bb4745d61f87f6e7acae842be9068a7f7b9d9da3c44d2d32a45c4d4a0dcd127e4c98bf5c7cc9ce03c9dd1782e4d9d03f8c1c82a6008a2b9b93b5ce380020d98c"; + sha512 = "956b21a71edd2c7ddccfe74865ddbb96500d74ab2bcab07cbb5fd87a0e3d6d2ae8ec43997268fc54908af82a8ba341062f63fe506b1a05c8f7b4b2ab48112af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/si/firefox-77.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "efa44e8a4e69d10feb35385ee01b171d08c46feffea0d74ea8ee9b7cf21a839b2cc43ff138752c50ad43db1923b264495b63a0d46b5b2e579c3ba61b6bdf3acb"; + sha512 = "c5ed97b608fdbf114a5a265a349b222cf673a78a0cb3dad69a1ea49efd3e4b7a78e77728d78b66ad77473002fb6b03f2c0e6998b1fb06cb19a46ad7885f5ca99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sk/firefox-77.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "3f9e63ad4c1e8a4f6bfac97925e189c9b3888c2e952c1801e4fcf935a246a294f9b088eaad6c18bf7dd93c136579529605bad6bcd95fa7b68c89a0fb087a44f8"; + sha512 = "f3676c620815d50c419b70aa11218348f3cce696e4b94a064a9f3089f01de3b7d4bc5d57a1164a366a5027be4a100a2583f600212bd5748b7bddf3e7fc5a4de0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sl/firefox-77.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "79d4a1aed3c9afab1c1847ed4365ab7e99d0982fdaf09d6d9652b9f95ce3c32b123b2389a1a9d6486e6141953d25c06fac0a06156bff8c2eff6e295c8f79c28e"; + sha512 = "e273703d04d4618706de48114e937284dabea89b659eeb4cca695db8ff2892430cf2155785d5515e2e5b65929e15a19c7a0229969cba26ede313be8dcb57812b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/son/firefox-77.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "5faec58c78ab2acb1fb5f3aa3aabdb9d5ad9df6168215f818967bc2b3575aeee1428ee8354aabfb36b37ed66137f8ca6b2ce9ce5fee0075562c618fc3cfba9e8"; + sha512 = "80cc8d5a7c735a85facde9884e85e8fe75ba84d67f064e638a8d120ee5c7aac5dbc90c78667b698f1fd9a266490b801d47a34a28ea80e80784b5c3793c5aaa86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sq/firefox-77.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "32c67a6ace809219fbd51775c421fa6a68e29bef9e908678b43b53e1bffc85d8bf773e2a5b9a00861b0a437d56ee3ad5ff1cd1e84504a48816cf74a69240b851"; + sha512 = "61ef5dd07356b4185a32bf58b074b3981039d052269739db95e660fd098d8dca3a467af312ceda6435add548678458eb127ab7ee0119754b74cbf9180d9ac537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sr/firefox-77.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ea3aff47c7e428a445aea0ebd7fa98e8de3a41dad208cea39adcad84327d2181b862ecd977e9c7a6aa8fb21cc99ada9698be67c86c5a931b1b41edafb744450b"; + sha512 = "4e3c35108af4cade5fc476f369d81d420ec825916f309ba18f11a5d174b56e38bf36f699a0097362cc925908e0b894b408f99cb9991670ee6d688dc2657c07b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sv-SE/firefox-77.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "dcef09b5dee93167dbe6bc87d1fbb6f0e472db6471b99815d38532f6d223ac7a12183b323b5e979fa7943e4db1fc25b48760caf4540afa111f9dfd0958568767"; + sha512 = "c31d3b258783bb861624e3e6c85550b29098c27ffa98db1d4666456e458122bd452ae3cfa6712ae910acab93b6f2adb1179064e54553461a93dacb31bb03d5c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ta/firefox-77.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "598e3169673ad39832fea1afe0c141070795d54636846b18fd7ccb4a9e66575f779789553550552f9a9786ebe691afb10b81f0d0ba127242827e2d11f941c115"; + sha512 = "3b8ccda6c57242b381e1bd7324a8543c9a2cfa34b559efbe296af5487b4fb5df741a2d1d4dbb1154a87aef48faa7398728ec49744e560f69ceb444b05e9293e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/te/firefox-77.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a1501c3fe46adc0d29ea098aba2800c71f6eb14b33e44a367e33f5f9c705357cad8445e0980cc758102eb7c01c18a79f3007cfbd8d1b9c1ae9766e0e793ec3b3"; + sha512 = "aa69047d97f9cca826130eb5ebdb599a4fc78575635be97fcb58306bf56ed59f91414ba8b35bfba1cdce4e95f10f667cf6d58f81760aa0517c8dc45ecc920563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/th/firefox-77.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1bf0876237e5c8eea321970f86c3878770a3c54c7cbacf67bfb75904fd270ce88252d9844450086e00758cb2b1a0e1db40394246cb9ef8a7018c76bba03e3850"; + sha512 = "31a1ce5df66c1473fa1d9fe0c42507e4a564c1890a8ebc8afbad9a3767bb0c4121bd52335a5f45e0c721e984a4b3f5a639586d6b8cf1546678c57661e07cbcf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/tl/firefox-77.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "5a0f3514e196803d7d6062cac1ec75342ffb49155624a0035eb49ddcaf829dfeaf37f7e26997b31cb85b9e43ee21fca9f7129ab6bf4a065fdade9bdb06573628"; + sha512 = "ce2f1e1bff6d93f9c7bd304fe16b28bc7115762372f1b3aa425bced85036c14dc907eda104babbeaafb70e6ff0d5855b5489869e70627dfdfe8c054636a68ba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/tr/firefox-77.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "8b81e0479b60cad9b97f2108745445f584986fef5521c9ab88bb6ecd48dbc9a989b906122fad29c755dfbff859719c1c9da34452383dbf027d69288a32ea7af4"; + sha512 = "fcc98d0926a69526b029efa575a941a0c271defaf57c70f1a774b187b68b0b9989a11709449bdc433bd0d0f52af047ec5394f8b7f03144aab8b17bf5d80a9f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/trs/firefox-77.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "9b3d99608d163d860d0b123eddd794a2d3b44866e6b92bfc0f06c05fbdb59ebd1ade970850e5b1974332424886edfde04861abd1d47868e60970826846fc5b31"; + sha512 = "d098e4610f3ddf10198c5d800905409273436fc609684f3dfd83cdaa31025cc903d12e6118a4232dd094010dcd86cb3a2083e672a376c0a019ee759b93a2a89e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/uk/firefox-77.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f056c542bd5b83bdfc7b2a8d7234d40b64e88063208ee4b0b1b7b27017ede66b8acbbaa9d835a6d2667a321d6b965002bb87b68e5aae0eeae27aba8dfc87164a"; + sha512 = "a36340c404fe340b952ae9bc6ca854aae10c98a9ac697ea92bfb4d3703ef18c597421caa50bd5c8d73c79c041bf13a1282f1e3d1e98b0ade43c2f8ea865f4b81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ur/firefox-77.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a36a8c25ebe88fcf086fd476619a657b1ff26364133d05b32bdc13cca81b61009c4f1afb760bae961942ed1396b178c2eb3cda9add8c6b502353a2ce8c486cd0"; + sha512 = "83a0e58f6bd65222ea565ffddfdeaa516f2258b8c018935915e90a53f1e56073bef440547342cda7d6dad724fb306444a3de82fb8a40a2cefabc9b250846d290"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/uz/firefox-77.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d07515f921caedca18f7661fad83ac772369a2f7f99d65fb827a0236818fd8eff211dbab90aa9525a6318374b1a2f84d8099667d1957f21c30e9dca35f97a111"; + sha512 = "49d55a9777d2c0357f52724ba8b050490eb8faf9cbb7890de7583e00d3ef0b295070d779b2193be1a243aa6d8f4a8a71dcf394f78af9564cbcbd30f731e8e50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/vi/firefox-77.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "de51d63ce79c249496222658ebbf53fa656916a753e6305d36047a99879b25e17a4ea4ebce1ccd07141cb507a7501362d0bb556aae97d115686d0d38db7742ab"; + sha512 = "409ab3b9c6c8505592dd22d590dba4b9e6c81c7eeffaf58ab5120346a376e175ff8362385ec823ea99084cc603e7b3df243b6b0ee74550acd16ffcfc21b6fcee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/xh/firefox-77.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b01037ce68d8147dc79aeb0d540fe22a06d89ba5cf804951d16af3a896f592a00be7519b184de2f3aca7531d3026f78283b9f6b409c24031faf4859e92bfd1bd"; + sha512 = "b66e639f09a278243388c431dcc42fd270ed8e8c67c95abfa85ad6b40c9013f4ac3d33320ee5ff82af1e82efd7d942733951d2a0472ffc9743dbcec528d75ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/zh-CN/firefox-77.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0e6088a9b32ec76410fc45fc1433c514b1deb9fdab7f5249bd7ab3e1db9e0e5ad4294bffbfabf2f665bcfbedf8234ab64192ee50b34259e4133d7d035f6f4ff6"; + sha512 = "a63da6d53ecf5ade03be3c71059c476e71b96dfee18cfcaf73e953146d7c3da3daf7af4454d6744b0b6842fb56aedb35c547d6a0616b17c3c4319de47b2387c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/zh-TW/firefox-77.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "82042857b33d2dd642c8d6404bb864c79c2ffd91d2f8b342f39d9389e63ca59738b0083f192b607a391cf2fadac056760fd07c2b76a74172118eb44ed5724a1b"; + sha512 = "fbcae8653d1275ee4dd98d6d7e84da02e5447f3699613b9db5e9fb779f7659ed74c83d9b2df2b8128a7d365aa4ca8692df832d9c1b2b4e3586a15df20e867a56"; } ]; } From 80a4efc3bd08341b5f5f02c5d4c65abc18294255 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 14:08:19 +0100 Subject: [PATCH 234/310] firefox-devedition-bin: 76.0b8 -> 77.0b6 --- .../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 c2f92dc1e3dd..39714be22684 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 = "76.0b8"; + version = "77.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ach/firefox-77.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0c2e0175eb3950098d7e13352d037f00b46edd7094e2978ed568d4bfe7c046b533d4c5473be6e28f84baa6eb3aaa6658b174da23409eaf34841ab7ac4aa244d9"; + sha512 = "d5b53535266e89b54bc163e8d3afe8b044261387774cfe28b6dfbe991fcfc3fa5e36c5c37ae0a5da7a5be99a27998f703b851a1d240777764cf844eb1752df6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/af/firefox-77.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3a10b739bb0ace8331190a9bd045cd4de78fa81fd18d271903db6a29828da814454751ff56dde9181786c81ecfc373a1bae05701f4982f5889dd6007ab2bde59"; + sha512 = "e7ec0978cb4697480f764b99e9a61fd1586f33fbc1656dc9e4727920a22e0af09ff2862559566720910cbd19cc7d53af01bda9b8fc7d56cbedddc7cf4d3f0f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/an/firefox-77.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "3a4d769aa9b123fcc5080bc877b6d29444926c5c7f45665e058bf7c4c9a7c87cd3c604eb56fb2a25b4a62a84360a3b6df51d123435f23b921b03e1bfdd65ef5a"; + sha512 = "3ff9772e4daa4ba81e41a08d419ddefa86c697edbea6502c0a2edf9ec68980ea620c76956b1707678c747857cb00b6e1faacfdb0fcc171a8d8ede3a3728bb406"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ar/firefox-77.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7febbf4429c33bdca13b978610e1f996d99e8db90290fa4c4ae5dded909d8fd60e416de328eb4b68b07af6af48b079232f9f85f64f30c751c2f877d7756d0c67"; + sha512 = "05f60c05a10fef0f9a84c528f5d21e7949277d3b5a8eb00c38f56caffef6c139fdedcbf6b894d5cfe881da0bfe1e739a223acaa8ec8dea517222277977f1e655"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ast/firefox-77.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6e6989857228793a3e3492a6f42b6c073c7ea58a9999daa5d88b465ecef5a0123d7607ede7c7297038747f4f0ea1c5fee70c2ff6436c6b7b642abe3f9a72be19"; + sha512 = "9342456d8567600c692f5e91d645465bfedc9c26520e4ed4492abd6c87ac4b5cdf4699d8fac4287705c9af7214b6be31b8823a7042243d5947ae4e8234acb6c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/az/firefox-77.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "391becbf14940922f7a290840519af8ea5149058ae420738bb2bfa80ee057c16c04910f54660ee5eb3bc6067d6fd3b61053464eae4439eef708379bc220e4416"; + sha512 = "e4b5346d7a544821711e1f979b2e644ee3a83f2c8204cd9684202a526066bfed91295a535f9ce7cf78e668a19bae4ed6c75fe6e90bba6d586bdd9cad81bec22e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/be/firefox-77.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c87ec6c520c9b47541e0b6ea2bd6a6916dc5a41e03affdf3caaee7247a8ad51925fbc7208725033518f03cab72a159cc5a75076bb9089ecf85210686cc704a60"; + sha512 = "1baeeeafc5a554f45d8f43b8690d0fb8def76a4f076b67dd02e63fbf5adfb4cbd3e37c39c97f44d2023c08380484e1de43391c3cc4aac8981da1d6a28235f997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/bg/firefox-77.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f50f02c10d5c14756670aac99ccc909bcfc62d30ad7ab4ffdfa2870ded4b97ada7d21a78fe94610e01a448231d5a4b1decee47caf467978b667cd65b31d53dc5"; + sha512 = "5a726c17405ec59bea1617e9c510d3bdc6188f61c7d857371e09ca7eb9abacae42eef64d75b8bb7bd6f8e646a4b299bf7cbe08e3e2689b2209b295b4bab130c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/bn/firefox-77.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "f81e4f057defb28b57e218b74d115b140f595f17b40af00cacd4b46db1f45790e34a222c61551e8f9387c5dc505423f451904fc82adb2e18908786ca0e4a2ffd"; + sha512 = "64588c83d00dafe0df43ed2b29f8d3a4ab14c301d74e7bd035137e54356a0857ff8b6d0d45a3b46c5b33ee704c9e98a0093620443210e2ffa197f93e28ad9e3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/br/firefox-77.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2834602a86796ca65d278ad7e13d7e1722ef6d375d294d6623256c427eaa60691211244bc10a22b48c9831f832a9d2e948e814962464beaa430962e862000c78"; + sha512 = "b0a8b748b0cadf04f205852b4894ac26b50568528fa70bfa1ba7b9eba384864481cd9293e9b67a2fba4ad380a9e4fe9aa56ba5431d228198bdb1a6bd0ffbdd95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/bs/firefox-77.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f4efa6b86bb314f850466d81e8fcffdd6b1fe4f8a372750edeecfda2fd5feb172251227ae8ead7d79bae3f3757b948e45200d779d8368fabc980ae73ef8c7b68"; + sha512 = "633a93e64f18ff4809ae955c1c6d2733a183a68666e711b2fb9da8702afbcc45c80c2f7e5d9c2c53d28be6d487c76b0848238f9ad2cb5738875df8f79a79ed6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ca-valencia/firefox-77.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "ec51ece975fa6e3fd4b3fe508c5ccacc62dc340562aefa8e22a74f2c818bbc81982ebb5d9b0f85a460ebf75030e3d25e084a554ff3ad8ea142a4bfd9b020ad96"; + sha512 = "28fc9b25dd5f4e71b52ae731096d516d1cc7e95008f15d702d842dfbda8c06068347037628600ee40cf16609bf252717bfde63fba6ed13d14095e0ac7eb0c756"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ca/firefox-77.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "84cb922c3b7c61185fee0f08d6c6123efad63730a8be960b2087fd6074ed3486c1ead7081dba0a6cb0ea1799e14cd9a32f3690c31017e5ce2a3d2875d0368750"; + sha512 = "e9687cfb27f2866c510acd79b9c6f82c9ceb3ebf29924532b9677af58a4a373b1cbbcea73f187731ee83fb73118d841dde8b198cbce6df635c717300302f79b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/cak/firefox-77.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "7245add38d451e6dbad55140d9b2aee182df94b4285645ded8713f3c2c3aa4bf4c602a3f9a0a5f39ca091561cabde58aea18be3fe4247c53c742d03dc43c9858"; + sha512 = "385a8392fe634f722d5f8763c44bad55997d6aa3b94cbc42e727344f01247db8897e986a08426c54c6041514a4a99e7595fce034cdb772c8152b806384f6ef9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/cs/firefox-77.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "883a2c0ddd7cd826e6bfe6835c8ff33c135a9bc77962d9f1f67d49a0928ad9172c07974f0681769cb874ae7db4f6a1a96fbc78af3275262cffadb744ec6527fe"; + sha512 = "b63a464459e18807be18bbd4208a5e89c1b10b0c0577752bbfcb40716c494503950077b720264fb3a813908754a792af14d73a80b8a63d6c08210139cec08453"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/cy/firefox-77.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "93b8379294b7a6ca49aa8b454f64de1f2df3db75f47c4bfe6e11e9317cbcea41da1ad8b73564a273c9343b4317329ee96f1f1ae7dee4a61f52b3a26e5790fc0c"; + sha512 = "8d3da83062a45d71828d53d53c25ce4fd84062d2052ec71e8b39460f401101a8adcbf8d735c6831efc348cc45d67580868ef062e6c7b233aade3a155ad036a02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/da/firefox-77.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "6233c7a642883903c1e8054c6508dbc5cee01a5ee08baadc12ff388cf3353d879968a6cad59ea7458e93df9e1520e2a938a30c04b0f2e3c903857275bab801f7"; + sha512 = "7ac86f0f5f57c0cfbe8beb8cd8b6990ed852768007e718b0893623299f99ffdc2eb7aeb16c5f14156bc4d8921c50155d72d53a6c6505144a07520bf0f3121e7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/de/firefox-77.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "41febc39a7ade5843b45a02950ddb1485fca32abd0a0bd8f8e017cf8f1503d4b4b20e7dfaf89e8833900aefad44f5119ec9c8d73f5f5fc7641dd3ae1e5d794ab"; + sha512 = "6b03cdbc4652822846903a3b5eb00d7bc30ae7b330f991d6e03794415dcb011a80f11d8106bde79be5424cb49186c6c67faf2f17012a24764dad6935bd777dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/dsb/firefox-77.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3e4f96d7653f0cc4bec4de6c3eafea64c309f8dd88d54dc9fa27eca90c877d1f026b552fa755c0742a8537bc65a2ca831fd57adccda0c3f5573df95afbdf368f"; + sha512 = "102a90e5ae29c671e1e525e7504263489ed5ed8f39bd10dfb59f89269f66e6e668fef2bc804da188099f00462e54d875793095c905f6e280b1d921b14b9e1473"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/el/firefox-77.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3fe9b14954d3774a389deccbe7d7b1e81c3f50f1e7b7b2e92f8c5bd55c3f4623f99f518e3fc8acf92473dc4c05e2ce316c370aa19d8d39e970a1f99bb9d221c6"; + sha512 = "94c46c9f183b9b7420bda72296f73a3a10b55f0e387867deebf85fc8fc48296dc7a9ab31b4bc5f961f6adaa27c715c6ad827e321e74997769600a4cd1e746444"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/en-CA/firefox-77.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "d57062e3ca388a52485fb28eed924376f6decb324ba0cb9e9af2583f10447a24d129b1c0ae17dbeb9bcac829a4da09870eac22fd8aa378ffa2ca9dd2090292d4"; + sha512 = "0d642684898f25eea963c316e8bbacfe08075cd8a00382238afb12c04884dcb0402d53049a52f9c01106fca8191f0a90372cf0657f17065a781c47deac26b44a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/en-GB/firefox-77.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "62d571af76baad53a699a7e80dcc7c7e60ba87aa3d6325cadbac7230b710180dcdd7ba058b7b502303067ee7fd590247d08278583e188394a1873ba9f5f23b2c"; + sha512 = "f7eb1764711d358091e8687515d0ac8cacbe0ad1c941ea26f97b03277af2e816baebd56027b532fa6bf08e1d7565acd60b023b3ee589e9106fde67e72697bef7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/en-US/firefox-77.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b934ff6b86c84600fae27cd006606b26cea62a42c8c21bdc5472b776f95faaa8604acc9c7072a8ea5aa6bc7fee6a62375b75ca4b34ae7ad83d16e074445ed327"; + sha512 = "d8d7298c3f3d65fa4b6e44105d7e391dd3e7b9883e8d7a0323fcee9611b81c2b856d2facb08ba1f06348715f3fa6ef69ad4d4379f730bed4e19e936e105798f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/eo/firefox-77.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "7135b45b7424650933d579778130484b877766ddc7db83a5c4bf2f7faa662b127d475126d5fd67fffa3406f637128ced63693946e9ddfa4d33d57fe1396f3fe4"; + sha512 = "e206c36a0c44ce948c12c431b9a25403c52f92013c9b874c008c9f051641b817a199f21a3840bf6b85f23b12c6ea3d677232aae130acd50253f0346ecd82b735"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/es-AR/firefox-77.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0e66427df853ba3ba45880e45f466349bd4805812a879e6f654b2a02d4bcca71de27578140e4ae301b3bb329335453ddf3a756be6f49b1e92ca06abc58ff1654"; + sha512 = "f00f74555d8b965580f13af4dbf042d6a092e44e2c606d24340b8cb305ac432dc6502c6339d08d6e0b71f35101378eff90af464e2d3115f61bddd1f8a737ab7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/es-CL/firefox-77.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "36ed5cedcf9a2a75b19de328c5a5d89f07c09e9da728fb3431a31781a5c522b5a53a03fa5dfdcb079ce140f5bab3d7bedc79c0e3c79e3aaf672b5cce3eee2b1b"; + sha512 = "a81f7c5d615c0823936de89b65ca0fd449a83c1a19a8e9663fd77e74f79a872ae17bc34df4aa187d3f75f5330a75cea292e546972b149bc6308538d6df07e1be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/es-ES/firefox-77.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "616477226b52076c86371cf1f1a548c2c95112685ab0e4b9835bef7b8bcf6c0ebb839ed3cee2f348cf26d990bd88b2dff46e20e38938421a6670cf66a82ee3b7"; + sha512 = "aaecd245ae626957fea435a7833f71acedeaa1a84a3434a469cfb379de848975d679aa036a538ea69a096d530ac9016b4266ea970d47eb2e3558e0377db4d168"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/es-MX/firefox-77.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "87dcfd61c3e02515f772e02b182fdd465d34c79dea55d5fc125ad6f32e504c22aa3d7cc6f23a7b2905dc4f2fb73106ecd7c662758d218349fd6419ab889a98f4"; + sha512 = "8682de5d41e72376129cef7b23327bb67e003adc99877d340d52c1e8065a4155f72e8ea297f6d75072476a7107ff88cba7dbd2e198c8ff71d8bba86a409df215"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/et/firefox-77.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "81221fd364e6ba5e6300e93402dc727f9640b73015060d5a3fcb3d0d60f8fd031bcad94c9a5b35157bdb0ee2671fb2020656916fa2f5218d6e5cc1745d47629e"; + sha512 = "5919ccd61c93fccc7cc2cea49c1c297d4cf763266e92d6962b0ce6db8ac74dc00c6306f43978cf6f84b9a41d12be24e0f4104916e0f9b140309158b50d342dcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/eu/firefox-77.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "58b0849c7df2d8d4cd5bc1e076728678b85adadcd504978356e6ac2810a4b1b9d2318e2ad9e056fd9598d3ddc829c16a1ab89102a11d17a8742021d9c8b5e293"; + sha512 = "bb4f98fb9f3311634b26d841aef405959a2035cb90562385c2a7ed4676f8d7a394884cc6b8008c7669cd9d11777e5c9b85f12b20a8abae732012498daea59715"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/fa/firefox-77.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9f8db5e7054f377e4672333c3f775dbec755e6096660d1d642080bd5e9bcd0c8d50a05bcc92bbb357555f60f8aceb21fbffacb019f8b3c901b1390ff3dcee034"; + sha512 = "b413cbffa2c03d511b115b48939c48657fd7bf40f7564bbb2930dd2e29a116e298d44626f5fa244dcf5912c391d1255091c74dece41480bdc691e1bb81ecb2dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ff/firefox-77.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4fcad8469fc5c742e4b4c4dc838da969ec3ee4af5c8c856aeb2afce85e2de7927713acc1ab9c422814d51c1114917e131af7c1a9efb6b91b1e68a5c5b36a3c92"; + sha512 = "f88f87041976109f0e56c3dd7ff526c268cb3465ebb48476b46a7d0490bf7e5d607d51bbc6d43baa8de0e8576bb9c9ecad9d43e494e1b210423421cc6dea0c48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/fi/firefox-77.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a86ca2d70706f2c3aa8601372986525eddd8a268e47fdc7613223cc322fbfae68b86e8041c244366969cc1d5f09db7aa9c6cde9dccbd007fadcffc27b9310cc1"; + sha512 = "5e1eb153d76ae2c2e1d7a48c67de00bb5735896aebe979ad013e6b6f3ed9b3834eddd7a27f1196b1893715946b11b5fbe5f8d8e0be41bedb4fb7f77ae584109a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/fr/firefox-77.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ec1c210cb0bafaaf14a6f8d79c81d2777d228ed31a7a4b1516227ce9c505574a2ad9a15bf72150439ddf32e5e2200f07471c92540d25bff31c6b9b3e123e8091"; + sha512 = "05a238d82d4af31a82c2a2318e04019e158a57bb96ae15075fab4ab86ea5e48e666942422d01468424f957c87ef5d0e033fde2655b6eb17c1d281793f4a1e2a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/fy-NL/firefox-77.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "530c2e803501a91433401445badf6528ccb51b0459028c098d3708a33369e566f679702fbcb50190fc5236acc3aaf4ebb4acfabb529b86a47dceecedeea9e45b"; + sha512 = "6b8f569ef0c3c489909cea62a03a06f0d7ac7a1282a743941f0ce49a74730755710911e022452c78a461a9383573866a0b196c6c7eafc49a208cf4d26378474f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ga-IE/firefox-77.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a81f82c5b4623afc3344eeded3d786f4e666627fbd40f64390dc21b728452cdca9f3510e21572d62e550c4e3b9230503eb771b615c3d4ef77e1a0211d79a5f08"; + sha512 = "c86f575e6a9235a6bf0fe152e698fcaae9ef34f35df2117f751b30f024f8a3dc01488102fd728f53417e9fb2aad97ee64837c9a3230ae351a81594ba5b87fcc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/gd/firefox-77.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "633b05aed902b9a655d22f45e5cb62d8978596e4d9b63f403a3f7f2a7db63b0dd2b9a1e5a82f7c9f5e8231edd15eda1ede415a80d9debfb96fc98058ed48472c"; + sha512 = "b5d84d2bdc14ae327ee66d3fdd7e3af18a5fbb1b8a6ab78210a6ced26170de736c31ee7b082f3d1d3e5506f534a70da979537ddb796b9dae6a108ddf762443c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/gl/firefox-77.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "052141759e0bfebedc42a7c9209b122e4ef4bb15f83ea42b8559d7b2894544e26167a6935e854541082a60dde2b301e17f2fd3a5c659642f6a4c83828ea55273"; + sha512 = "59264bddbcf9249e92e438376204c335ce258182803c6174edc35a8454519b594c1bedb2f80d749e6ea6c45163746ef1ddef9f83203f2f601cdfaa671fedab45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/gn/firefox-77.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "74977e4afb2d61c01834cc63f0d4440012752254ee475f28e80d33c63148b7c43520e141f043d90e611be4268da89103ec6432af8beb96ae243b8acdf4f4e934"; + sha512 = "58ed98592e86d25703283da1cbf5f6e8a4b305fbdd56999d6bf0d513c936c72a0a4c65d9c999b91f3b96e0bfefbf2c4efbf4acc75bda59eeae28050b30632fea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/gu-IN/firefox-77.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "bbe4e976026c98c7f32b83941841c3da8992495122e96954d550fc8263e989539372f120d8b359423ae9fce043e79421c096d8dbdea921ac7bea8133485ad62b"; + sha512 = "ac7ed1e434170a59b89b94f769f9cdd49603bab9efc69c416e5ad908b8cc295ca51985f4626e550f5194ef9c009c33552d5835acea51bfab538676e0ef020a6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/he/firefox-77.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "cd7b957a983efe5cf9c4760f0dbfe35a06e6a7dd01702d94474eccc19b91fe136a3c14c5eb5d5a1dccbf02bece9535f059179afce15c42567a918c40cceba1aa"; + sha512 = "6e737714528f33ee2583bcc37c483005cb9ee7bfbca42af20d0339f7e0fa7723ea1f0c7a028cc014b40c0d793acc7a1e54884c928d2b570fa3e36833573f6310"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hi-IN/firefox-77.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "0a12a9cadbaaab40db835e5986d9211527d175a4724207af1e3ec6a22879a16054f4e9d7d5deb2c428f0b59b72b6f2d2d1c2d8ea5aaf10e20c0f4be1aaebc174"; + sha512 = "4295d972a080e3d9ba81419c70189ec1df1111f1739eef1aae1badad99b9424cdd8c4be87f6116f15267a5907d3e5bbeb3ca87582629f15bd3ca7ea919bb5950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hr/firefox-77.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0d219e5bea0ac4d75fd7b6d1ec2819e6bae95ebdb6766a09e34eeae2f8de3a330b58f6292c3a00e9d1b255e8286858db39ecbffdedf7af588ef393bfc7cddb02"; + sha512 = "0434a805abe9e4df2c159d2ab22a969cee2ea91a1af34be97327115ab8c9202b75f558484e28f03008369e3ce68b26ff42009bcd3532c70352a58714af6588be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hsb/firefox-77.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ee2325e90ff0e3fa5128e9a13938afa532fedc7565cb9d26c016a37227dd9417bb78eca928c9c33bd2526cca0b2c3a6f469a76ac5d7685755aac29f06ef6c506"; + sha512 = "6440f678be4f449c32dc0e6ff5519c86d43b8f5f0bfce2651ad9e23b68fa2fab19905717cc3d0ec1d90e538040a7ac8a86327febf52526527ccf84418adb95fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hu/firefox-77.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "df602af7bc01521ff5c37876db7deb0d25414cdeabf34346c7cdf61e9083a12784ff94ee647fb75fcc9bb33e7458371b137cf3400b4d07dad4064b32a7cab11c"; + sha512 = "5aae3cccccd3a3b99613bcc6d5fca10e30a5dc3995d4b3c912a76e928754f9ce0364bf310f46231c9434f8f14cebadeb7fcee0627ff1201d06b18135e2efd8ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hy-AM/firefox-77.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "774ed56ff51c7ea363c81fc11dddf8e6d54fa7242d9c7dcfc6cc3678dfe032cbd70ca93f014299690ff461da6c8013b946fa9ed170ca755a33fb95a85eb726f4"; + sha512 = "66f34660e5f40a2259af2715ac2c98a6909557fb61fd9fe6be65a920ee0545bb6bad4c2a84b63c3cd6db79b72412a52da0ac8c79bcceb06d4ea12f6490810dd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ia/firefox-77.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "c2513985cd2d6f1d874eb4f28eee05f7f42e639f8dcbc4d2a39d331507cf6681dbaae35e400a1f8e876598e8a633d67cd51b133391db30e36db46f65ede1cca2"; + sha512 = "336f47492e85de44d423d398acada00ea04f43bda923a0cf9dc213fdac84641684624b01187a6ba335926edda91d33cfc1d8613139a82da0370e56d796828433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/id/firefox-77.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3bcad2477cfc42e2f01f5ef1bf3e907f80d96649fb5b2f143f58f6478939694fdfbab33bcd35b1f95023ad39ff807cf532faf43e1dac8aa66ca1e8d95c44ebbe"; + sha512 = "ea770b56f3459169e8b53de3fb2e1e028112346d706657dcc3e5ec8129ca3f51168dd39abaf5312732a1c5c12d948f10ba4a66398062e502f977fa35e335a028"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/is/firefox-77.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f01ce9358446ed8ed4b01297fc175e2fc36804262905f2d5e6732827ffcccf2897d5daaa6464a4ca146fe46d9a1487164de3febb6a222343277cb26492e5a787"; + sha512 = "1bc364cf352d2330503c5ef4d461a09ed86ea40b2bfb3c0988d00ea7d93d543e32004fe4505926b037c7e891a0a9d99240b4d782d8c5aaa4d5b88ba9f0286f59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/it/firefox-77.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "52f23996de3c4cd409cff547348757f48e421555c965a58dc43fa82c99b51260b1ec24a97a04b046f29455955d62bc28a41d67d8087e23b9c490032cc28402c4"; + sha512 = "f5c2b875393965c0b9ba086b41e276ebdbf45c3d895b6fcbcf934ccac00a53ce0239199e044d5713eb001dff8ebee9178f1cddbc387bf2a7083c68e6077ee5f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ja/firefox-77.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "490a950113acbc895226749335d8fbda813708ed916fb79719c0980920401871c632150bd2d88749cffd26bc7d3e7352b6706f379b37d11df6a8519d6a6642e4"; + sha512 = "4e564c984f6626061513c49264d400c730cae88d85463908ca08da2a2a688a1c9d104a0c43d4c95705db67f5d9e6fcd95b6eaea082fdb76a7eb74acec3d6b57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ka/firefox-77.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "12191f6adf723389595e7b9b3ff1ae20c3873b511a021205046c51f29e960db1faf45e74c055edfeaee506e6c8dcdadca7967da4b4421f892a88bc337c6b5046"; + sha512 = "26066038606c37502a9c069854feb84d08c13471fbea50ab1ef78d6dfd216bd981e6570bc954c86c23aa98a421afcec73d3e28fc3df45aa7fe5e413d35e4ea6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/kab/firefox-77.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a21ab0cff70609b3aebc28ce34ab2e6404b53638135667c330915491d8cb5c5ed7f292385e118e03e1bf2b4cfd197ad114f98b41371f5641c02d8372a7682286"; + sha512 = "c5c66a3dea672364f3071095d8852e1e1721bb4bfe9bd7f10074ffd34ee3babc3d2fe447c8b006c3814fe4f2a3b1461d4da6e8ead7a7ba30d44aa7a8c49fc824"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/kk/firefox-77.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "93b2d1d091f9c14619d575eab5fa41ebe5a36f3278fa537f8143bd9fade793859d2d94e14d809e82fe037ecf2a05d0f84ef49c70970d00274d51beb2bc14fdc2"; + sha512 = "ed39b41fa881b9dfdfadb75337fe401f60b39168ae67e438a37246ca773b2eb20ea898e2e09c211319e0d93eca26944c7b54e42e9d9851aeca813c725a93299c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/km/firefox-77.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "184185ab33f3d73ea0a5f38b5e9931201ce3018e5060b72b0344211d11f8ebe9ee685e77c2160ce58a60b61e1377ba28f4bbdc2732f0a3ccef2190ce55072065"; + sha512 = "3ed03e8abcda61c48e13ae70c92196bb422bb9c06dc88045d550379adf8a9e99a03d43afe041aa18bbe6bc9d214c83ff53fe5e90e03f8da72afc7ea8982652ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/kn/firefox-77.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "b0917c696844114ccfeb854d13e75d48038404e1221b13629dcd981b1272f7765cfc85a0843d85957a1f3ead2a98288ae28739da47d1186b762058213681eae3"; + sha512 = "d602152e38626e59053691aadbc972d4c33ef3b68914231f4754273332c19ed206f7358054d8c0000767435d56d4d8723c42ada7ca1ccc29622e9acb90e3c78e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ko/firefox-77.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4ce9e202f6d794585294d6bf664c999b88674d74d2b085109ad48f7f16737e26c89980c76e9d6ab34800e841bce9074fdde6c574b228116056922799369fa04e"; + sha512 = "de65ba5d5ac7eb34aac72dccad66734b983ca7c22f6e71c9fd3dd2577ba595842111922b3ae76379de31edc1dfaf98ae8b7cf6c3f53baaa38d06edeacc21d17a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/lij/firefox-77.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3138f5abddc0f49355c768fa84ec475bb3c013fad94bb4c87a2eae616b590244339236b112f03fe16dfd0b10ccb6d106cc1db0f73a5eb95df7e0dab9a247b496"; + sha512 = "a0a5e3ca1f3227fb583f5819329c84fd4010c1c4df003ad1eb4d7ff6cc5f8434893ccd11d41dfa26e79fae361b225ede07a134d93db79da1754e86715f448063"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/lt/firefox-77.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7080f9e7838c5ac076bcfd0e1192f1435b623c81144f53b1ee935aaa07c941ca8afb0cf399f161496bce02052d069033f6990bc9da16a1ab23f228417935d8ed"; + sha512 = "894863c47261e84cc394ccdf25aaf86ca74642cc020e285f50d78366cf4588b74ec982df7cafb1e9117b042b39fb4ead4ac7b3b79023f89d56e5e172a78a66b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/lv/firefox-77.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c058a8c6b4ea8c48991ecba72cc4c5645410da2d9a8ef9175475fbe906f5bbb2fe82f2c4bcdd86aed73cc75aaa0fd5a2e00a6a780f394b843ce075fdd031f8be"; + sha512 = "44c3bfae1788f0244ca86ccdc3c76c5d0b41f7137f8b1e4c4c9b618af23c21dc2371f7f0ca3ec56ccf174d2fb4145bb89a468a691c7c38609d7825eb1849b7ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/mk/firefox-77.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f64a6373a56c7ee37ccca43708ab33b3e001b477d2ce25870553eb96fd3c42f20206171f46c93513cb328203c4454461d808b6f888260b0c2df76450ba676fb8"; + sha512 = "abb2dface2e64fb60a052da92fa00121024b6e83c94ffc9565ced4245d0e703a517362e023e6b4cca910801e250adf9892d9c9afaa57a765fcf896ab9d043b0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/mr/firefox-77.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "14f58b3f59e68b9692a6fc562888e7868becf95b53aa6be0de0d3ba6c883cfde4b56496fe017b5e6e38a89b0248794408402657a34a0db45eecae74d9ce7f9ef"; + sha512 = "ed98c83187ef20f2f7186119f5d046a71c3dece20be333a145632518def902ba15ca63e45e54cd24f3160030a4208f1873b17a492488050d2c4584c1fc611494"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ms/firefox-77.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "238d2c63d4ffe36db493ef153c30a6e4b33e1403e456d2c02275786d3c13c8b2e0467a80916cb08f4676ed68c94b2127ee9876614909e4bece2577609f027ef3"; + sha512 = "18c2ff7208f9010185853c51a1d6a7915ff73e7dedd64c943be9c99cb8bba32a7f34be1e3a1fcfc32edb8f8f3a5c4922a4b70de1d6b74303f6e54f139303d29b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/my/firefox-77.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "843d4d67ed852b2d0f54dee78cbe3e27ef052537270357e71f3ee0643904c2d370d5e0d25cc2e1dcc150d5f999f2841b963df41c7a98493a5101132dc6ef9a77"; + sha512 = "9069b46c4fd4eb00a8e4ffc15fddd84f4ae4da4521856333dc7477febdd01ba400f27e935adf7eaab6a685a329b866ffb1e6d702d65730040b88896c6f7530ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/nb-NO/firefox-77.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e8eff86060d9f6bc6fd0f13c6f1840c77b9282f8be07177cd6ffd5472ded9b55c3d4e7641a67c655c94fd72a21a100648ff1ccbdcf90b5e7543ac1ffeb604dae"; + sha512 = "ba7b7c4d653f0e33b2b258062783fa8e4c981b9a164b25e19ed1f2c03b180decee989b43840cc5a9deb0a3af50c3b79ed277ec9e71e883cf5273425f484ca7be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ne-NP/firefox-77.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "bb62e672ea5aabe57ab78dd37081922a67ea6471558c8a412bc5f6718b88439afb87debd23bc8e8076b7f0ca20083b79745ab0e85cfedbed024d82fee7a79986"; + sha512 = "e51ebc1e4b272f1125c68c3f22229790c1f792fb2b1a956c4237e9b54fad01b322abf86e208fa4ffcca312582bdc3c6b35aefca22485fdd2d07fe49023c1d00c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/nl/firefox-77.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9e0ffb62fc391ffc0bee82e67c26fd24f22be3c9ab0d14d929cc0ddaaced27facebe49b55bbcb53dad9e27466d22a4edbcc1358cf38c4beb1f846278574fcf76"; + sha512 = "c5c90f846f85c734586aacf0351e7e3eb59d490dad964cd48a4347b462669618b5fb544b639808f2e37cefff8d290cc86b42d9061d9f08f05e416bd9110a4503"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/nn-NO/firefox-77.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ea71229a06a26c13d436662336e5a9b52b290c2094561c3626bdda069930c3a5b4dd61a25f76d147fb152eaefa07fd1e032b7a739b5a2038a2c4360827322144"; + sha512 = "2d696e76864c082ed22a0ae57a018df16e1228d67d309bfc604603012b6606d3824c4a310dda7f7191c2228d0c90b2fb5835d7181df274d4d9dc923d30764b2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/oc/firefox-77.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "f0ca79deb5450984e1f70bafddb2002f81adba022ffd2ae9c68c009fa559253f47a5fd66bb232afc5ed685721c78d7c81335e4e5e898e4a469019f98330bc602"; + sha512 = "5ede6791b2cef867ddd57bdeadba8539445aee3ee3961598817749844b9a2e530f31717f4f99ca351a65fe257f123fb5afb7cd779aaf2fff1850f21448eb9b0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/pa-IN/firefox-77.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6e730c323889c7d889bac2cf7d4d2fe13347c4c9ed6251ce9e3f3825e99248c896740ee24557e9238e8fe4f5b29702f6344ba4a3210279a6e6432ab94774d990"; + sha512 = "3517dcbbbf072f8d13b785b00e26835f78878f1b3cbe53ba94293f08710821b54625e9b4ae7530b484b7959608a1b5edbe6f0a65833d36e5a096e289292596f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/pl/firefox-77.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e48f82f35d338852abe3ddb1abcd1c06c5d401f464bed702b7b649fe29e1a8a3ae25f4a2d0b4d30615340021cc71784777eed114b1dde4a34928159b8d616ed9"; + sha512 = "69ad2f8d573f882f6db512a8c9cd9df65c70c12cf3d9ba77085596462a110f638c16e96892711b1e47ecbe4949236bd9c3a9f9e36a7d9879b64438d590e751f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/pt-BR/firefox-77.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cd84947d36f334740d2bc590ceaf8b052ef90c7b261712eef9c85580ee9d703e0b362ddd5d51ae24ae7bf56e2bddaf32f36081df2717e673c016ec91874f6b53"; + sha512 = "cc43ea037b9b72ae41a5ec2113954698d4c1e255232e5acddc2340d3d6adadf9d63fbdd623b037508b0848847df5c6c3f4cfc9ef03a5a597d54e83a6255ffef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/pt-PT/firefox-77.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6c59d46bb4b740098ec69c7a573233cf871d88ec1f9a9ecfbbf5f38a4ec1977cc7d8c7b9a6ed78dde2a795d6d078a2e505646704e91ad37b09fff564585b170d"; + sha512 = "646da74a56eaa5cacacb7f9d4628dd54e8040a06a3fbbc0cdb759ea2c3e9c26ade0148ce00cf3a4c6359c6e1fc4cb0761b123a0465bb8684f63507285a7df109"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/rm/firefox-77.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f700e667bb8bec958501dffb33bba8cffd4bbb84cdcc9f00ddee78d43676db9afddbdf6a3d9b2ab9e58c10d2b1a2727c47224e6e824f36bcf018f7bf53b45b43"; + sha512 = "bb53b3f1059c7a30e9dae4041c6a265a91cae56bb976d8b6549a5daffebb1448ef5bd24f0ce2c65da3808265121288a3b4147f657c35436eb975864cbe534587"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ro/firefox-77.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e40a8935b7ad0b0656783023c622dc357921eda21583b1ed46c85a7ad2de8972167196764e98f75ee0c15ef046ebf09c99a2fa4613106c5302de8a9ce6429b97"; + sha512 = "c2a6cc5f8a33fd2f1b2c5100fa50d170034c0dd9422c01894a8977b248ccc43a24bb6d8c64cfe6e9a82020c78ba5dce7d497c6679cbd81a72ee106221d328fd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ru/firefox-77.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "780f5df88cd75c306e725a48aaeae2b45ab5b30342ad74f5ce521f10dcf6b96affc92693fbc0dd1e95c927a21ec26e2fb9cfc74774040656459f2a7477520d61"; + sha512 = "10707d81c98c9376acadcd5be8b762d464b5250e477a71cda3abf670302afa7c2fd64a7b2527702c7501ee25a7e1d534877286ce1622bf99bd7f045c99576b2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/si/firefox-77.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "59a20ec7a102830976fefad4f87fa4a59ce723541b069204c03728e4c7f19cddfd74e604844da72969439542bb67e404cf5d6a649372f85250cba4fb8fb42d7c"; + sha512 = "2dc44794aabc939f525b4ba91ec9caf53b7a4dab4b6765784774d40f47f54b3795412dcbb21bd20b8f72093c797709daa15ece01554f7f425bb7a1a290dc0c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sk/firefox-77.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "56c540f1a5d46f7e67cfcf8c6197febb7e7c4761bdbd0d4250a0c79671f84ff87c3f146f549c8dab85392c7ee94d59a4fa2101d5d8b9c7379b0f39a24d37b5e8"; + sha512 = "7a2ae01b61043a00995dd987892a38117a0252d1e8a133fa14057aeddc99a26197fdd47ce7793b4d20f3e015cdbc9278818778e8e7c5273748f102de724a7faf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sl/firefox-77.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "af3c4e96ca34c177fdfad0203daf1a85819e731b4137bd7685ca95d33583a04fbaf54097777c571fdc0ffafc4748f57b683cdf6773177ceef1e6ffe764f780ed"; + sha512 = "d2cd03f1c35a4e3c4b937a5c77929a7e66b8113354488efc7e4ddbd24b0c08e48afe3f99e20e5e96a941bce0ca5185bbf199415d4334c120ffba5b6181782f14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/son/firefox-77.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "045767b189c1f8ba26bfbec61f841ae2c66c7e1b35569edb26ddbfc9169e1cb6122237d83808a87e3bb3ce4a6b1f080a9bd77bd6f8d7f731a87a894a559cab1d"; + sha512 = "3ac7346e38278b4a36871833c67ef5f59c681d2e05999fe8282abf5c19ee6ee7cae099870353bf58a615497d887c54ab3fa34489fd3e5642f26d4c306698547c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sq/firefox-77.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4126eedaa46dca25e491e74ad788af4ded93127061219dade8be09cd18d807b4df549178c4e1d525ba1530ddd50dc4c6e35586e7762f550cc0381bb7d9c2d7ed"; + sha512 = "4c09eeb7a3f5d41fcc6b828d11e3aaecb41d9002cd48226f2b4bd5e7eeb72969e3b52e196d18b53be8f4ebe0af3fda9e569e2ddfd4116958ae30e9db81e0ada6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sr/firefox-77.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "60ef4c3830baf02481d7371d4a55ad8da7b7cb059c1e7171b3aca0be159baeb287b2aeac15e0ef0936f452a12c8e6d2570f50a846af7b87f5d8e1779fcf8c8b6"; + sha512 = "30cf682895a49c7a8445928b553d1fee52e6ac6a69fd0e52d83bc48e08cc78eecb49533943a7b3f8d8be70c9b210756b5ffd0698683edc44097f87294624401e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sv-SE/firefox-77.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "354e699c53e9b9e0a803824a4f5d00fc991adc3822a21f5842a1268e6d028c89951c943aa2461402d39b7345487bf74c73bcf1cb49ea2acbce5a24a49ace8b9c"; + sha512 = "f19635495ba442b6ee73d951962fce2166227978c7c3d2c27480b3654915525313a711c31402fadd93d6441c7ecc74e44f1d5bab85e05bc73a98060c216f8261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ta/firefox-77.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "ada3a7ee976f82841096b9cd80fc1af79000833cf65971b3c141f70cb9ede5a523c6e7e8f6be36d6a175c7b1e8415f95a84553d21b35bed90bf1865861ed9d19"; + sha512 = "5fe8e924435a8e6cb997b63204464bee269e07e3c554f60e8679c69d8dbe3153713ab3f815d2b9dbf504dfe2511122bb301f08d43123938d65ee9581691ff11e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/te/firefox-77.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ec9d5f601856bdedfa4f005692911e4e9a5afc88d8c0a5551e507ccebe28f2280b2ee3f842df5255e1cca5b1e35308354827d8c6006c593366a08e917622366c"; + sha512 = "e2a5e369647e057a91573e156d48973663e648efe85588c78d9c596a58c32bbf58fd3e9cc2629d4ee585539eb2bf009cbdf046741ac9c54126c7a39a8b2fa5ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/th/firefox-77.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "e939d4888cb59e0a1f066c641c213bdf33ad56c60e73eb7b97983026249b223f2465703bf8df931b6b844ced18a8703b77310ac61c847be054eb83b8196dea6e"; + sha512 = "60e8f03f36370874264cd6f5ae893d1c1551cbbe440405c6a8a08ea1f56c350ccee64c4b2232f977e280c2d89d8a96916ddcec7a26cdc88f8015815484a5c9e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/tl/firefox-77.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "4f269b9ce6f25e236f00374e68438d09cb30107babbe3fcaf88312b7abdcf8d4a5b619860e3e4010f367b341646cc9de027ee094f175cb144a00bef47f427806"; + sha512 = "8f97422c00f61bfc5ec2c3d1ddd43da137dad7eebb8c122d06e6341e1e0296434224235322e72e6c190ea62bb71d10fc0ffc40a2fa795962c185f6e1a0a727fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/tr/firefox-77.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9275209304112ead1c200f9f62386de665922bedfe8501f5975a7598a6ab19ec6941fa61cec4904fabf75d76c42105f7abcf86d91c746b609bcbc6957b8c40b5"; + sha512 = "5f356c44a8a834873cf7f81bade31540e14df73741f6a12ff5d730d7efec7138cab3da86021f4b6da7201ec93df638d2ea0c7c98c5ffc96b750b4a01012ab153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/trs/firefox-77.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "4b06342ca02d40b6bf9de58e50d29ff2ffd3ffba60e79b6aafc7e59a1ff8bc28e1d32ef6fed7ab5d90d5224fb98ea11aee57c758938ae84015c52202be97a300"; + sha512 = "367d8efa0844df1775058a1ab6ccb90e0d16114cbcf7e09441e92f7d1f46313f815277b205589a5a117083d1feb371dcac153251e21f06d16ad9dc094f9548b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/uk/firefox-77.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "02189417dac9ad1371fedf3a2909d3a1cb612566d653255a58402dd79656a56fdd859b23aa7b9872a928d2ac088e96bc9d24d97504ac183d6e3c7baec8c072a2"; + sha512 = "c26ec2172739c98ad6af7d2e4cf09665dc510ee63d3dabad29f424ced5ead94d32590f5e03f15341551f97d90a45eeaca00430adc4e025ad7c5623d1366dc053"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ur/firefox-77.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "6a629c7c06883c0cb3d62f69d996c6778a0929802bfa086fded6f7b5d3572e615f6280a68b3343c43a111c02ff6b18f77ed411029ce9c6084c98f418f9cf5fa9"; + sha512 = "832de71b4ae0165670d1bccef2097fae42e7d89fcefb2ea530438ef4a272050fcf5c04baf2a2fc9269b9fa787030db2020f1055db1ebb2fb8b0669162df7ef45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/uz/firefox-77.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f890c9c046244c476250ec89821f5de5a2e0a2acf12be2ece12b192276163dd9c86c046e8d22280592fc0b22e799b3681a3138a624564f45e3ce3e17dab20119"; + sha512 = "80846a4c808d61d99791da0149094c17dffec21ba4062148d69c635908042271979b0533bbbc140922e5a20513fa0bac17d84b40200159ac37ad1f12c9069733"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/vi/firefox-77.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "360cb88f79705ac8b6e50a52ef23b10923a15c952795f1bc885cff09d99e23f200b7e67ca8637fad0447abfdb07ee9526f26ffbc424cc6c9bda399da0e4ef0b6"; + sha512 = "ff11a27d6bef77de0af477b6f00873ca32f69ed8cfcfa05be2a09c1176e562fabd210d46aade91c82f5b05c95ee5148179b9c3d244ebdc304c54688a601c17a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/xh/firefox-77.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "03cf616b1bcf80c2dda6a6eba15f28b9e5c8741aa37c383c3b16b6f1ddc834d51fd144ce3484709335e06119769bc021da6d1006cb385929451d6db1f1480a4e"; + sha512 = "dae063be0338c64b8374bf5f3b1477c6b490cb407c39cbe3858d78328344608d0257792361bcf319585aa34f826e80ef96c471876912f7550f7abd2787dd6ec7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/zh-CN/firefox-77.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "de16b1013dba1726a146c3212310da5e51f6dc706ae1e5fbda60e1181ab19510a485908bad50b6a4d87ed1e56027627777bb005bfc2a5e104df9f7d1e95cd7db"; + sha512 = "b1d3609a01c8af6da1feb6f9fd50068a5edd0091b7540100743adc6ae61e79f7bbee8ee2d3a49a1f6ad4ad464b03b814de4673eda88061077101ee0bfa0c7b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/zh-TW/firefox-77.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "15826e8a03c1c0496a7d9ffcec580f283b789c594f6dfa64de2ac8bc86398d2cd267a84a274a94063d980cbf984741f1754c644451dcb1e56d06c1c8393d1294"; + sha512 = "3e90568d7c33866845b607c739a17d86e263520ce839792c655d323690d005395de65aa2463fe0d94f7192045a8b6c268ad668679d46fbcc0137962405fffb9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ach/firefox-77.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "619cef2ed7c9a8fa67723548aa826926f0dbe34996a1c6132571173a15c15dc7a8f9165296f4a94e1b8beebf67cdf79c388fdc898a013cf25985b4fdb4a5c200"; + sha512 = "55c69f623fabdcdf4a329c90b3057d9afdc9702ca7b068cf8ef830359c20360355057b73ce9b06257400add540fea792de931ec61e79999e82fe565b85b7f13f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/af/firefox-77.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3815642e4bab2ffeab6208d9c6901c80c89a42dc8453a97ff288da7847f033402bd48c0eba8a8e62f0c696fba75f95e7dc9795089894e99c70306cf4e40d37fc"; + sha512 = "5cf97e176a3430707c20f8ae112eafa2f2e12edb5a87711b4a0b9767a0877df5978f9a82403931f3c9db0c99b3a156e2ab397b6fb767bc073d3737658c378b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/an/firefox-77.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b6a740e7273be146958a99a5a4e16f7c1c7e21b8df76d22473c6ca16e510d7f37fd9fdcb672c2d6ad29aa354a20ee3a7c5a9aaa03b9332ea3f5b460e7d271565"; + sha512 = "f0bff20c46498775b8b3e5457cda3fd3923d4915b8036c4804ec57216f171057f976663441dba9600d453874a462c3c0862b401af5488a487173049c4cd8c6b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ar/firefox-77.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e3fab302b21d5f6de8b41faec14cfd842def6f2a65259cd8d5b0b481fca33bece3e7fa4610c60013153b676dc9e53d790734d27837e4701b393e322c5eb0f602"; + sha512 = "629527a55abc13a3a90269cac9cc589911788026e8a0592c52ac37bcbcc470099fd09f2243c70db6d016ed33fd90c9f8c3875488b3b7b1958a18f6fe4cd1aaaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ast/firefox-77.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "28f62c0a906283c1ebfd47e598918349c066c33512d3fff2daa44885faadbfa8b00309254b754d758d86acf23bd4ebde9142e56302c23ffcdbbe2baac6fd6e47"; + sha512 = "e202db24fbaf57ed0f617b906128dbc668167bf389fb7df1282f620c50e7c2b089e804b9be69fe14c07b0edf92ad1b3db1ba01c7ffea76158661b509da3b22e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/az/firefox-77.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "c9e00425a869501867f20b22c85e72dce9798437ee8afe718eb21c06acadd9d618d614e25463f84d0a31901261d92603374f9b2b91879e19973d50942ae6774a"; + sha512 = "2f6c0a261924556caa90f57a43fb36eab585288e78b56687836e151c0bbb1d8e2d7cd66c8034055293f44a29c939254f9d67097498a73c125460d814dbb88857"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/be/firefox-77.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "58811c55d4a5f41e3ef8b378c00a9a08adfbb48294eb20c32dbaffd972e1df1ae55191a8ad5c4705002f07d3b7d3eda90ec759b805995c14c29fdb8707517378"; + sha512 = "cd22c3525b21b467900b09d9dfd45aa9caa7bbaaf5bbacbe30d83676536f2960e60f81c09d6acff953e570f1608081fb109daa94dec294f6d5456dc86ad1107b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/bg/firefox-77.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "428b34c8dd2c926dbbbd2a8ccd72ea7f023e5fb0e9cb664810d29df1008ab744eeefdd34f6f6de1596f3fd7da9d2e3b23d5c216c8a9ac94b96aefe5fe987828e"; + sha512 = "d2ba7879dfaac25c82a2da9511c56cac309994860b46f4c45289c254d34287682d1f586abafd2a62de7b31744fa2b7a1931c4a78e558ea0cfd1883fe620cd76e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/bn/firefox-77.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "5f1d54165939ef8448a5abb734f8bb914626964493e9ace1a483f5d6003c0fb087e6cc1d76afdc15c1fe563ec64f022233204be92a5705d8456a6cf75219cb4a"; + sha512 = "5db7b7abf5a036dc11dbbd4144562bed1bcfa3770aa8e59ed1c4f87cd6c3a1ed9602121d83d38af5fd44cd3adebf3689f1bbb9e530c55f0690c441f074afd126"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/br/firefox-77.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "4eed64845ca603e21de1e60632b7d75e4bff5a5a2af792131de4141a2454fc8922109f67c13c9cd97032e3cb2cfa4d5a0ca3cb3e64faf2754fe44d8a161c464e"; + sha512 = "468b47d3d8db1080fc3ead510eb72457ffbcf38c11ffb4f9131e2b33b84b7dbbeebf78545b15992b9dab4b70dc12e506a623e5d416559708b75f90ead4a38843"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/bs/firefox-77.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "7525926461a5e89d4aad85bf3176ff36c39fa18131ead378ddce015688830051dcabb4eb3dd05922d84ea2fdb666dc8a2f8751c6bb3405b4c6e1f7a5241dcfed"; + sha512 = "e5334b61e7ae329ea7fe6d4548c2fcbc7dd6b8b3e4536abf0b416b3ed98f601310cb72d28abe922584842f8fc2ec310c80c6d0865a887b2ee74c5504edfc3de5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ca-valencia/firefox-77.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "3ccda6fade937406e9ad8c609e1cbecc2ebc064d0793e9facf3910569ad5f8997d8e9165a60d59de645d29bf1411a439904af504a5daf519774bcd76a371b567"; + sha512 = "56a051acbc2f579b0d788fbdc2f1a86b109af8ec55cfbf1050c2180f0111ddda3d95caa84bc31cab1392508b1a79433d369b093d669298b521740613b214fc1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ca/firefox-77.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "d1a6c8a42fb947547d460d8d244f0b091f609aa3590fab7a785a5a9aebffcbb96fd6254797b19ea3b0bacc8ba086db210ead35260cac69d980432fc0a7a7b9e1"; + sha512 = "f9c085915ff628a720f676ea7fde9bc5da800494fbeb049e529c1cef96edab0a37aa693c74f9751b187890ed6580e6f6a47bc73682d8028ffe9ab7bec1a6b8a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/cak/firefox-77.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b0052bbd85357bf6bd3d550021013d3f97cde943be85c08835e9d51b829f9fa66fb3a34937f806552373bcce2f36d949ea872f0eae115e7b1d13382502fd2c3b"; + sha512 = "98d0af8773fed2b326df37536f953f42d8133c267a7af684cd60ba494510ed94e0cad851cafa7c006bc4ca11a53555f80c2510083e71b3850ab0e9cdf5213d69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/cs/firefox-77.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8f8f91ee726b3526b0d375f6075e466781fae463e55f8e7140b859e4418466c3653a3a39ef69c5395393840e8d09188d1be503ef7ac9cd2f34bce7fb6fc8719d"; + sha512 = "c0d71a84a7ecdfc3a0c6438a00295ffb71b6c4ddecac585ded3f8881df80be493efd80cfa233e78ea043b6979121f6f46c87bfa25de5f1c518e6de1c6ce5a279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/cy/firefox-77.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "895f1e28b998d27c99ae8cfd8f6bdb94dc526d5dfe39d537e5ece92a76b8ea3a9905197c40967e7e90bed60567628dfb23219843dcb313bc65b8dc1300dca51d"; + sha512 = "864da121f9f79c6b4b6a7ec4c2aa19ef14e89aaf30ace3d67fc354e50baef1dc74733743ddfc013d946f2ef8e1f73d691d7e997df81462a13d48f090eb116d7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/da/firefox-77.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "3b206e9d0b2fea0fc445617fce9c9908d0d4ca15e68ac04fbab74dbb7239c986de7f5e0a5ab601f25b3481a20eb9fe1f39aaa535ba24fd6e1c76fefe81e26474"; + sha512 = "1d10186f68c1df5f6f2a4380a9deca3869f8e9e5db1f142e4788596760f0ba59698a4fffe4a299fced513c6aaf289536f524beafc1a88a82d48f5d7fc7ee3ed6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/de/firefox-77.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8a9293278b5a426aeb3f1da45fc5c8d8508297a81534c33ed3d032fcb0a0c67eb4cac72b591f4fed9b159934b1e3f84a6996f665ec7955f37b6acef78886ac3c"; + sha512 = "7fa69416bd4080127292764f24e0693691fb02358e81f0cddb00ba5f235a167d779d5ddd954ccf87072cadfeed956a698fd9f5223951c7f6352177e70b6fbd48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/dsb/firefox-77.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "edc302624c544c455f1799b271b0c6590131f0e01e4cf1691fb8f6fa3b470ff9a5b4db301ca87ae97ede4482782d802e24233d20d84dc8adc2b18deb25b249e5"; + sha512 = "edd239169eae85f1615707e3a0f6367d0d893a0cc4d0666fc1bcaaf8899b9d467362c43552507be1e9c7bfffe278d6a6a534d64976927498381c54640e92f7b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/el/firefox-77.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "98259fefb0d9a3ff9d5e80afe251cb001c767736887d6c342d857536a031d013442a271b3aeb1c227c789a5695e134b31a81777ca7d13249451bce4325bc9a8e"; + sha512 = "f3292cdbda00c7970a4e2d5341f12369fc70da6fdd153f1d5e2ed5c4f5b2c207b424856d5db9753b11b421bae3cf75a8cc9d248c3f3a73ada4d258dee7e55400"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/en-CA/firefox-77.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "f0f8d81d0700d8539a9697001a9bdbfc75a36e3f4a1786d46e5dbdb77f61d69df10097040ea8e5aaf722b7eb578a58300c2feb32bc010443fdbd2e5eeef1eff5"; + sha512 = "daa9b2cb25056c80e0174b7fea98e3ace4141d4e3d45e30615961e1957076a764ee9b14d192477613fac5c9a7e14782e281b4ddd676db4813df89d99f6c7dd59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/en-GB/firefox-77.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "97994f92d574726cf0553378f3a0a90d32cf92b8810b33a4c422355ae5dd5ce7f411352f8f45311c24caea005b727a2886bc60589231608604f97dd684e5e3db"; + sha512 = "1d490b1b2686820ac1973be1c435bb058ddab815a372c3dd08e21c2196860d672264010d24e21bd3dc3678659bab9921d588fa42052eeb0f8f8806b5bf706885"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/en-US/firefox-77.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "8e212c9b394d887ec8a27e47fab45f15e4d179b82332605360a951fc4bed5693be1136bddd8821ecbd31aca926a1277cf9f1fdcd07e365ada5ad35e19c64e213"; + sha512 = "0c2dcb2b9e2c20f3ee78d08b68a57b9d8001c8b2b963c81cc03584d96f64a1c759d1bbb480f1aeb138c6bc636e042b49d4f46d9354587837714311bae6e195da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/eo/firefox-77.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f8ef36d7d4cb44a170fe575d6bf94854549eb311422ea5c6ce9220f6852d76c7d1d9b65f8f959526b6d91e88b1dc34bff6f30d8534fe565574b78b045a652662"; + sha512 = "4e37cd43ec8f24187115a1545895b50a9f665dd2f36a76a35dcd673b07ae8918381b718dbf1ce7b52c469729c95452e6860cb6b815d7297717374f9e4010c2fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/es-AR/firefox-77.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6a6a67453a7b48f635b2ec0b6fd34ded5d1624a375ff526ec1693affb77d7c503215d91a29c0a266228f2f1780f0f5e6b8ab215e810faa8eb5bed5a36c998975"; + sha512 = "fdf9db53605f6053351353d13f22a0b5803340f8dd3629b9dbad48afb6cfaf881dce7c2595472f94c3e293124cf9759626370e3b86dbb228f79040e235830ece"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/es-CL/firefox-77.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "7755a4cd53704f28a137d8588a969475df4ae444e1a15591941cb409528deda93b45bcd4cc0d8a10321402f01ca8439db6ee0d634a1a50f964d824e61cdc789c"; + sha512 = "5003551dc6aa3e1addcfeeebfb5dc90c508acadc3dc0e285a2af4b2f546494d1053f9206bea2b0312e062008696a11eeb37c25a152d62a8d687f768e5fa0fd68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/es-ES/firefox-77.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "88b173d9b150f4973fb59d3bc51c3cb5f9e2580805310a73f2de993f6cb053c2c8a09d97c6979a7a501610d924a97ed6cd848325ba5142680c2e7e83ed026c37"; + sha512 = "6a1153f8348632b4dbe33d7177f2bfdf31dc8a4000fb0a5103ab85801bd91d8a267a5ca8492e01aad521aa913a99a9088883408b56c52e5d20d4c2f225e8197a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/es-MX/firefox-77.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e84b113f5c8a4d5a242c174fb5752e23be54bdd79d19926ac46f29ffd7d0d5d2d35a7f2aba68967c0cf0a352a8bc8f5e7ff50883a1423a99d811a260323475af"; + sha512 = "c442cce18a63ef4f8c4973d318a93fccd8335a8d9b1fbbf7e57390de9e1e7b465f1fd086e8503b139bdf083e1353a7cb22c20d9e55cdb80aec41ea9b9ca5cdfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/et/firefox-77.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "6618cdd88ff48e3ab9b1d5f301d668c5ed1e659c3777cf1d87f7fb33c8698659766291b821f1fda11d13a72e50321a48afdc42438f96a8e827b2cb6712a60e66"; + sha512 = "dd4568b51811e6fe499be5e93df687aeda145933aad2ea18673ec3a279ca061ce394e1675b62e461a3a1732a857806ec3e28c21c0410df660ae86857fb5c5f43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/eu/firefox-77.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "56488e4dc90422b1df30265dedfbb2d0ed9e2569b989d642e83d68f71be8e5c45caa9e7df0849993b7763ed91dba937a66231288cc821cc753e9631ee1cc6118"; + sha512 = "d96272913159221a8b166984e4a556311aa9fb8ecb5917cbd7ca50869fadf96d229a96cf66f0df8b4cafb096a9ffdf03bb5430d5f2b88285c6c921dff456f0bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/fa/firefox-77.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "87c044f5b2e86c65f03b164b4875805c01fdbeb8cc1f1a431c3e8dc1c5f7cfe5e836e2c32cf4a6a26621c3a9f06a831edca828b5a343d8547e69684c6da23924"; + sha512 = "02b13fbb2db4fe8367c434dbf4c67f76655736bdaf4f86ebd96f756e117045fc547ec6c520433cfaa5a7d85b1dd47b88b37ed13c0762ad4573ea7aa8bdb6f37e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ff/firefox-77.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "22722fb25b81ae05faad99a81af7aa21489c0fc031ce039c7f917f0d329160748f7ee6378c53e26846c466a472b19f88fb0a71080b37f16fc036f4199b75f67e"; + sha512 = "440a3e6cc6ce4564c3b6548b3823003c0f350fd323c3d4a9fcf7cec8e56f0903f9789362f04e14669f2ba73b752b77f63d9ae58db18e681ebd48b9617ba54705"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/fi/firefox-77.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "680e8889e1b4b162118dd781cc43a928ab07359d31d61f0e2053223d5eb858d24a12a81dffa3ba562428d958940019b0a775867553cdc5156d2c380f1ff98d13"; + sha512 = "314a58c6c7a45185612dc75cdfacee29e71729ddcffcf36013b3269814d63d78ce53d71929d7ed728c68c0e04e4f7e8c972cdf289cf802f3be86026f7ebcb57c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/fr/firefox-77.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "45d39ff9ef3de3229e1a6799fbbfe8ea9e773041c9f98998aaf07a41146cf8a034a46927df8003d953ecc10ce50b375b311fef5b3cd532952761b6d05c4316db"; + sha512 = "b747529f86fad1141523e8d4d37c251061446790282ee7326197c06aa3f3a9b1818fc6bc21b752928463d8ccce28fbc1072f2f1a10acd95484aa62b4c2a7eedd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/fy-NL/firefox-77.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5b6b196fcd7c1a23664e10a0351a5f13e2168ede27627a1aa66a6c6e586095c47de071e917b82092f6df72540e50a93fa95e0c81e0e06687517622ffcb9b8a6b"; + sha512 = "7995d5af91664d55f8b4edbb84cebd1d9dacc0d4bc7b8d3e95dbb7a5941a18bb7be39b0100ee2231f318eb238780cc59d8c67939f8bd96353b8464192ee836db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ga-IE/firefox-77.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "44d1554d851e650f2121183059625f3c8f633c50b309cfbad2cd0dd3b3c7cfcda33c8a14ab74fbb3481725c530c5140363dca573a4e686d6921974c191da093a"; + sha512 = "26d2820c963ff80ef1953d6519678367ebab59cc551ebeaab95181d05221f340de902bf46370d04d2750cc256dfaef38c3199835c74982448d0b0ff9890cfb53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/gd/firefox-77.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b8210e2afd5f13522dd367baf6724a0982ab0a98b548b1f2e6fc3af93d704a4e5929ed4e235f292ed666b6064beb5e1e463d715c8c14bfb47cf9b2687e321b1d"; + sha512 = "997b1410bc88cc1b2e5139b55b8c90c5d33b2bc160fae5bcb5395690c771b3c7047941159a54715906e2bafe7dae48b4985facfb032772a1c3b9d35d5bde1940"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/gl/firefox-77.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "96349751178a2cf264e1ec27c74ba725d2c3a9b54641bc4964e5d8237d3d6b6f98c116d44b883aad132ba7c4962c3c1b471fec08394e969dcff42598fdea6841"; + sha512 = "8739f296bc47bb7160841f2353c1ae43276b16bd4f81e55bab0a622aa810dbb83cbfe8ecc644f83102ff46beb2c8f10d2decffed86903bfead2906d80151b418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/gn/firefox-77.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "61b270273fae12b485d93707d358e5a3d7a9198ad147e31c2fac2465f65c9d6a803326fb042ec0a6de2d46cfc61e505b09f6093a7f62e3dd69b8e44e017d7b26"; + sha512 = "23e33de0f0d199927f208ad4b76f06887956ba6a8d06632d12aee55ba194fcd999ee90459e89e32c5133d01aef412451b29010805ff3bfbd25cd14eeb389ad6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/gu-IN/firefox-77.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "52e497831de58f7abb221b4906f0fb64182a04a93e8d7ee83d42a1391f029e4873dbe977b4e8a405d0acff537d98504f659971075b9b76e33c09a46607a6106a"; + sha512 = "a377f4e18c6fae6d008e705ae3e212e4a113e3279d3bb94889bbf60ef65f733b3526b8492e84ed4a1cfa3d55ef3ea22f9f8b43e1e7c9fed5590dd46c2353d17d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/he/firefox-77.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "8212b67f9447128a4cb9ee0864c50d07fd3595de15d8e3c6bf4a8f3b19bd2288ea1f55b7fe003f75249db6de0a8aa4ad6962b2913657bbdfbbf282cbc14a77e0"; + sha512 = "1f76e6217c36ce100d046fbb18aeb510f688aa87f6a23558f8e86667d79f14a5928948c38629c96e80c9643de65f325ff76ed9ea36eccdcb89bce84c5cb85e14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hi-IN/firefox-77.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "61e8954d14b9b7f06919c23d60eba00213c57709a5013c4a9b3376f7823f5eec262ed891a24857fe5e5efcd0245bcfe474c3838f1463dfa38427c4335ce7f1e7"; + sha512 = "f44aba1aefc3707c5347083e1d44dd538ce68fe09a3ca1bb203a92a2b42d67f138e4727da89a43f322d17936810342eb26dba134e0c870a1b1c6b7776551d91e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hr/firefox-77.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a58c582cf0a9dd154ab53819197eb4c84fdacb2133e59b367df5111a5807c4ac63d1ca0b2567fa218a64f570b19dda9b70b13a2c15d2359cdf962f241d4ea275"; + sha512 = "a58132d1e512a5e2ee2f98952f8be3323fcd15be906c97f72a52c501fada75afe57f2933853f5c649bde0077c80818d9e9d8a0fcbae75655e348dc72c52cb840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hsb/firefox-77.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "fdd4d7618fda5b950fcdfba0c47c27311881bdd62d1ba2028ba13adabb4beda99351c97a3ac0d3e7c1d9b9fdbe5e32bd04c4863f24e76144f6b21725a5d5d8d2"; + sha512 = "3abc73eb9318eed2f26828bbc1e9a5409efa93722ec7fe8585674e65b05a3c93382890b6f1f91567fa23d8089badf72220405968c7e5d5d44b85bf734933411d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hu/firefox-77.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2d6455843faa19b8fcd401a897eb03b76bcb5da784b6aa8598e88d1b3d44ffbccbcd01d9480fdfd61039197f8e6dba86353e400cfa9537568d81debd31428c50"; + sha512 = "666d16044ebabd1f57a917e5096e75abdf0b530c9ce367da14ee7d25fe74ef8f347d2e52efb21b0e11bce97d5b8e2845e770586f2bb3277b712ef3c9dfb7d5ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hy-AM/firefox-77.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6ea49a50bf8e22e6caffc95936cadf3e6373b131b10a5a96faffe786a9a9a4ca8737600cec76c071bab4a20f7c05003f25d3f573af6450a5c995e08e3b939acb"; + sha512 = "bbc062d8d441820885818cc9e5aab8e8bd203e1ac19bfebb51a08dce96a008195bcf7658b341ce0bba425b20b73d6bcc1176c48b624b000b34f78261ba89c611"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ia/firefox-77.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7f5bfb9d4c7debcfb8a19c59f464a47af4f729d780b3940420326303d129f93363a6b9d606285d6d1e87b51d538b8573911356be2318b72e9544adaa0c64cc83"; + sha512 = "5faa003395ebae3be88cda49a6b313629557d618e5cf2b64c46b8b75edb0d3505aebb00178f64780531549d8ff05375a030dc713635fe8ecc217d70e0a6bed41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/id/firefox-77.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "f98fa51506a9c5f8da4ce090778eb675ab922970a94f7fcc93b2f0af20b08889238188f8def9f001ca757b68cc321f7f023023b53c2d2c1f87dc645d9a9489a8"; + sha512 = "058ee553514ef20a732b392acb701ad3caa6211e9cbb0b6de1ceb6b357cbfb950bc07bc3b7a66e073973cdd3c30f7da34c8c15ad49bb0c836bed93a6a7f1b3c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/is/firefox-77.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "54a2ec07da6259d6fcbf38a9bda6636fda9a15dad5188c3a8cf5a80bd813ce5c399d44daba0ba49281a7d503ee38542753560ca322324d86bc528c509b34d3c8"; + sha512 = "b6261beb1e1f2f92debb3b5f4a1a95943849337e0b4d8d57254d16276753b0d6a9e52a7a978618a1cab82ddee323f53be2d669837bfae9ef4fd65db0f3bc58af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/it/firefox-77.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "944dabeff41606eff6a49ff87142aab2934cbc658015a8ef05a8416252b8c8c64fd446f5f88516dbea67e269a6514ba7a59038b39b2bb21b909f5342e90b9fd6"; + sha512 = "7a18f158946114ec51256cb99a232e1a35f2fdc13378e0ee29968efeaa70686fdf68e097d5ddfece8183083b2ad0a119daddec7480528dc2e23f963f3d992b70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ja/firefox-77.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "22bf40ed5c37609dce3ed3ea4e88ab8bbbea31a2610697ca72446c201f874c7a4fde8c3f0f859e492869a8a3421e917d6eef37f71cba58658c584f30c683e9b8"; + sha512 = "5a8214f2c717ebe52e203ef449030ecae6fba41536420486dad8d30f676f22dd9e6a32468b3e0bad457f01187ce6cdc0a0d9413e06d1365ad04ec7d4544ed641"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ka/firefox-77.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b746405cd39c261ca7e18193fb0714520c59f58a595be513660d609ed3373b36f07444283d8ed1a6106ef0a48de45ba61fd5c8a1798d45088ac886917e883772"; + sha512 = "233449855a9ad3391f3ad81f2ec9c8f17a0c08db90e9ac2718ae540f436e2becba8a89382262e530da9487591c0fbdaddbaae9e222b0f4e98a4754f3fb77e0c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/kab/firefox-77.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "eabc8a30e4683de833a73a49e2d3d6a25d92ca6fbddbab672f13a6ed5094edacda15ee85a1a8582a05b6e3382ad8a2063a6b1f9acd02771711d43a5e43da8f4d"; + sha512 = "f5821c982d7b92feeb43e27bb95c93e66c2a985398594763bd8934e403e0c89cdc92c9fe556e65e5aca8e403c7c999cf8235bea1b63b6bbf417fdaaf065c3a8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/kk/firefox-77.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "938991eaea630be2ad5818f97a9f43808ce7978c07177b5eaf10bfc74d495c1bbd5d66af79c25ad66ecf6b1d35acd94b04b70c5a8efbce5e26d53e45f3db0c7b"; + sha512 = "c5ebe21b1648e02eed76058dba33fc7bdcf01f2c5034ccb397534ddfb679f333f036ffcc0a554e96a3296741ee22102f9908ec80aa0bd2ba6efc58cf6a63604a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/km/firefox-77.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "ae6eeef2328c92c26b6eb9c2a600162d99c58fa04bfd526f8b0d3d1b147a9f19b7976342e17415d8cca2df65ef5335c5da0a68378e900c09c941fb18a92ea8ff"; + sha512 = "175eb9f150f9e77eb379a59a938b3e554ca3a84338669f10db1c0d014df6dbe1d5255489d70ecd7dc31f72441670f3889988ca75a77e5fef071016bd9651a040"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/kn/firefox-77.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "af171a1f641c50b7f50794d6a1ea0b2d9d2230724c08774ab594b1c9d02ba0660e7f349de65dc4638191b855183b9a0a45fba1ecab5e87199522d6c36103e6f6"; + sha512 = "235a1c4fb9fc19839d0783287461c27a5ecf83f1fb1fe179fae4eeb5a7ff4b3a95da24d56cc130f4cc9dc80e1abaf015f7095ab104f300797068d83c7db1459c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ko/firefox-77.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7a2a61748c0f79f6e65da80e013dc9cc4550253298e6abf01b431db16a3373ba4fbdabba25dec3c994435b6e6330aac58067ed95003695bfb7e49fe6af70b094"; + sha512 = "cb3161cf2bd07d9b0d3b0018ccd3f0eb1d5c2df5919093188de536796a190a29bbccde8afd2c9dfc9e25b4f9b3098bdc7b2710dfcd4b34bf1f0c21c1abfc503a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/lij/firefox-77.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d06298f697163b89f7195393a660534080595b6630b8e2b5c67cb311001bdde4b69cf5a2bcecae4ca90a0abf275736842a33f6d57dbe021458599f0a531b5a13"; + sha512 = "8b4f4648252b1c1431cd77c13aca7a5ab35c7f94129166853b95545e8daefb2da1b8b02a7ae044cbd4e61229cde4630c0e360f41f8dc4b8dbe516acc185bb6be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/lt/firefox-77.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b9ac847949d35872b0d56c41d58c26768afc1c6157d87a0e0059c4b4928e7eaeb6aa7564754b739dc757e049ed485a2c94085e8881515ebf18f250cd5c9e8ccd"; + sha512 = "91cefa757fe9a8dcb6dd6bbd05dcdb312d8a89c2769db0cfbf0df399ceeff13a607be37fcff95dd62099596d201c09d03b7d871c76dcff8ad602967b23736e2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/lv/firefox-77.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "88cd61ed1bb4eb1d871d1844e83acbc932685e10993ed64e84c63fea81fd1d5f79937ca9fff154a699334a4f10942415b6cbb90312d5be508d482de064cdbba6"; + sha512 = "994b6472ba47af34eb9903ca3fffd1d0477549f65d9da1162746c759c9129eb1ddf302e1fe1d94de00a37f07ee907048467fd3ed3db0216027e4ca972f3865ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/mk/firefox-77.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6359356fe1c2eabb3757c6906d925b80a7a069e0dcd7a56b958f614879b942a295bb6345a84365fa21a2cd527bea48d6efe01a603d98571deb6141ae35ff59e6"; + sha512 = "9ac3dcfed283d2edc76f695fc0bcf8098364653a7e8375747c5cdc190baba738ac479d88bfdf28cec4f1d0307a1057cd57b29dac3a37515ee3a246487b8dd7c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/mr/firefox-77.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "7b57efa8b87f662a56cd202102d220fe8f5a72d2e9838528384c4e40206df75e57a26df35544f595460daf471a565c5bfc7071f9a816b11cfeb48f84437d40a6"; + sha512 = "ef484f99119c8ef67cd73a2caebcec00cfba5f4c0d4b618326c2283c96953332902dd141809dcb08e2be393c23f92bb61b298715ae4dac8f1c289b58d96a3230"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ms/firefox-77.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "fbdfe0a1f4ee6831a1d09d9349ddd43d6d540877c1272484429a7ac735a9b326ca5d99fc45a305fa1a36293a4e3eba3d03c4451b0f68a011e58c055d7e89ccee"; + sha512 = "8ff1084f3576632ed5bbc9a8ae0ccfbdec1ff2184770c7ae680f78206027f3c8590a988c6fd0f4a4e6b8f97f846589a85b8c71b0005976f409cbd0ae0a9b6c09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/my/firefox-77.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "8106d80e99497435ffb5a58c0f4002fc1286e223688ebd7c9e406d4181c621abd831819339a6ce65c7a3ebec7a7e8963bf711d7fadc5b94653d83e1fdd13ea75"; + sha512 = "df169d7ec41420cd537178fd6a66fde8821b5cdebe4669031c640fed54c2d5b7fc82182e9ed8ef7b4307323e0a2b8b63f59660fc565777d60aa110e6a7853af9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/nb-NO/firefox-77.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "165c134b673a2a9cfb38db68e5020a284bb087b21ae37a70ad8ab25808c1fd68c0f6385a433d4e16bf34cf7fb07510b36edd0563078a644d6c0a44633946be23"; + sha512 = "cb163e3db7f147c033234baae44dd4be1baa5255380bb08c2cfb61dfb926b8e5270155a4665ebc59cd5022861722f4d2c08ba4d8a757cd1ecbe18d1068e43003"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ne-NP/firefox-77.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c0450269268b5e89de324c3e5fc6a864461a4b29d1fb8646846f8ebd87f661be2a340963a5ae8282cddcca5f05a3ca14f2b155eba99f4357983b5977eac808e7"; + sha512 = "ec9d780be883b4092c670c5a5239b57fbf12ee626f6d1943e5fe4769ad319d724655c4a0cdb7e06503e9e2f11924e2e6143c1e2f20e4fe621483bdbc17a16a30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/nl/firefox-77.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6cd6dc6545e481c28f9d63e5bf97e8dbeb275821c829c729c2dacae5e16d913424bff0e2c6b3cd65a566708f6b047a6eda29793acdf45de295911596bfa49ef9"; + sha512 = "779e823d48f70f9e9bcc4011e1c0959b9d1fe9515a3865c681f6bda5bff99b602d8a3427c11161e9d62ffbbd911ab5461e898fbc2251bccadcafa48a5b2a834d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/nn-NO/firefox-77.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "03865af4dd626a188682ce32b4e817af44cb3059bc8ed7620853234a15972556fa57a2b6c6046ae40cc9c714dc09e54c2111adacd2a0a315d347e4322233fd3a"; + sha512 = "6f458ae7e83fac25f14adada66b5e69998d138dd289c89993f74a0aa94ffc79c4400c1b244aa8756dce2436456a8c1f41bf9b9642d5a392b928d8d5e2a1af046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/oc/firefox-77.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9a774f343442ee10b673cc9894fb8e4adb0a02d824dce5bfa8b3c699a1deb17dfc2ebff86126f9e0743075091c37ad170ed49f0c7818b602373f9fff20240b58"; + sha512 = "ba1eab5d8de36ada40941e9b0133f7acdab117cb0636d0d819fb98efe05f61228a8de1d602f9d5e08f34eb009df83d1e20c2f77ff7c193ddc9f2754a32285fbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/pa-IN/firefox-77.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "6413054a66903741f6a50c8977dc61866067ea54f915f1d7eaf972dd26cba592945bda62348b3cb397d7e045cc7af36581e374deca2812a5112f0bcbd7703b43"; + sha512 = "f815e42e958235db42f8ebebfffb8e5a75d9f0c91ef0311c9fee6f692ceb5db16fb6bb551b84c07fbbc5602f79946980e274ece831190d936e8602db62759082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/pl/firefox-77.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "98c9403b1567d02c1571aed5d6b1cdae7bdddc01ef16a2df44fb8efcb728b7c16dfa27231795fcb9ac3b1cdedbb66fcdda70a8971ed08caa89f8a0bb11dea5e9"; + sha512 = "3b3c610f3eb84efa83528e82f07821979f317517caa66fa642c2a569d58bb65ee5e32c6854423b1fc4c16652654f2516b7515ce084d83a4d75c9c750f4010200"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/pt-BR/firefox-77.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ac721c8b4e104285cb8eb025916da8ba1c7c0481eeaba2b60e35ceed7d26afa7eea9a83168608daff25c025f2f06208cf36c56a4ece68b66b2baacefdb8b5d9f"; + sha512 = "97c1820edbb6273d16d6c3256ffbb6c099a517568cfc320d880eda88671c6bdca02ea33a95e3c0ba88693796ea6b1749f157c1aaa01d74add9701dd2a2d0fed1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/pt-PT/firefox-77.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "720d6a5c0bfeab99f4360e9e64c4bcfc49c987f1dd040eeb1ff580f1f4b1c4a29fb7a3c88a369574fd966237f817959baf9db7117bd515cd6458e13155128df1"; + sha512 = "02f1b7037ead02e594ed8bfef8d63384e05e8005d80fbc7823d0c46c1e2d6beb8c7815fedc11caa305f904b2f112ab2a482095c60e841817b16c7abd59dd9eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/rm/firefox-77.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e06fd7a663dd341f8cc9f60de2edca6af622bbcfffb9b1d9e3b75c07fb6b27f3b0ca9eeccb6173a91f52ee8241f167c4a399160e20377b3738e4cf4b2dfb84b7"; + sha512 = "3780f9a1db1eb608b49b026ff990c60e3cce1cb9378389a371a092ceeb77d45def0fe0ae21e153807c8fdf475caddf3c629d383ba156d74c1e7a28c2601e2969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ro/firefox-77.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d7738a3039202e9cd3b30652b4c069f9b73f88e5db1429e26324ef30f87af88f79452cb5dfa687bb988b513359ae65d7319c8a3dd59207af85b618d51519f335"; + sha512 = "5d8866a694b36ab911eee52633eb89990eb3e466cf056c514efeb900a602b048e68700464630fac44461064f1ec468308103f85303d036ca6d142b3b4826b3bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ru/firefox-77.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "cd0c2ea6af241de3d382345fd783b75e15499e0d666df99bb6ec06ae9e9da233e5ebbd181bec6a3b044682456dd78f5405177e4a781160b9a3b110008782f32c"; + sha512 = "ed0be17aefaa9ca305596c2e47d2cf4575cc73cba1de028428c704bb8743ca104d7c31d210583dfd1c6777cb73b7d702a906049e068412b8646af7035cdcfe5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/si/firefox-77.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "94aff48579b1fff63decdc6640b853907abc508da23e3d7ec13ea01c2fae496e870261fc5616821bb0c2dd5279ceb1be054691f501dd183ee0ea9aae7d24d5b1"; + sha512 = "8eec828376a455ef21eb8ee8edbdd14acb16181858f8d9465a2f7ba830e1d18ad00ab1b530fdf9fb6436528fe11bcbb07b70fae74c0b1f6c53197740d0e7a697"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sk/firefox-77.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "189f8bc5db155eb0f50d0b60d321ca0dd67e15cd30749d830a21397df0b314608393c08daf70712a6077ea5ac663d5e745a836483750fd26ec1e92dda265c061"; + sha512 = "80f7d44e00f571346cd4f05ce54236b1b9ca6ef7d75f20a0335dbc56da52cb72461b333b4dfec55cfa95cfc2ceb6afdfaded714243a10ad58120af38f68bc1e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sl/firefox-77.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f6f1d2ac3270e639bea54eb04c8f292d17ec2c4e70848a4104219800af1a17f78658eebc39d3c244e351d0511d681ab66a61358523d7edf93d4b317993cdb10c"; + sha512 = "0da796384b14bf299361bcc38c2dfd1d45cea3a396f7d7b9a8f2b7c347f1d9b6e15b7b3ecb0be591c385a20375122c7b34b1182b902ff3c6ff67e2481420be43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/son/firefox-77.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "747f109672e47a6a344a09c32b5e2694de1ba125dd29d583a5f6a31859247e659b9ea204af31337dd5a635c0d1d7662efcf37d0d708e0936b59dfe3c975e9990"; + sha512 = "37eec862d1e7c9537b5dab811cf183238474c552b98cbdc81df67c5c42e5dc06b126c4c00b014287e282f490392823d83187bbebe7de992468d8137efc1c2d8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sq/firefox-77.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5f6ad0ccd20bcd09783de5307a1ac2b149cf63ab922162149d8c0632698de86b78170e378dca7103374ec356bbb03b373bf573512e6b27b95550ed95178dc1f7"; + sha512 = "468254163b0466858a10ba5869bd6434d96f083c192369e4b8741606bbba85bdc69179eb23d06b4dc30dbc8253bd623d258ce76b0c64366eefdd03309b21ea41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sr/firefox-77.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "01c8f958ff9c5e9e65459b20c7a42208bc985246445d6ed310f80fc0dae2c8bb5684e118baf1c3dc2947dfd66ca148537d94ae726e3b3d8cc01c4990e42e2f96"; + sha512 = "7f2f06762b82a3ae599955fccf26be9330ad4be0b8acd8596546e9d949a10b0a2f629df81338d5c3720af6dfadb1ddbf78da006fd70d90f6d7f3c42c6be498a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sv-SE/firefox-77.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "1fcece2f00f98e769fd7023b5cd80eeac27b8f987291bf4041dfd90538482e7184137471cff73aaaff1c307813efa26cea3f7e77082ebe08d11769b35cd21d12"; + sha512 = "4a44a34b833a04f918899af779408376f6d51229812155f88275597c8368a2865897bf6bdc44b5991ed3cbad40279a9ffa9b75a039eba77f82a3ba0f91697cb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ta/firefox-77.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "557646065e7370bfe43fffc9a57eec3da2ec8176e2371e948f70c92e54e3cd7d194022dab508c0b384545c121587e41ef19bda7ec8b1827118adf12aa82c653f"; + sha512 = "32c99716c32bcbdd55aaecbf9c7b9fa423bdb9324feb23831ce7454c9a01d57ed3b8ca7d662d730dfc7c9349221c7fc9b442b4c806b305c355762d6dab2eb0a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/te/firefox-77.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d7f95cefdf312d4c3ec157208266c9eba7e394cc1deb83e4cb9baa98f99292f6d4996b4c6f663a303556769a8c6b81fa6ee127f84464fbabc8fa0f55763dced8"; + sha512 = "cb5f56172de7ed63ce9fca8ddb95c1840b6830d8e5e3af75a9ef3dc85256e711250758245cd10676dffcaf8ec7e01f7b027de4cee71ce839c923b7bec0b2017b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/th/firefox-77.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9c9d80fe8157f7f844c81a99439d9e35ccd51c8cb9dd4e8c1bc16591aa2e34654440e1b926f3737790c2fe4fa1ef9720180393260adf1dc1b6d22a805ed8edf8"; + sha512 = "c4cfad0ee45e19b15a797daa8d17c4cdbfd47433ff1a19f619ec8b4e4ed44203ee4b82308222debdf96a5e076fe77e15b5a29b115ac203364ceca643298a930a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/tl/firefox-77.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "21fc8ba0d1374fe0dbdba8a0f5ac940085f89886f0eb7ae28aae5e152ce7d68518172238042fd0287ec62127489ae3c9b750334d38676ecc7b60633187311fde"; + sha512 = "ca89a249ad4cc0262420f22d779fdabd402afbab1e0da5a7a3ce5d2cf44de9cfa4f67b4842203130a645bb15072c8dd249825569eeb0eacf08e265628177690f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/tr/firefox-77.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b91dca298f68ef9f1a9ff17ecd58d7fd2f0d47193fb03781027be26ecc75d3391ff47dbd1d9b6796617df00b28ff8b2610858188cd03d87efcf704f2ad4cb0df"; + sha512 = "6b6a487dbd9f0af02afb87463f1dc5129f59bae81bb90aac17e8bfd9feaf10be351f2afe541c6821778e41b20f323e3dddf2493b92d1fceaf3c22c0dee6aceaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/trs/firefox-77.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "ff2b2be81f48758bd52a70ec6da9cf2950fa595bd7d3a26a4929ae28a6c612aa6ca1c127318587fe4adc03257e259a1b68ea39b9b4741e7edea53c55ccb9036a"; + sha512 = "407a8417e511bfd7e1cccecf1bf0192a33df1a9571b15e1b2df3b36d446acfd6e99af64b947f36c327f9374d592e0e8ca93ad97888373ad200dc041aa2c336f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/uk/firefox-77.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "980175a00523c0ba2b4c67999e5afcc59946b45bc58d6b813e25dd0a5f1678d23d329dc70611bdb55d9ad9debe2adf0a5fb867a9d83d43ab5934ad2bcc132da0"; + sha512 = "47ee62e4604139148fc8a646b60e6907682db39e9b0061e5c9a63d756e20a61d8c41c4af49993648cf090fb877696cfc33e82d84b8bb648415fb9c773d1c8ee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ur/firefox-77.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9648cb55f355c68852430f9a7c5486b0fb5be65c7f258b81906d19119f437e033121f46b884d65f1f64c33f511c605d8a42737a26ff7089306ed6bde4fd5ab4d"; + sha512 = "b7aa2bff473261985d101be07297ff488cc20ccf333bf6bef35f6c8522a7e3fe8f83c7b5b2b16019e53e7798feeb1f1754c1a9c3e31a72dc170aa6bc1619fd54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/uz/firefox-77.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2fdc0572a32112310044936c9b81f7238172f9ef2c2e502813b82ac0f61fa96b9d1ec96d396c7baf79c27b44673a72bd9e484d6ab68087993ab44310a52d453d"; + sha512 = "3d60690ef0c74d91c134d1e2b348fcc469d528a7d166d1cdf65190fae2e97f058ddcedabdf1b0f9af9b1e31a369de6ef8c35b41f49e846cc0877f71fce12d77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/vi/firefox-77.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9b6b6ccaf74e4c3699605d43d51c02f7ccd3f4f28ed93e9b800fc0adcf662f08e554f081cc51e5706c73f308cc289976e5523d0424988b5ae3d5bb1ef6260503"; + sha512 = "fe7285022883e91f2584e43f77f8cfa3771c948ca970a2502df557144b6a33dacd746a7710becf249f2c1f0a8f90f4f19e66fba0571b1bd4ff8300ba883614d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/xh/firefox-77.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d417c0efde71e18f8dc04f5cb8b61c6b4410579051cf3816b55a52f3165ede2921691ed67307999ba48d6b46ea2acfdf82d063ea349fd7131402155f50dec01e"; + sha512 = "b6157fae9af3740da799696ccbe07ab9595e005538c962cd6049752fde01763557a2286b7bc094442d7f7dc15101708712eb43d06ffc1cc0dda9da8ce05c1527"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/zh-CN/firefox-77.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d4da856a2b142d4a088a0a5b460eaa2466da9280890c62b178d1bcfc18e91e494d7be357915880a0369ecf578b00e087cdf47eb8591d605595e9cc2356cbd086"; + sha512 = "dfe844eb063beb53133fb6636674c26b0018436357926b1165c6eaa589da0f66bf95866488a2659a2774431d236260837733993051b093182d02ea3de4f6317f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/zh-TW/firefox-77.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "6a43e2db9823f0ca86628b77df193183182208c27a7c0347fb0cb324b615bae58ca9319038c4ac642428f4ab0f1bea557ca46f313256d849cb10e8da87942247"; + sha512 = "45189cfc3c7ca6a1e04293422e36fbd7f6e09292101ce31c5c15cbfecbc1dd7c03c5410eb57ff77dfb85b1910749e51461688eb668128de814072b7e6bb7f13e"; } ]; } From 99e84dbdcb2f7072677c7791147a3c11ab14a83a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 16 May 2020 15:20:59 +0200 Subject: [PATCH 235/310] python.pkgs.google-pasta: add meta.changelog --- pkgs/development/python-modules/google-pasta/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index 2b6394ae6ba0..a7a25118478d 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { meta = { description = "An AST-based Python refactoring library"; homepage = "https://github.com/google/pasta"; + # Usually the tag message contains a one-line summary of the changes. + changelog = "https://github.com/google/pasta/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ timokau ]; }; From 5ce2f6c5c922350eabf3f0082d839bc713634481 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 16 May 2020 15:21:23 +0200 Subject: [PATCH 236/310] python.pkgs.google-pasta: 0.1.8 -> 0.2.0 From the release tag[1]: > Support for python 3.8 features [1] https://github.com/google/pasta/releases/tag/v0.2.0 --- pkgs/development/python-modules/google-pasta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index a7a25118478d..608ab9ccd1bc 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "google-pasta"; - version = "0.1.8"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "713813a9f7d6589e5defdaf21e80e4392eb124662f8bd829acd51a4f8735c0cb"; + sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9"; }; propagatedBuildInputs = [ From a807dfe1e31669db4eaf87f61b604c5c4fe79595 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 18:20:30 +0200 Subject: [PATCH 237/310] php.packages.phpstan: 0.12.19 -> 0.12.25 Changelogs: - https://github.com/phpstan/phpstan/releases/tag/0.12.20 - https://github.com/phpstan/phpstan/releases/tag/0.12.21 - https://github.com/phpstan/phpstan/releases/tag/0.12.22 - https://github.com/phpstan/phpstan/releases/tag/0.12.23 - https://github.com/phpstan/phpstan/releases/tag/0.12.24 - https://github.com/phpstan/phpstan/releases/tag/0.12.25 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0fecf30e7360..2214605b25e9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -232,12 +232,12 @@ in }; phpstan = mkDerivation rec { - version = "0.12.19"; + version = "0.12.25"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "15fz7rixi9s46qqxpj26349aky7wxqnzmfsnwlh1f2p4jsfd85ki"; + sha256 = "1a864v7fxpv5kp24nkvczrir3ldl6wxvaq85rd391ppa8ahdhvdd"; }; phases = [ "installPhase" ]; From e683f5cbfa0e96da29514c8329217e2880a80a26 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 1 May 2020 21:32:25 +0200 Subject: [PATCH 238/310] php.extensions.rdkafka: init at 4.0.3 --- pkgs/top-level/php-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0fecf30e7360..de9ae52e9ef9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -709,6 +709,26 @@ in meta.broken = isPhp74; }; + rdkafka = buildPecl { + version = "4.0.3"; + pname = "rdkafka"; + + sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; + + buildInputs = with pkgs; [ rdkafka pcre' ]; + + postPhpize = '' + substituteInPlace configure \ + --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' + ''; + + meta = { + description = "Kafka client based on librdkafka"; + homepage = "https://github.com/arnaud-lb/php-rdkafka"; + maintainers = lib.teams.php.members; + }; + }; + redis = buildPecl { version = "5.1.1"; pname = "redis"; From 3ae7502199d68020cbda5239969ab88260a8e10a Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 16 May 2020 12:56:31 -0400 Subject: [PATCH 239/310] wabt: fix patch hash --- pkgs/development/tools/wabt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index a755cecc60b0..3da47f9a3f5f 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { # https://github.com/WebAssembly/wabt/pull/1408 patches = [ (fetchpatch { - url = "https://github.com/WebAssembly/wabt/pull/1408/commits/9115d0c55067435ec9c55924e8a2bb151bac095d.patch"; - sha256 = "1iklbz630vih08brsgq2d5q91kialg255sgd1mxl7023pvrhi44g"; + url = "https://github.com/WebAssembly/wabt/pull/1408/commits/28505f4db6e4561cf6840af5c304a9aa900c4987.patch"; + sha256 = "1nh1ddsak6w51np17xf2r7i0czxrjslz1i4impmmp88h5bp2yjba"; }) ]; nativeBuildInputs = [ cmake ]; From 13c5bbbe2aaaeaa296a90fbf3d36104d0d0bda75 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Sat, 16 May 2020 19:15:28 +0200 Subject: [PATCH 240/310] cue: 0.1.1 -> 0.1.2 --- pkgs/development/tools/cue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 0b9bc192c3ee..d106ca3ef449 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "cue"; - version = "0.1.1"; + version = "0.1.2"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "1qbnm3qb8jz9bljw2gb5bb9g41s5lbq4xvcaj3zgi4fc3708hlji"; + sha256 = "0pmw7gnh4z5sbri8464rpwp3hbrz23zwig82nk9wdjkg1qahyy13"; }; vendorSha256 = "12w2rxp0s3i1ck0qvp2dkg9kk6pyymycdfnfxggcyg4fjshh8afg"; @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ solson ]; license = stdenv.lib.licenses.asl20; }; -} \ No newline at end of file +} From 6e5b1a71eb0468fc66f181dc82fba2cc4ed00fb3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 May 2020 19:08:04 +0200 Subject: [PATCH 241/310] tdesktop: 2.1.4 -> 2.1.6 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1e1f952586cf..f10c6b82ac21 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.4"; + version = "2.1.6"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1swmmklw2mcgag0c8zh4rk5cjfx6z2yl0nxd5yc43hg9hx76yqqi"; + sha256 = "136c27pfipy9ikwm44nqxx9lqwq8qsfcs591qr8ac05ncgkh001v"; }; postPatch = '' From 347882f36ae2ba0c1da747e530deeab21c9799ed Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 May 2020 19:23:06 +0200 Subject: [PATCH 242/310] signal-desktop: 1.34.0 -> 1.34.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index be9cdbecc0bf..309da8f296c5 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.0"; # Please backport all updates to the stable channel. + version = "1.34.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "175iir85qlign5ns8wk4x4mf7xw8sriq8jyj61n76is79jjk7b3d"; + sha256 = "0v9mqn43vn1w6wppzydkgpbx2752bp7mmpf50wqgvrmhchnywnkj"; }; nativeBuildInputs = [ From beaed5b544e8709dbc41dc64dd1bc2b66c029b18 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Fri, 10 Jan 2020 14:36:46 +0100 Subject: [PATCH 243/310] portfolio: init at 0.46.3 --- .../applications/office/portfolio/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/applications/office/portfolio/default.nix diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix new file mode 100644 index 000000000000..53f3b8a3150a --- /dev/null +++ b/pkgs/applications/office/portfolio/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, autoPatchelfHook +, fetchurl +, glibc +, gcc-unwrapped +, gtk3 +, jre +, libsecret +, makeDesktopItem +, webkitgtk +, wrapGAppsHook +}: +let + desktopItem = makeDesktopItem { + name = "Portfolio"; + exec = "portfolio"; + icon = "portfolio"; + comment = "Calculate Investment Portfolio Performance"; + desktopName = "Portfolio Performance"; + categories = "Office;"; + }; + + runtimeLibs = stdenv.lib.makeLibraryPath [ gtk3 webkitgtk ]; +in +stdenv.mkDerivation rec { + pname = "PortfolioPerformance"; + version = "0.46.3"; + + src = fetchurl { + url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "0263v0ymqmf7kcwys4smwx1p1gh8d20dh10canjfqgl4c5lfx966"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + glibc + gcc-unwrapped + libsecret + ]; + + installPhase = '' + mkdir -p $out/portfolio + cp -av ./* $out/portfolio + + makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --prefix PATH : ${jre}/bin + + # Create desktop item + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm + ''; + + meta = with stdenv.lib; { + description = "A simple tool to calculate the overall performance of an investment portfolio."; + homepage = "https://www.portfolio-performance.info/"; + license = licenses.epl10; + maintainers = with maintainers; [ elohmeier ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158ce..edb075facfdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20975,6 +20975,10 @@ in polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + portfolio = callPackage ../applications/office/portfolio { + jre = openjdk11; + }; + ptex = callPackage ../development/libraries/ptex {}; qbec = callPackage ../applications/networking/cluster/qbec { }; From 3d3519e2c3af00fd75c58364ae93f8cac5879e43 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 18:13:02 +0200 Subject: [PATCH 244/310] CODEOWNERS: Move code ownership to php maintainer team --- .github/CODEOWNERS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 93688a326fed..5376d51a6178 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -181,12 +181,12 @@ /nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz /nixos/tests/prometheus-exporters.nix @WilliButz -# PHP -/doc/languages-frameworks/php.section.md @etu -/nixos/tests/php @etu -/pkgs/build-support/build-pecl.nix @etu -/pkgs/development/interpreters/php @etu -/pkgs/top-level/php-packages.nix @etu +# PHP interpreter, packages, extensions, tests and documentation +/doc/languages-frameworks/php.section.md @NixOS/php +/nixos/tests/php @NixOS/php +/pkgs/build-support/build-pecl.nix @NixOS/php +/pkgs/development/interpreters/php @NixOS/php +/pkgs/top-level/php-packages.nix @NixOS/php # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @NixOS/podman From 49436a7613b6412111322bc20b5602c10dae9fd3 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Fri, 15 May 2020 17:47:33 -0600 Subject: [PATCH 245/310] marathi-cursive: 1.2 -> 2.0 --- pkgs/data/fonts/marathi-cursive/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index 724d975e53a7..8c228fd91a75 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,21 +1,19 @@ -{ lib, fetchzip, p7zip }: +{ lib, fetchzip }: let - version = "1.2"; + version = "2.0"; in fetchzip rec { name = "marathi-cursive-${version}"; - url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; + url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - cd MarathiCursive - + tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt + install -m444 -Dt $out/share/doc/${name} README *.txt ''; - sha256 = "0wq4w79x8r5w6ikm9amcmapf0jcdgifs9zf1pbnw3fk4ncz5s551"; + sha256 = "17pj60ajnjghxhxka8a046mz6vfwr79wnby7xd6pg5hgncin2hgg"; meta = with lib; { homepage = "https://github.com/MihailJP/MarathiCursive"; From 26cbda79292f229e703b75e307729f8f711e97da Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Fri, 15 May 2020 17:47:49 -0600 Subject: [PATCH 246/310] oldsindshi: 0.1 -> 1.0 --- pkgs/data/fonts/oldsindhi/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index fbca0283d231..e0e783fd80a5 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -1,26 +1,25 @@ -{ lib, fetchzip, p7zip }: +{ lib, fetchzip }: let - version = "0.1"; + version = "1.0"; in fetchzip rec { name = "oldsindhi-${version}"; - url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; + url = "https://github.com/MihailJP/oldsindhi/releases/download/v${version}/OldSindhi-${version}.tar.xz"; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - - install -m444 -Dt $out/share/fonts/truetype OldSindhi/*.ttf - install -m444 -Dt $out/share/doc/${name} OldSindhi/README OldSindhi/*.txt + tar -xJf $downloadedFile --strip-components=1 + install -m444 -Dt $out/share/fonts/truetype *.ttf + install -m444 -Dt $out/share/doc/${name} README *.txt ''; - sha256 = "0d4l9cg2vmh2pvnqsla8mgcwvc7wjxzcabhlli6633h3ifj2yp7b"; + sha256 = "03c483vbrwz2fpdfbys42fmik9788zxfmjmc4fgq4s2d0mraa0j1"; meta = with lib; { homepage = "https://github.com/MihailJP/oldsindhi"; description = "Free Sindhi Khudabadi font"; maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.bsd2; + license = with licenses; [mit ofl]; platforms = platforms.all; }; } From 96638775aa8fbca76ad6a88ffd52f1b076ae24d1 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Mon, 11 May 2020 11:09:45 +0200 Subject: [PATCH 247/310] ffmpeg-full: setup addOpenGLRunpath --- pkgs/development/libraries/ffmpeg-full/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 120a309b6561..089d5c4dcca0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -416,7 +416,7 @@ stdenv.mkDerivation rec { "--enable-cross-compile" ]; - nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm @@ -444,6 +444,13 @@ stdenv.mkDerivation rec { cp -a tools/qt-faststart $out/bin/ ''; + postFixup = optionalString stdenv.isLinux '' + # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + addOpenGLRunpath $out/lib/libavcodec.so + addOpenGLRunpath $out/lib/libavutil.so + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { From 70df85260b11534681f22379218d3de3825f0f1d Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 12 May 2020 16:57:58 +0000 Subject: [PATCH 248/310] gitAndTools.gitui: 0.2.2 -> 0.2.5 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 5ed4b0d37273..ff2c9de5efac 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "1vcdgzr71m9rlkaq5pc2vnli3hdh7vv8g3ji5ancnlk3zcqc78xy"; + sha256 = "12zqsnkask2hhbvvyym4w21yx9rgwpqx2mnj6qds3y2qmcy1yhi4"; }; - cargoSha256 = "04g089y6k0p36h08v6swcg1ig2kcadkidnlc0rh04znmv0bkn84d"; + cargoSha256 = "1kbaqpfj7b9asyyqjdljyga3v428yzlsgpnn9187hf4ydhpr6zrz"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; From 4756e2eb0c3e712c7a815bc7417d3c10dce072a8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 May 2020 19:18:59 +0200 Subject: [PATCH 249/310] python3Packages.google_api_python_client: 1.8.2 -> 1.8.3 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index ac7bcb5cd524..b787e08dbbf5 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.8.2"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "09g7v6yrf8p0kgmjnzy9d0fx9p1zngk2pmprf0bx19j1zc9jqj5z"; + sha256 = "10alijbbv3nsj7dfnv3fpx0gf1s9d4c7yjq0mv51szcx777qskmy"; }; # No tests included in archive From 6f15e3170286c04749ef287c31242a583475e81c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 15:46:16 +0200 Subject: [PATCH 250/310] =?UTF-8?q?pipewire:=200.3.2=20=E2=86=92=200.3.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/002bcae856fbd9b11a1fa8c7a011a61b7de5f42a https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/33398d7de83fad1c67c691e0712e3e0108c5e966 https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ba215efed0da8d6c9f3f2414d76a8e2c75352501 --- pkgs/development/libraries/pipewire/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index d873555c0fa4..f9cc7b56fff0 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkgconfig @@ -33,7 +32,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.2"; + version = "0.3.5"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs="; + sha256 = "mgfhfKpUtHycXCUVKFs9A58E1D1pPKHvSoPqjQzWGfQ="; }; nativeBuildInputs = [ @@ -73,13 +72,6 @@ stdenv.mkDerivation rec { vulkan-loader xorg.libX11 ]; - patches = [ - # fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch"; - sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x"; - }) - ]; mesonFlags = [ "-Ddocs=true" From 33bb1d5161af54d91cfd869eae76aaaceec858ec Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 22:23:11 +0200 Subject: [PATCH 251/310] testssl: 3.0.1 -> 3.0.2 Changelog: https://github.com/drwetter/testssl.sh/releases/tag/3.0.2 --- pkgs/applications/networking/testssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 557e69b1ee1c..197756d8ace4 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = version; - sha256 = "13vvkn1hna1d1mj8ffg7psrv6ha2jcjrf50qrsb0v0p8hszibavy"; + sha256 = "0vfpj3g3il3imbydx3j8gx1pgzrxi0czcl9jmi749vnkf5mkmh8w"; }; nativeBuildInputs = [ makeWrapper ]; From ce90a304f1befb2e779b78c959ec77e236814c7c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 23:12:35 +0200 Subject: [PATCH 252/310] aliceml: do not use aliases --- pkgs/development/compilers/aliceml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index db1a8640753a..d3208b12dd68 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome2, pango, sqlite, libxml2, zlib, gmp, smlnj }: +{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { name = "aliceml-1.4-7d44dc8e"; @@ -18,9 +18,9 @@ stdenv.mkDerivation { buildInputs = [ stdenv gcc glibc libtool gnumake autoconf automake - file which zsh m4 gnome2.gtk zlib gmp + file which zsh m4 gtk2 zlib gmp gnome2.libgnomecanvas pango sqlite - libxml2 pkgconfig perl smlnj + libxml2 pkg-config perl smlnj ]; makePatch = ./make.patch; From 021662cf1357b204af3f66f65d5c72876ebdc32c Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 10 May 2020 20:35:07 -0700 Subject: [PATCH 253/310] nix-build-uncached: init at 0.1.1 --- .../tools/misc/nix-build-uncached/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/misc/nix-build-uncached/default.nix diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix new file mode 100644 index 000000000000..11833816ec82 --- /dev/null +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, nix, makeWrapper }: + +buildGoModule rec { + pname = "nix-build-uncached"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-build-uncached"; + rev = "v${version}"; + sha256 = "0jkpg3ab56lg2kdms9w9ka9ba89py3ajksjsi1rd3iqi74zz2mmh"; + }; + + goPackagePath = "github.com/Mic92/nix-build-uncached"; + vendorSha256 = null; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/nix-build-uncached \ + --prefix PATH ":" ${lib.makeBinPath [ nix ]} + ''; + + meta = with lib; { + description = "A CI friendly wrapper around nix-build"; + license = licenses.mit; + homepage = "https://github.com/Mic92/nix-build-uncached"; + maintainers = [ maintainers.mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158ce..c3d3fa04d750 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10668,6 +10668,8 @@ in pythonPackages = python3Packages; }; + nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; + nexus = callPackage ../development/tools/repository-managers/nexus { }; nwjs = callPackage ../development/tools/nwjs { From 044e733e8dbb652984f0db45506b8eed514b267e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 23:14:53 +0200 Subject: [PATCH 254/310] bcompare: do not use aliases --- pkgs/applications/version-management/bcompare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index d8a6ec058448..93c725db260a 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, pango, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: stdenv.mkDerivation rec { pname = "bcompare"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc.lib gtk2 - gnome2.pango + pango cairo kio kservice From 1241af5dd32beb5cdc9abbe670228b6c949ce309 Mon Sep 17 00:00:00 2001 From: ccellado Date: Sat, 16 May 2020 23:29:38 +0300 Subject: [PATCH 255/310] maintainers: add ccellado --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 72d20a5a702c..5d49fc7b40c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1280,6 +1280,12 @@ githubId = 64804; name = "Dennis Gosnell"; }; + ccellado = { + email = "annplague@gmail.com"; + github = "ccellado"; + githubId = 44584960; + name = "Denis Khalmatov"; + }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; From 221e5eba47110ef9a174e2c5caf66351609c16ba Mon Sep 17 00:00:00 2001 From: ccellado Date: Sat, 16 May 2020 23:26:19 +0300 Subject: [PATCH 256/310] glpaper: init at unstable-2020-03-30 --- pkgs/development/tools/glpaper/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/glpaper/default.nix diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix new file mode 100644 index 000000000000..94d140552a10 --- /dev/null +++ b/pkgs/development/tools/glpaper/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +, libX11, libGL }: + +stdenv.mkDerivation { + name = "glpaper"; + version = "unstable-2020-03-30"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/glpaper"; + rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2"; + sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ + wayland + libX11 # required by libglvnd + libGL + ]; + + meta = with stdenv.lib; { + description = + "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper"; + homepage = "https://hg.sr.ht/~scoopta/glpaper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ccellado ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a22878b284e8..d4e6c6df5baf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1856,6 +1856,8 @@ in gixy = callPackage ../tools/admin/gixy { }; + glpaper = callPackage ../development/tools/glpaper { }; + gllvm = callPackage ../development/tools/gllvm { }; glide = callPackage ../development/tools/glide { }; From bf311f1b97dd215bed713f7ae90abbf46d62fdd3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 16 May 2020 22:14:06 +0200 Subject: [PATCH 257/310] pkger: init at 0.16.0 --- pkgs/development/libraries/pkger/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/pkger/default.nix diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix new file mode 100644 index 000000000000..4a489127ca56 --- /dev/null +++ b/pkgs/development/libraries/pkger/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "pkger"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "markbates"; + repo = "pkger"; + rev = "v${version}"; + sha256 = "0fpvrgww5h40l2js7raarx6gpysafvj75x26ljx4qz925x8nb6zn"; + }; + + vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; + + meta = with stdenv.lib; { + description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + homepage = "https://github.com/markbates/pkger"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158ce..aed020fbe49e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -302,6 +302,8 @@ in pet = callPackage ../development/tools/pet { }; + pkger = callPackage ../development/libraries/pkger { }; + run = callPackage ../development/tools/run { }; mod = callPackage ../development/tools/mod { }; From a26035f05f9385bc1d57209cef4d2b3aa8f767cf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 17 May 2020 09:15:28 +1000 Subject: [PATCH 258/310] cri-o: 1.18.0 -> 1.18.1 https://github.com/cri-o/cri-o/releases/tag/v1.18.1 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 3796b8857b7f..95f8580cb397 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; + sha256 = "1fd7ix329kqimysqfh8yl29c0hwrddlirq9bnz95mrllhsgn8kw2"; }; vendorSha256 = null; outputs = [ "out" "man" ]; From 3f4703424c55c2f68cca308760c0d0c65c84f339 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 16 May 2020 23:19:57 +0000 Subject: [PATCH 259/310] capstone: 4.0.1 -> 4.0.2 --- pkgs/development/libraries/capstone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index b8d00984cd64..5140205ebc8a 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capstone"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; + sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw"; }; # replace faulty macos detection From 8b3301c6fffac7d9cd41f410267f6c749c10c9ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 16 May 2020 23:28:37 +0000 Subject: [PATCH 260/310] cargo-about: 0.2.0 -> 0.2.2 --- pkgs/tools/package-management/cargo-about/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 82da6b7b93c7..84bea234c20f 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = "${version}"; - sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420"; + sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd"; }; - cargoSha256 = "1ynalwaqa70ihgras3frp5l3xniz58hwp108wkxn6zj8lwxbxfgx"; + cargoSha256 = "1wmw7knkx79fbwizaj9qkcnw0ld1lsfhca8mfpn5f0daxa5v5y97"; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; From 89f69a2848025029609d035688b46ac608009570 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:35:54 +0100 Subject: [PATCH 261/310] melpaPackages: Make all overrides shared --- .../editors/emacs-modes/melpa-packages.nix | 223 +++++++++--------- 1 file changed, 114 insertions(+), 109 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index ed1550de768a..f228d34a654e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -22,42 +22,50 @@ instantenous and formats commits for you. */ -{ lib, external, pkgs }: variant: self: let +{ lib, external, pkgs }: variant: self: +let + dontConfigure = pkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + dontConfigure = true; + }); + }) else null; - dontConfigure = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - dontConfigure = true; - }); - }) else null; + markBroken = pkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + meta = (drv.meta or { }) // { broken = true; }; + }); + }) else null; - markBroken = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or {}) // { broken = true; }; - }); - }) else null; + externalSrc = pkg: epkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + inherit (epkg) src version; - externalSrc = pkg : epkg : if pkg != null then pkg.override (args : { - melpaBuild = drv : args.melpaBuild (drv // { - inherit (epkg) src version; + propagatedUserEnvPkgs = [ epkg ]; + }); + }) else null; - propagatedUserEnvPkgs = [ epkg ]; - }); - }) else null; + fix-rtags = pkg: + if pkg != null then dontConfigure (externalSrc pkg external.rtags) + else null; - fix-rtags = pkg : if pkg != null then dontConfigure (externalSrc pkg external.rtags) - else null; + generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json + }: + let + inherit (import ./libgenerated.nix lib self) melpaDerivation; + super = ( + lib.listToAttrs (builtins.filter + (s: s != null) + (map + (melpaDerivation variant) + (lib.importJSON archiveJson) + ) + ) + ); - generateMelpa = lib.makeOverridable ({ - archiveJson ? ./recipes-archive-melpa.json - }: let - - inherit (import ./libgenerated.nix lib self) melpaDerivation; - super = lib.listToAttrs (builtins.filter (s: s != null) - (map (melpaDerivation variant) - (lib.importJSON archiveJson))); - - overrides = rec { - shared = rec { + overrides = { # Expects bash to be at /bin/bash ac-rtags = fix-rtags super.ac-rtags; @@ -65,12 +73,11 @@ instantenous and formats commits for you. inherit (self.melpaPackages) powerline; }; - auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: { + auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ]; CFLAGS = "-I${external.llvmPackages.clang}/include"; LDFLAGS = "-L${external.llvmPackages.clang}/lib"; }); - emacsClangCompleteAsync = auto-complete-clang-async; # part of a larger package caml = dontConfigure super.caml; @@ -87,7 +94,7 @@ instantenous and formats commits for you. dune = dontConfigure super.dune; - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; postBuild = '' @@ -116,12 +123,12 @@ instantenous and formats commits for you. evil-magit = super.evil-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); eopengrok = super.eopengrok.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); ess-R-data-view = super.ess-R-data-view.override { @@ -131,17 +138,17 @@ instantenous and formats commits for you. forge = super.forge.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); flycheck-rtags = fix-rtags super.flycheck-rtags; gnuplot = super.gnuplot.overrideAttrs (old: { nativeBuildInputs = - (old.nativeBuildInputs or []) ++ [ pkgs.autoreconfHook ]; + (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoreconfHook ]; }); - pdf-tools = super.pdf-tools.overrideAttrs(old: { + pdf-tools = super.pdf-tools.overrideAttrs (old: { nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; @@ -158,7 +165,7 @@ instantenous and formats commits for you. }); irony = super.irony.overrideAttrs (old: { - cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; + cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' cd server @@ -192,115 +199,115 @@ instantenous and formats commits for you. magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-find-file = super.magit-find-file.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-imerge = super.magit-imerge.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-lfs = super.magit-lfs.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-stgit = super.magit-stgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-topgit = super.magit-topgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-todos = super.magit-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magithub = super.magithub.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-svn = super.magit-svn.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); # upstream issue: missing file header @@ -323,7 +330,7 @@ instantenous and formats commits for you. }); # Telega has a server portion for it's network protocol - telega = super.telega.overrideAttrs(old: { + telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; postBuild = '' @@ -341,21 +348,24 @@ instantenous and formats commits for you. treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); - zmq = super.zmq.overrideAttrs(old: { + zmq = super.zmq.overrideAttrs (old: { stripDebugList = [ "share" ]; preBuild = '' make ''; nativeBuildInputs = [ - external.autoconf external.automake external.pkgconfig external.libtool + external.autoconf + external.automake + external.pkgconfig + external.libtool (external.zeromq.override { enableDrafts = true; }) ]; postInstall = '' @@ -377,9 +387,6 @@ instantenous and formats commits for you. markdown-mode-plus = super."markdown-mode+"; package-plus = super."package+"; rect-plus = super."rect+"; - }; - - stable = shared // { # upstream issue: missing file header bufshow = markBroken super.bufshow; @@ -390,9 +397,6 @@ instantenous and formats commits for you. # upstream issue: missing file header dictionary = markBroken super.dictionary; - # missing git - egg = markBroken super.egg; - # upstream issue: missing file header elmine = markBroken super.elmine; @@ -411,8 +415,6 @@ instantenous and formats commits for you. # upstream issue: doesn't build eterm-256color = markBroken super.eterm-256color; - helm-rtags = fix-rtags super.helm-rtags; - # upstream issue: missing file header qiita = markBroken super.qiita; @@ -431,9 +433,6 @@ instantenous and formats commits for you. # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - }; - - unstable = shared // { editorconfig = super.editorconfig.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; }); @@ -441,7 +440,7 @@ instantenous and formats commits for you. egg = super.egg.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); # missing dependencies @@ -452,85 +451,85 @@ instantenous and formats commits for you. kapacitor = super.kapacitor.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); gerrit = super.gerrit.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); gerrit-download = super.gerrit-download.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); helm-rtags = fix-rtags super.helm-rtags; jist = super.jist.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); mandoku = super.mandoku.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-p4 = super.magit-p4.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-rbr = super.magit-rbr.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-circleci = super.magit-circleci.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - })); + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + })); # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { @@ -548,7 +547,7 @@ instantenous and formats commits for you. inherit (self.melpaPackages) powerline; }; - vterm = super.vterm.overrideAttrs(old: { + vterm = super.vterm.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" @@ -564,32 +563,38 @@ instantenous and formats commits for you. rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h} ''; }); - # Legacy alias - emacs-libvterm = unstable.vterm; - - # Map legacy renames from emacs2nix since code generation was ported to emacs lisp - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = - let w3m = "${lib.getBin external.w3m}/bin/w3m"; in '' + let w3m = "${lib.getBin external.w3m}/bin/w3m"; in + '' substituteInPlace w3m.el \ - --replace 'defcustom w3m-command nil' \ - 'defcustom w3m-command "${w3m}"' + --replace 'defcustom w3m-command nil' \ + 'defcustom w3m-command "${w3m}"' ''; }); }); }; - }; - in super // overrides.${variant}); + # Deprecated legacy aliases for backwards compat + aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { + "auto-complete-clang-async" = "emacsClangCompleteAsync"; + "vterm" = "emacs-libvterm"; + "0xc" = "_0xc"; + "2048-game" = "_2048-game"; + "4clojure" = "_4clojure"; + "@" = "at"; + "term+" = "term-plus"; + "term+key-intercept" = "term-plus-key-intercept"; + "term+mux" = "term-plus-mux"; + "xml+" = "xml-plus"; + }))); -in generateMelpa { } + melpaPackages = lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super; + + in + melpaPackages // aliases); + +in +generateMelpa { } From 7139d39cd3e842f35c51ddd335b1f8baeb388a49 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:41:14 +0100 Subject: [PATCH 262/310] emacsPackages: Add org packages to update-from-overlay script --- pkgs/applications/editors/emacs-modes/update-from-overlay | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs-modes/update-from-overlay index 26d2482e7ae6..fc5657e44196 100755 --- a/pkgs/applications/editors/emacs-modes/update-from-overlay +++ b/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -7,9 +7,13 @@ set -euxo pipefail curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "elpa-packages: $(date --iso)" -- elpa-generated.nix +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacsPackages.elpa-packages: $(date --iso)" -- elpa-generated.nix + +curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix +nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages --show-trace +git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacsPackages.org-packages: $(date --iso)" -- org-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacsPackages.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json From 6fe3d08fdf92537fd10cb77afe67f9e15c226b31 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:43:11 +0100 Subject: [PATCH 263/310] emacsPackages.elpa-packages: 2020-05-17 --- .../editors/emacs-modes/elpa-generated.nix | 81 ++++++++++++++----- 1 file changed, 63 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 4a9f1e9a2b0a..b1b33dc9354b 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.0.1.tar"; - sha256 = "0iqninv4wf4ap8axk9m0gi39j3kq4jpbpdc8hczd34xrp83ml46a"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar"; + sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -1036,6 +1036,21 @@ license = lib.licenses.free; }; }) {}; + eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "eldoc"; + ename = "eldoc"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el"; + sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eldoc.html"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "eldoc-eval"; @@ -1382,10 +1397,10 @@ elpaBuild { pname = "gnu-elpa"; ename = "gnu-elpa"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnu-elpa-1.0.tar"; - sha256 = "0ywwlsyvl2g49k0krk35z15l2drqg3rdf26786rw65vz4ip2j3id"; + url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar"; + sha256 = "0b0law1xwwqa42wb09b3w73psq2kx16lkiwxjxl0sshjcmarhv8r"; }; packageRequires = []; meta = { @@ -2470,10 +2485,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.46"; + version = "0.3.48"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.46.tar"; - sha256 = "1chyhfn90c23awxdmmg9z870ipbdrg47sglgid7n598dx84qyqyz"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar"; + sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv"; }; packageRequires = [ emacs ]; meta = { @@ -2526,6 +2541,21 @@ license = lib.licenses.free; }; }) {}; + project = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "project"; + ename = "project"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/project-0.1.2.el"; + sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/project.html"; + license = lib.licenses.free; + }; + }) {}; psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "psgml"; @@ -3360,10 +3390,10 @@ elpaBuild { pname = "uniquify-files"; ename = "uniquify-files"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/uniquify-files-1.0.2.tar"; - sha256 = "1vib79wsz5k94b9z0wiwhbzsdm70y9dla6szw2bb75245cx3kr0h"; + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.3.tar"; + sha256 = "04yfys615ncz3jyh3hx5sg6x6szx028223184zv52skb4j99vkwq"; }; packageRequires = [ emacs ]; meta = { @@ -3674,10 +3704,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.0.1.tar"; - sha256 = "01961apbirdi4y8qx2wb01f04knkw3hyin3ndrkjlkfslqbsnzzv"; + url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar"; + sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q"; }; packageRequires = [ emacs seq ]; meta = { @@ -3694,10 +3724,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.3.tar"; - sha256 = "1vljnhi35vix30xch9mziczg56ss1r615yn2pgdcw8wa8sm14crw"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar"; + sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -3780,6 +3810,21 @@ license = lib.licenses.free; }; }) {}; + xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + elpaBuild { + pname = "xref"; + ename = "xref"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xref-1.0.1.el"; + sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li"; + }; + packageRequires = [ emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xref.html"; + license = lib.licenses.free; + }; + }) {}; yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; From 3c5a9403293f3e829204a90b21412900112b108a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:43:12 +0100 Subject: [PATCH 264/310] emacsPackages.org-packages: 2020-05-17 --- .../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 4ff1db1c7439..4beb5750166d 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20200504"; + version = "20200511"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20200504.tar"; - sha256 = "1nalr2jafhzfkaf4bn8kscxd7nm1wz7dbw2629j2msxknw76dwk1"; + url = "https://orgmode.org/elpa/org-20200511.tar"; + sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20200504"; + version = "20200511"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20200504.tar"; - sha256 = "1ykw3qspz18jgf3ngsvk2ys282489fcjrbk7pbv3ppxzjha4rmhb"; + url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar"; + sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f"; }; packageRequires = []; meta = { From b47873026c7e356a340d0e1de7789d4e8428ac66 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:43:39 +0100 Subject: [PATCH 265/310] emacsPackages.melpa-packages: 2020-05-17 --- .../emacs-modes/recipes-archive-melpa.json | 1513 +++++++++-------- 1 file changed, 760 insertions(+), 753 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index d6015f4cbbae..a10df7791039 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -960,8 +960,8 @@ "auto-complete", "yasnippet" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -986,8 +986,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20200425, - 835 + 20200516, + 52 ], "deps": [ "dash", @@ -997,8 +997,8 @@ "s", "xcscope" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -1360,14 +1360,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20200509, - 1252 + 20200515, + 1854 ], "deps": [ "avy" ], - "commit": "c215d331cf65bf47ad0224480f1f916f64f2a955", - "sha256": "05cvm7zz2c116sr8a2p9rc771i8w4pqkwvwc2hw99g84kf2abaaf" + "commit": "b610dcb99510328d07ab1e1ea67b2f87ecb1cc5b", + "sha256": "0r7cyvrkbqq0dsm5963wn2i1wqgq0md5r8b2afjbr3m9b6v5lnq4" }, "stable": { "version": [ @@ -1817,14 +1817,14 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20200421, - 1149 + 20200512, + 1207 ], "deps": [ "cl-lib" ], - "commit": "58348d29adf8d2f23da2798badd7f89ff59cd7cc", - "sha256": "1d9hi36ml449x7qqpvcgxqx0r88jpqf1pq9k38af66ny3vd6zwl6" + "commit": "12a64b4e5c1a1e124baa74336738b6ae1972607f", + "sha256": "1pkqjg30l9sjh5m8w4p8qrlw92sxr28c3d7mq6h8sfc8dkgivd33" }, "stable": { "version": [ @@ -1963,14 +1963,14 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20200501, - 1837 + 20200511, + 1543 ], "deps": [ "powerline" ], - "commit": "5ea031bcbdf665afea7e47e519a49e2c33978833", - "sha256": "1jx17g8a6pxkw4zlx3fwhqgxfzcf3019k8fklykamfrkharzsc2l" + "commit": "a6a3bd55baee29bd372869c835aded0f7d5e5f76", + "sha256": "1yg9wdagysfa5xswdrnwngbzf7gmdhjsl40ivqnxxvb74adxcwp6" }, "stable": { "version": [ @@ -3238,11 +3238,11 @@ "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20200331, - 1717 + 20200514, + 1801 ], - "commit": "896b2be2ebb1408b8f6a49e12375229fc64fcf41", - "sha256": "047ipsyldkmpn1vw8rsnhqwc7j2cjbwb9nz0ms3r3gmyyrgc3k0g" + "commit": "7b8688c84d6032300d0c415182c7c1ad6cb7f819", + "sha256": "09x4hhycnv4sc472fqv7z8jpjx8viap5hb143yri3wkwa15bqd3b" }, "stable": { "version": [ @@ -4593,11 +4593,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20200510, - 1903 + 20200516, + 1608 ], - "commit": "a87cf772ac4517864bd11e6d053d7dcedd802012", - "sha256": "112hj631m8dv6hfip0s63kr42nwl8l5b1vzqi3dwsg2xddrsws85" + "commit": "f712de72d4618ce6c5d55ba20c848c83a87c5f32", + "sha256": "17dsdfs9l3g4jnna5b2pzifvxv13rr5rja76frl5wwp2brfmq8qv" } }, { @@ -5082,8 +5082,8 @@ 20190331, 2230 ], - "commit": "b3b85a1a4589430e9255a4ea28c4e94787c6b0fe", - "sha256": "148m78rlymxx5sr17xbvi5v864ki66jkg2hkszhyk9za4f0mgdx0" + "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", + "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" } }, { @@ -5902,11 +5902,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20200509, - 1902 + 20200515, + 1408 ], - "commit": "d0a0284575764cc9efdb3709fe3c320fd0c0873c", - "sha256": "0wbh06xsq9yqzvdfkmqbjggnfpspykyvahpcgmvrwg4kn3dlk3hd" + "commit": "39d4649f4a179e22fabbef1166afe1725c8dbea6", + "sha256": "0n5kqjcmwfbr58my3yisgfigh77rhy5b18jr4kh2b327r76ssqwl" }, "stable": { "version": [ @@ -6626,8 +6626,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200508, - 945 + 20200513, + 852 ], "deps": [ "biblio", @@ -6637,8 +6637,8 @@ "parsebib", "s" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -7411,16 +7411,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20200507, - 1851 + 20200514, + 1227 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "6427c39ace4a1bd34d573773bc896a863e8503a2", - "sha256": "1gg6f9zaggqrb1cd258p3slv1rx083vpwlkgfgwlf8v8i8yr4bxp" + "commit": "57271ed2ddca96c77b83b282019852d1cffffd26", + "sha256": "0mmyxi75hlg1lkvpk4lq5nagmcsmjijmkcmmkkq25llf7nmik8as" }, "stable": { "version": [ @@ -7444,15 +7444,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20200430, - 2304 + 20200513, + 1954 ], "deps": [ "epkg", "magit" ], - "commit": "067aa52079c49ecca97ca2d5d870a883b040d53b", - "sha256": "1wiaxr529zyk2m2jvags412qx079b0fwdzgw3nrvhvhcs3bwfwkr" + "commit": "f6a2e0cb8c3db5840c717114caba93793f2e9661", + "sha256": "1sa0wk7xj3qsk9fr4z2av80gp8n0804zylx3d27pdwm8bjyfzf7b" }, "stable": { "version": [ @@ -8452,11 +8452,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200412, - 1148 + 20200509, + 2224 ], - "commit": "532d082a363add4f6d9838ca3f924a773ce12136", - "sha256": "10ls012jy8ax43ldlvb86xjn9hsdayvw1k7wg4g8w5hmkd8x98wn" + "commit": "e71a40f1ffef4847df28c9d4ad7edc1e360ee52a", + "sha256": "0avmxbxxsazd14h5avsrqh2yyfnp8jan64sbp5ih2c9hm7xv5p1k" }, "stable": { "version": [ @@ -9571,15 +9571,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200325, - 1236 + 20200511, + 1242 ], "deps": [ "cl-lib", "powerline" ], - "commit": "e6bf9f5257fa5401695e0e33d0376a0821ac2f2f", - "sha256": "1gm06par7pglwj25ydvlp1n2vniq6283mm0g4s53ra77ywsz73jv" + "commit": "57afd81c7fd6449239af7adcda4cd2192976dbb8", + "sha256": "1sa4anfqvhidn7kxqnchk0d8kc2v0l3cxbf0bnwwx7nk04gjvshg" }, "stable": { "version": [ @@ -9706,8 +9706,8 @@ 20171115, 2108 ], - "commit": "57125f74cc91ed6890346eee7948300437b6cb5e", - "sha256": "1131hx3chpl8qsl33xmnmqkb62cwpzfc0dks52mhcx0xy8wzds6r" + "commit": "dc0e180cbaf73e86d22f1d2996c7582dd0eb07b5", + "sha256": "0n9f87syrj30dn5k4vq1l7i02hzwfnadanfjbwv4a9wfjl77xy53" }, "stable": { "version": [ @@ -10305,8 +10305,8 @@ "s", "seq" ], - "commit": "282c338c21d01932049392f271f66e1725562efd", - "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr" + "commit": "16f2ca86540001b40725c4099d04154aab0a6ba5", + "sha256": "19z8wmhsqbm12h0vvzfgjmzj7g3mcpa9qgcz3cnmrr4hgkx4b9a5" }, "stable": { "version": [ @@ -10379,8 +10379,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200507, - 1639 + 20200511, + 1025 ], "deps": [ "clojure-mode", @@ -10391,8 +10391,8 @@ "sesman", "spinner" ], - "commit": "3a59fe046c9884573512dff88d140d37c0be7b2c", - "sha256": "0fs4mny2qg73nlnjr6ynaa7vqiyklp7mwfyph2195hrrac0f3dq4" + "commit": "25fb15d915117310069254016391c9d76abcebcc", + "sha256": "1hz2l2ryllwyv1zk0la376klg7yndz9q32pd1vypwymwnac93c0y" }, "stable": { "version": [ @@ -11464,8 +11464,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20190731, - 1009 + 20200515, + 951 ], "deps": [ "cl-lib", @@ -11473,8 +11473,8 @@ "s", "seq" ], - "commit": "e3aa1ded10c079337826b40586111df7114f6379", - "sha256": "1s1z3m3qaf6ayp69w7h95ad3k4bs2iqqzsvjf94h5wd233mqlp2v" + "commit": "a8f9e83848b513f810170988679a9ef455025975", + "sha256": "1dzqqcj9l7hr73cj65rx5iy58bsiif5521d18jym4pajhzj3mkx0" }, "stable": { "version": [ @@ -11501,8 +11501,8 @@ 20190710, 1319 ], - "commit": "c2460c0e63e965c6315db666af27dc39bd5a0477", - "sha256": "19xk1m92kx50jqrbfjhklywlsv0rll9qaywkqkpg9cag1pd86bx2" + "commit": "135b5835a42d6e3c7efb85f80f3fe0885d45d644", + "sha256": "18mgkn5cy14f5l4qajhdphxvw66hhhw2yf12qfvpd2n5bx3b8dcs" }, "stable": { "version": [ @@ -13454,8 +13454,8 @@ "dash", "org-roam" ], - "commit": "b5af6f2e783bfb337c8f0ae33674e0963c71cea0", - "sha256": "16nh58ih73q014crlm3iw55h04klb76g80zf43lmxilbhxyxk9x4" + "commit": "674c2bd493f571c5323d69279557a6c18ccbd14e", + "sha256": "1x88kvxawbpg4sagi0kh4y7inyhy05dxcg8hl0ih4x40cwxyxrs5" }, "stable": { "version": [ @@ -13486,8 +13486,8 @@ "cl-lib", "company" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -13584,15 +13584,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200408, - 400 + 20200514, + 2116 ], "deps": [ "company", "posframe" ], - "commit": "9b59cd679c4396cbfe8118a9dfa8a5acfe038ac6", - "sha256": "1z18libg2nplx8a8dcycdzm354gczqzg8r37agzz0jk1a7frxa7m" + "commit": "4e506d661ed9cd2e4cf16281f3a11009210e9c30", + "sha256": "1h6pls6vg593cbmvq2kh5z67jvcyljvwbdxypqqsls5d22hvvbh5" }, "stable": { "version": [ @@ -14837,14 +14837,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200507, - 2247 + 20200512, + 1130 ], "deps": [ "swiper" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -14984,26 +14984,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200501, - 540 + 20200514, + 1224 ], "deps": [ "counsel" ], - "commit": "b03f02e7838199895a7b11cc8b2915f4746f1eba", - "sha256": "08nij19m51vzw8gy2sjxzflsqlnh2ink1ickh9sc4zwifbryimyy" + "commit": "362fc857a271e509d05fa190212629dc6b0778f2", + "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" }, "stable": { "version": [ 1, 9, - 7 + 8 ], "deps": [ "counsel" ], - "commit": "b03f02e7838199895a7b11cc8b2915f4746f1eba", - "sha256": "08nij19m51vzw8gy2sjxzflsqlnh2ink1ickh9sc4zwifbryimyy" + "commit": "362fc857a271e509d05fa190212629dc6b0778f2", + "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" } }, { @@ -15280,8 +15280,8 @@ "deps": [ "counsel" ], - "commit": "da451df4c5f0ba32056ec600e8eb6a2c7ca4df08", - "sha256": "18qlwyjqxap2qfbz14ma6yqp4p3v4q2y8idc355s4szjdd2as2lr" + "commit": "719b38ba2242cc1c6d1d79cab106c8c8b1afa775", + "sha256": "1jjgyps59xiyqdi392cfbx19n0znw3kj3fxbc5v3l56i3qm24bd4" }, "stable": { "version": [ @@ -16482,8 +16482,8 @@ 20190111, 2150 ], - "commit": "9e04e1ee5b1ab67391bf461e9d1f0ef8d6049902", - "sha256": "013bhb4yb55525lvplnqhia5wlik807dvvh6zim3zimxzyv4b66c" + "commit": "d6e6de9237bde72e7878f7b1fe0e58fdccd36dd2", + "sha256": "0lac5lqina90w8mdjkqa9qk4b52lmh6kibcph1xcjghqlw7agjfn" }, "stable": { "version": [ @@ -16690,8 +16690,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200511, - 425 + 20200514, + 1655 ], "deps": [ "bui", @@ -16702,8 +16702,8 @@ "lsp-treemacs", "s" ], - "commit": "3b8fd16cda74a4834594f487b7a540cc165470cf", - "sha256": "0jy70lj5krnj87icb1mgy30chr5jxhmiwy6cm2w2n7k8bp63jh6w" + "commit": "86fc65d525e30c0249e7ec6acac5e4e55cd7c3e2", + "sha256": "1jfrjrbjscjsa52wjvvmhcl4cqrw43wz4f34z8yzsxmsalgpf0nw" }, "stable": { "version": [ @@ -17107,30 +17107,30 @@ "repo": "jcs-elpa/dashboard-ls", "unstable": { "version": [ - 20200329, - 1443 + 20200515, + 1430 ], "deps": [ "dashboard", "f", "s" ], - "commit": "9026fd157f94b023a7b660a418b66ad638b14272", - "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + "commit": "8b2922abb75847787626fe241d609cff7eabf840", + "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "dashboard", "f", "s" ], - "commit": "9026fd157f94b023a7b660a418b66ad638b14272", - "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + "commit": "8b2922abb75847787626fe241d609cff7eabf840", + "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h" } }, { @@ -17774,11 +17774,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20181226, - 1534 + 20200515, + 1513 ], - "commit": "f54e8a65a7e75a029657364055420374df45656d", - "sha256": "1vas6jgwli0jcxmxmcwvzwv4414q8kkmhqfz5m96r7l4lpgcrhdr" + "commit": "fca9ea05ef4fdac825e2ad3921baa7042f6b82c8", + "sha256": "0h5znwc4sa92l2472204yn60z30ysvkr9hphjga7kn4j4jgvqak1" }, "stable": { "version": [ @@ -20171,11 +20171,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200504, - 2258 + 20200514, + 2215 ], - "commit": "992d14ca51ccc1e27c9c4a09f89b072cd6cb3fe3", - "sha256": "0ajyhric6008ik1mzlcmk0i856a3plhk0bri7chc9w7wz4lwshpv" + "commit": "1bcec209e12200c9b93b0d95f61b964b5de4439c", + "sha256": "03lbsww77vq1wrpj94jdx62zmjjhir9i50g85l8yadlp9696zh3s" } }, { @@ -20290,16 +20290,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200502, - 434 + 20200513, + 1103 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "df56aad083243124cbd346c1b9ae38b5ebdd2340", - "sha256": "0zylvc8nfpgmss1j8rkln3z23vdav1cqfr2c9s59i9fwd9sv7q0k" + "commit": "2b308857677e983ca4eaedc36438ed94aadf9e65", + "sha256": "1c7mk26drz9yldy3kvcxxnabg8ph900pj1g029xhd1407x417vqc" }, "stable": { "version": [ @@ -20324,14 +20324,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200507, - 524 + 20200514, + 2115 ], "deps": [ "cl-lib" ], - "commit": "34f181c290d2c9fb9628e4ec85c16e633931ede1", - "sha256": "161hp69n3zwnyb9f9pxpidx7jw3190v16j1fgsdsa08c1pq46q8m" + "commit": "95463eac68fe88535d9342c7b4c2cbaae3c80950", + "sha256": "0ccq6gzahpsxsgmmd9dl16mfnz1n9sgn0ns62n03s3xgmf4ay3ap" }, "stable": { "version": [ @@ -20536,11 +20536,11 @@ "repo": "david-christiansen/dr-racket-like-unicode", "unstable": { "version": [ - 20161021, - 1211 + 20200513, + 1642 ], - "commit": "a69e364532fffa451d1f12ade8fadb9cdbd8318c", - "sha256": "12pwfv0j54idvn061l3qxf0vrrl56085n517izh8x6jkgxjcx7k0" + "commit": "70bc1caea6b277e49e1cb29e1926a7b0c83c5ebc", + "sha256": "1an4hk9cjg1lhis0japdr371mnf1p4pl5mzl0l1cfkvprbxhzy65" }, "stable": { "version": [ @@ -20560,11 +20560,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200429, - 1947 + 20200514, + 1527 ], - "commit": "e5cbc350f49a30ad78a84e68b4e1682d018c9b7f", - "sha256": "1gakipj027mncv3g18ap6lshj89s8cg5wscabr3afs9gavkp52py" + "commit": "c162aff5025a7e9f55785d7177d59f4a3aa60183", + "sha256": "11wlrvrz3q054nqkdbd4525kh50cspszrgmqd74plah6jc95wpa3" }, "stable": { "version": [ @@ -20890,17 +20890,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200423, - 1658 + 20200513, + 2014 ], "deps": [ "dash", - "f", "popup", "s" ], - "commit": "d760aa880fc1052570ab0fd7e586eeffb7636af6", - "sha256": "0a27fv2yi4c19g78hgflrp8vx135v74q6n8ak3g3b2gh66vkvq7p" + "commit": "194bfdbe305e21d8e6d29893d449686c85273207", + "sha256": "0lz5kajhkqh18xyg07bshvl0v5j5g5xj4q8p6min1mapm8shnv2i" }, "stable": { "version": [ @@ -20944,8 +20943,8 @@ 20191016, 1241 ], - "commit": "73a70c02aa569f92e7c7bda21ff1728e37af53cf", - "sha256": "1ifya6ri0yz8bbncs1qm5ip9pjzq6ykgv1ilya51hggxwf3fs1db" + "commit": "e5bec1a57fd4ebeedc848e76e0cf991db7e22fd0", + "sha256": "091z6p93sv3aqf7bcw41nwh4kvvpsfncjny2fwcv3vv7zlyj2px2" }, "stable": { "version": [ @@ -21411,8 +21410,8 @@ "popup", "request" ], - "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb", - "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x" + "commit": "2dfdcdbcd8eb81c3fd631372d7dceb4f432d5f1e", + "sha256": "19j7r14qxh2cl4zi4vssbbqjhp6r53gjavnwyihk52llxcgrxrr7" }, "stable": { "version": [ @@ -21613,26 +21612,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200419, - 2017 + 20200513, + 2326 ], "deps": [ "parsebib" ], - "commit": "87920ab793e6e854903eb101b80a0746f588dab6", - "sha256": "0mw5spmjn8yyjbdpas06rf9cmfsfa3k2z0yfrs7xvmaalpxz55xm" + "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", + "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" }, "stable": { "version": [ 2, - 22, + 23, 1 ], "deps": [ "parsebib" ], - "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10", - "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz" + "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", + "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" } }, { @@ -22409,8 +22408,8 @@ 20200107, 2333 ], - "commit": "9b17c3a0033d7a4dbcfb48e8fbc50a0d5e073057", - "sha256": "1f3sz0wfx60qv9b0ciqiwnvz46f8xbpnb5x3c9531mfccfhx71ix" + "commit": "1809fd4c001a4ae2fa5e2b721b67c1059fb8e9b8", + "sha256": "0ssh0chavas524jwj3r9bywkd8rgnbjz4xcgxhbnjfcl786pmyw7" }, "stable": { "version": [ @@ -22430,15 +22429,18 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200507, - 2251 + 20200516, + 1013 ], "deps": [ + "eldoc", "flymake", - "jsonrpc" + "jsonrpc", + "package", + "xref" ], - "commit": "bb51d47dd6e59e5bef1bfb393a39a73a7811d0ee", - "sha256": "0rs15c1biaqjpkxx32dc59w1z9gnd31n13qb80gb9ib8li1cgnr1" + "commit": "bf75312b8e7ea5136905d7a55a6d705b51b2b6c9", + "sha256": "1xbisdraj04jns0vcpcvnqqiwib3b8jpbian1nnmllvscfdz6c7l" }, "stable": { "version": [ @@ -22461,28 +22463,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200508, - 1552 + 20200514, + 2034 ], "deps": [ "eglot", "julia-mode" ], - "commit": "65c70b8203684a34de16868583e2424de41b9ab6", - "sha256": "16jmpkqhkxaqj37d5qax5b2x003pas71rw3k3rlzindhmqnhd0as" + "commit": "844f12d881a3305d319e959b032e01501be1e8ae", + "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" }, "stable": { "version": [ - 1, - 3, + 2, + 0, 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "65c70b8203684a34de16868583e2424de41b9ab6", - "sha256": "16jmpkqhkxaqj37d5qax5b2x003pas71rw3k3rlzindhmqnhd0as" + "commit": "844f12d881a3305d319e959b032e01501be1e8ae", + "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" } }, { @@ -22555,8 +22557,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200508, - 1712 + 20200514, + 2040 ], "deps": [ "anaphora", @@ -22567,8 +22569,8 @@ "request", "websocket" ], - "commit": "e39a48334607cacd42011f21fa56ebf291258a1b", - "sha256": "1fk9aryjwh88jmb2a45rs0z7h6sy4r53h1qpairl5bi1jllgg3lb" + "commit": "ec3aa36bf37a78e99723563e38f81ee24b855524", + "sha256": "0pr14dv4bbxgpki8kd1z9i07x1khb0v2wr82483qf3hhqafv6lrm" }, "stable": { "version": [ @@ -22642,8 +22644,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200502, - 36 + 20200516, + 1604 ], "deps": [ "auto-complete", @@ -22652,8 +22654,8 @@ "direx", "spinner" ], - "commit": "4aca86cea6b3120b10af52eab26cefdef2965574", - "sha256": "07gn75njy0hmiddymj4khw59mrnzwml0dqpzm0g5il697v4rpqgj" + "commit": "b02e0bbc6df08a4ae44d16ac57886e56cfb8095d", + "sha256": "0vs4kcdval7klzbs21jq2rcxs013r7rskpxgjc7lrq1qrsgyyq9d" }, "stable": { "version": [ @@ -23126,11 +23128,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20200510, - 1521 + 20200515, + 1905 ], - "commit": "f345065592b4bc9a5173b44e12a74400335d4e49", - "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd" + "commit": "a76712621a4851fdb0bc3d76f454898afefedf6e", + "sha256": "1jc6l0pcsyv9wgp58ij9wvjj4x4a3zz4svsna2aq86pf8bbbyng9" }, "stable": { "version": [ @@ -24178,20 +24180,20 @@ "url": "git://thelambdalab.xyz/elpher.git", "unstable": { "version": [ - 20191212, - 1858 + 20200516, + 1232 ], - "commit": "c9175aedfaf3daeca6b2414f74ef703f2f6cbc1f", - "sha256": "18jps4rn9nmjxlkg2849rh7bp7pg5zfx7yhhmq078jkvnygv3m2l" + "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", + "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" }, "stable": { "version": [ 2, - 5, - 2 + 7, + 1 ], - "commit": "12629c283e0e3e62561d1456a2f8842b3524df57", - "sha256": "023ih6bgqf98jgzqy03nplwxhabaj9x9dqk3c8bmd50ndgrspc7q" + "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", + "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" } }, { @@ -25294,15 +25296,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20200503, - 836 + 20200513, + 1627 ], "deps": [ "ht", "seq" ], - "commit": "20d4fc0ea45a53f7edbe99c83317a3e048e398ef", - "sha256": "1snlx70dy8kjknrydbpf3vkrdrzwsy0mb5vlj273vhm3nmjbs2mg" + "commit": "dfa3c6d060914c6082d6837da32df0c337330ee4", + "sha256": "0m963cn916m0xa8cb1yslkcla86a34dchwy3ism62a2r9swa7p6s" }, "stable": { "version": [ @@ -25813,25 +25815,25 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200510, - 429 + 20200511, + 2235 ], "deps": [ "cl-lib" ], - "commit": "8165a5f1e0190a45029d610dc442c9eaa6e82c11", - "sha256": "0icrrps06j27v69pqglv3j7h4nc5mpcqqwziasv403lpm4bb8hcz" + "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", + "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "0a820043490c47c60d2fc968a5120308eea3d7e7", - "sha256": "1427hlavz6j232clrh4vbgwjahm328kvj7hls3s6hziicf2kdczx" + "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", + "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" } }, { @@ -26150,14 +26152,14 @@ "repo": "mhayashi1120/Emacs-erefactor", "unstable": { "version": [ - 20160121, - 959 + 20200513, + 1252 ], "deps": [ "cl-lib" ], - "commit": "bf68085e5635eb94fd85709f8e1355c1f5534745", - "sha256": "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng" + "commit": "bfe27a1b8c7cac0fe054e76113e941efa3775fe8", + "sha256": "1071gqli1qd498syhysyj2wzyw1nya5070m82xd9qalqdh11b8is" }, "stable": { "version": [ @@ -26235,18 +26237,16 @@ 20200313, 1030 ], - "commit": "9639877ea11d6a32ca6e46410b8a48db245b72d8", - "sha256": "19sdribjxzn13drqv0jcjwbmddkjvnm1iyx1njdlfaaq0625q8w3" + "commit": "e5d476b5f22927d341caf1774355d9e69e390cfa", + "sha256": "1kcdl56qybvq4m5dp65n3nbg6xijb793xi25yckk5nc17n1nwrzb" }, "stable": { "version": [ 23, - 0, - -1, - 3 + 0 ], - "commit": "9f17d424ada5353db1e5b31296484d95679f8ca8", - "sha256": "0012fbf9a1whq2bzii73m645bvf4vww403fcd54j9k27916vcfx5" + "commit": "7a8d04dbcb388a5d837a213ad249c1b96e19e998", + "sha256": "0hw0js0man58m5mdrzrig5q1agifp92wxphnbxk1qxxbl6ccs6ls" } }, { @@ -27036,14 +27036,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200503, - 1654 + 20200516, + 522 ], "deps": [ "julia-mode" ], - "commit": "2e7d36dc9b500ce21c5cb8534ea573669f93ee0b", - "sha256": "1kjpgspjpipirc48acb3d6bfsrmd8yrz35ck1sx0id7y8nni1d8k" + "commit": "8f04fa92a11cdb4a3777755fdbaaa65e076f04ef", + "sha256": "10cg90aqlr5y3vmp94zhkwj3l178l9f32igpl38bzxm9hmdgikfr" }, "stable": { "version": [ @@ -27368,22 +27368,22 @@ "dash", "paredit" ], - "commit": "0fe2d3fa0fd1739ec096f149dc067b586e05c75c", - "sha256": "0gswgn99pqikw44mp4v6b4bxvh6bj132gq5x3swvkmi3f56l0bry" + "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f", + "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn" }, "stable": { "version": [ 0, 9, - 6 + 7 ], "deps": [ "ace-window", "dash", "paredit" ], - "commit": "7e2b42570b449b2a3c2922f3036a027d1e393a60", - "sha256": "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy" + "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f", + "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn" } }, { @@ -27492,16 +27492,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200417, - 1238 + 20200516, + 1740 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "d243eae8649272799ec3864fde14c1164f036940", - "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" + "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", + "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" }, "stable": { "version": [ @@ -27526,15 +27526,15 @@ "repo": "emacsorphanage/evil-anzu", "unstable": { "version": [ - 20170124, - 718 + 20200514, + 1902 ], "deps": [ "anzu", "evil" ], - "commit": "9bca6ca14d865e7e005bc02a28a09b4ae74facc9", - "sha256": "1y0jiglcazxnvggs5ljys2iizljsihlgr46svbbwgf45ibdrw392" + "commit": "d3f6ed4773b48767bd5f4708c7f083336a8a8a86", + "sha256": "0ribvnw2slaad4xlcyxhg3linvd810qqn52qpyrjsq0dnqrpmwyl" }, "stable": { "version": [ @@ -27695,16 +27695,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200509, - 853 + 20200513, + 804 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "d062cc206d671fb5aefb1e0e679a9cb1d6c73e33", - "sha256": "1zizfqmfrxx3shgggwa74rg2qqbrs8704wf94ajx0k11dbm1dbrp" + "commit": "e998952dfe73d296259905e1bd8f96659bfe2661", + "sha256": "1r896jbshniaxxh15iw87yklnr2hq5as3a8w6xb202gxz5pvc4ym" }, "stable": { "version": [ @@ -29029,8 +29029,8 @@ "deps": [ "evil" ], - "commit": "d243eae8649272799ec3864fde14c1164f036940", - "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" + "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", + "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" }, "stable": { "version": [ @@ -31410,8 +31410,8 @@ "string-utils", "tabulated-list" ], - "commit": "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084", - "sha256": "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic" + "commit": "5cddb64e0d52635e9a1529d80cb5cefa6f829341", + "sha256": "0kl2b4j93kk9lzw0qclib55ghcwznag3p022jkr0bq5z30m2gdj4" }, "stable": { "version": [ @@ -31944,8 +31944,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200509, - 2127 + 20200516, + 1719 ], "deps": [ "dash", @@ -31953,8 +31953,8 @@ "pkg-info", "seq" ], - "commit": "33db306f3b8733592c170a5f7d7445465f47c10d", - "sha256": "0pl0ywg2aaifhj5gzj3ka5pklbbag2aa28gn7faaqwjhkknbka8n" + "commit": "309d37286729994094b931344c9a664dd7c6c08d", + "sha256": "1gsa4lik5f0dzn897lh369nmcn7n61if80ll5jc5qiymm1fx16cr" }, "stable": { "version": [ @@ -32821,25 +32821,25 @@ "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20200510, - 1334 + 20200515, + 1120 ], "deps": [ "flycheck" ], - "commit": "1743f1dd935a7949cb81b543b98b8dfca7c58fd8", - "sha256": "0v6f15s5gr9ddxk2ya30gf8vk47m2zk0d1l102v87ll5d67f40ly" + "commit": "8608df3144714d79b93afcfe13400693ed763ed8", + "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "flycheck" ], - "commit": "1743f1dd935a7949cb81b543b98b8dfca7c58fd8", - "sha256": "0v6f15s5gr9ddxk2ya30gf8vk47m2zk0d1l102v87ll5d67f40ly" + "commit": "8608df3144714d79b93afcfe13400693ed763ed8", + "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" } }, { @@ -33697,15 +33697,15 @@ "repo": "flycheck/flycheck-pos-tip", "unstable": { "version": [ - 20180610, - 1615 + 20200516, + 1600 ], "deps": [ "flycheck", "pos-tip" ], - "commit": "909113977d37739387c7f099d74a724cfe6efcec", - "sha256": "0rfbhvl8n656a9d58bjyzki9r3si3ypylbyjn67rnla4jzzi22v8" + "commit": "dc57beac0e59669926ad720c7af38b27c3a30467", + "sha256": "15h4m5cfk0vh1g630vlwfxmcpa1jdalrrldnvijsqla99mb2jm1w" }, "stable": { "version": [ @@ -35317,8 +35317,8 @@ 20200215, 1408 ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35345,8 +35345,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35377,8 +35377,8 @@ "flyspell-correct", "helm" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35402,15 +35402,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200215, - 1503 + 20200513, + 708 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35441,8 +35441,8 @@ "flyspell-correct", "popup" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35999,15 +35999,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200422, - 1731 + 20200513, + 1930 ], "deps": [ "cl-lib", "language-id" ], - "commit": "c157b57e963da0b44a079b0477d6c742e9c5a10b", - "sha256": "15pqff80ydcvkvbiyi50aix5mnwgrhvvajk60i6cwgkb2xghs20r" + "commit": "0227e1aadeb18db397f03368d54cbefe4afd6112", + "sha256": "0p04xgswp269a17jpiwpj8qfj3c2zvkmr4vn0wa1dfrw5f5bfj2x" }, "stable": { "version": [ @@ -36144,14 +36144,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200416, - 841 + 20200516, + 624 ], "deps": [ "seq" ], - "commit": "5998d977ca84930e124558007dc65370164ed960", - "sha256": "1hmc3pacscr0f02cw6hbbv444k07k5gf1909lyz8jpfr5r5wi2in" + "commit": "83d308b6fd26662bc8fb204c4d634616e03dca44", + "sha256": "0a068qfc969bvxyynrk2yakv2l3y31snnvcpdsbxd4m4m6drv3lw" }, "stable": { "version": [ @@ -36737,14 +36737,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20190611, - 1350 + 20200514, + 1516 ], "deps": [ "cl-lib" ], - "commit": "484d564b5d2a5e6dd9c3f522b35cfeef2164c437", - "sha256": "105x7mrip5xbyhimgqx1nb0lkyi68j5fpfhc6y0dzm4c4bf77jfm" + "commit": "68f6eeb3adbc7d9f71d24761600bf8538775c969", + "sha256": "16iz2wf8bn4mjcgbc5vj50snlgiqqdc495kxbd9mcld5rjhfs45q" }, "stable": { "version": [ @@ -37289,11 +37289,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200510, - 1813 + 20200513, + 1219 ], - "commit": "95950e3bfb8407f8925dd8717053bf688bb4df7d", - "sha256": "03jhqzd22swyvg1ry4b4ssvyjqqq5sqh0xa9q3zs7cgm9jjhxbkg" + "commit": "7a39c8eb7ca2a0a4fe0ad307ea55578e11e6dfdd", + "sha256": "09lv9ixgrkb351nb67nas5yfa8vk0rz4ljhc1hxxn4g451hbd14f" }, "stable": { "version": [ @@ -37331,14 +37331,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20200425, - 1425 + 20200516, + 50 ], "deps": [ "cl-lib" ], - "commit": "42e38034cd2305fa7432866323c923979d8f9b06", - "sha256": "0aalp4x5gp0yhv037ymspsj4n3vqzxld0c1nk8ihl50k6krl4kxy" + "commit": "a0b17d207badf462311b2eef7c065b884462cb7c", + "sha256": "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv" } }, { @@ -38113,8 +38113,8 @@ "transient", "with-editor" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -39198,11 +39198,11 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20200427, - 1637 + 20200511, + 2146 ], - "commit": "8a273c9bfa57776b00095a648c2aa053cc418e91", - "sha256": "0msd5ffvhd44m129i03f04v7x6x0l667nxi435c4kp6m8h0za603" + "commit": "5239c1ba873eb907d5665964820b4a7ddbf75b5c", + "sha256": "0yp1hq849drkkbypaaak36i5s1q9ff549w21qswmi60nmiikabsg" } }, { @@ -39526,8 +39526,8 @@ "org", "s" ], - "commit": "053a4303b8e9d3b8a67fe58e6f87ba6c76c90a97", - "sha256": "1lygfkgmzvy7iwc8d55j6ypfhf5wfybch1ksqcndyjklhd2n0v5j" + "commit": "c5c057263ecc86f60b62a1e811e63cfb1c394c15", + "sha256": "1rfkc6pp2kkin87hbjz1192hb6hf24ygiyd6zigs3bfaxja313rp" }, "stable": { "version": [ @@ -39547,20 +39547,20 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20190423, - 1146 + 20200513, + 1038 ], - "commit": "d9375cfad0054a05c910c1210f0f37aa601aebba", - "sha256": "19ggfisfxq2bk62axdi0nipwxymrvnnvmijcrwc9yglbnhiigdb5" + "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", + "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "df85e5810c02f613bfa6e236674de969d6e00ae1", - "sha256": "0hvsp9y0vzcr9c2wglh0wdavjmp2n2hbhlsr1bfvnfxk97ka0y5r" + "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", + "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" } }, { @@ -40488,8 +40488,8 @@ 20180130, 1736 ], - "commit": "95d408ee1120e7b7a32d9e79dbdceb77e5787b7f", - "sha256": "05c7si8hp1n2jhcknab4qkdv9wkzpzb7355vr4cvh6l5aqi4qryr" + "commit": "7a59e424c8e641605e30eed68197859533ea6aaf", + "sha256": "1w9hf7bcdd5ddjavhj0ggnxipf5f5w3cfj52n9i46jmm6g2x2b5g" } }, { @@ -40851,8 +40851,8 @@ "magit-popup", "s" ], - "commit": "d3d5c59428e3f27a166d29641651b68690ba41d3", - "sha256": "1ixzjcca432xsi3f8pd7hs7js63xh84h3472xnd0qjk97bxhn995" + "commit": "0c56c1e833bc9e21b603539a19bdfe4836a197ed", + "sha256": "0iaa34hh0zpy9alf0d6bad7qwk565l9k5k09ig342pwnmigz1scs" }, "stable": { "version": [ @@ -41665,14 +41665,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200505, - 852 + 20200514, + 740 ], "deps": [ "autothemer" ], - "commit": "6e2fcbdb0608e6381ab86287ef84451d672bd3ef", - "sha256": "1z3dl9d6v1bl6b7mai8b6i8i2ywxjzbmfqjdhanb926mrkn5h22k" + "commit": "f1dfcd8bd50e4885cab71b174bbc6a620c2b9d7f", + "sha256": "106vkpm75s3s52bkmcnjlw8gx3qlh5hffwvj2bvkmqfcgnxpzgx0" }, "stable": { "version": [ @@ -42571,19 +42571,19 @@ "url": "https://git.spwhitton.name/haskell-tab-indent", "unstable": { "version": [ - 20170701, - 958 + 20200513, + 1950 ], - "commit": "b921c076c10ba996bcfb3b38654363d30567bfa5", - "sha256": "046wiccc4kg81jcqmxzxh5karfbdg2z1d8i4nzcbz7q3n27x0l5f" + "commit": "0482f0de774c58bd7f2e079f5bf01781eed709a3", + "sha256": "05hgxrmsrmg5i50zxs7pa2xnfn2sja09hdk8xjsalnbbjvn4mmxx" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "6d3b878765b9ef7a4b2c1f5dfd47309d4ab7c419", - "sha256": "07pcn244alqaiqwj9a5jcyh4hp5n71bsnhpilqy3xv0sn6ci1v2q" + "commit": "1127f46eca40a48be9cd2380df2cfc5f0b694e63", + "sha256": "13c2z1i7icpwv60njn83qbla9i0qlq3m0yz88ach1mlvmsdfj9jz" } }, { @@ -42851,16 +42851,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200510, - 1345 + 20200515, + 715 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "16403ddf8a172aca72421f199cf6058bb7a53ad4", - "sha256": "1xp1cjs36w5ahjaf565bjdr2y5f1fk6y6yimpvb4jqj6w9lajh6g" + "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", + "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" }, "stable": { "version": [ @@ -42974,14 +42974,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200510, - 223 + 20200516, + 613 ], "deps": [ "helm" ], - "commit": "429d3d9d8d90d3b7e8d35032c42206e930f9e481", - "sha256": "0kl6x6igbynzl1x36nqz5wyrqq4wchw2qpvp3lm80av6bncx6i2s" + "commit": "ae1dbefa151544035272d04e56e0147185a847c5", + "sha256": "03q29x63v500b3h4mj99h619ayifb12rrqiyyihm84i9lmgp5r28" }, "stable": { "version": [ @@ -43126,8 +43126,8 @@ "cl-lib", "helm" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -43733,14 +43733,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200504, - 544 + 20200514, + 644 ], "deps": [ "async" ], - "commit": "16403ddf8a172aca72421f199cf6058bb7a53ad4", - "sha256": "1xp1cjs36w5ahjaf565bjdr2y5f1fk6y6yimpvb4jqj6w9lajh6g" + "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", + "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" }, "stable": { "version": [ @@ -45826,8 +45826,8 @@ "repo": "alphapapa/helm-org-rifle", "unstable": { "version": [ - 20190809, - 1831 + 20200512, + 1943 ], "deps": [ "dash", @@ -45835,14 +45835,14 @@ "helm", "s" ], - "commit": "abc14bb85427a6585aa354894eaef6926881d585", - "sha256": "1ggj84b8wgd8xj6a442wfccvyaqg605zpikx19vqzwymaqbay85f" + "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f", + "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49" }, "stable": { "version": [ 1, 7, - 0 + 1 ], "deps": [ "dash", @@ -45850,8 +45850,8 @@ "helm", "s" ], - "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", - "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" + "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f", + "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49" } }, { @@ -46057,15 +46057,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20200118, - 2302 + 20200512, + 1146 ], "deps": [ "helm", "posframe" ], - "commit": "7970f9397ba7d148e590e4ffb340bf6c7c0602fc", - "sha256": "0106fsdzp3911spylrixqkgpnjnfg491f0rmbqmn4hc1shnc2sbk" + "commit": "b107e64eedef6292c49d590f30d320c29b64190b", + "sha256": "09y98ij4wkqh771ahwi3b7nsg6yb2b69n94v3ad41kp4q0c2rscd" } }, { @@ -46906,14 +46906,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200321, - 231 + 20200515, + 417 ], "deps": [ "helm" ], - "commit": "069dc0b3970f1e796e34b7789ae51b1b7979ee30", - "sha256": "1jf1573r8v4mda1xiszrz51qarb1ii31cyk0v3ci16bi9dpp8swb" + "commit": "2efc552591102ab8b4408ad60a3c4be991bb8e93", + "sha256": "0fbahbcgdcbmnhv3m2pmxy8n01qab5x0468bikygs80krch84qh5" }, "stable": { "version": [ @@ -47070,8 +47070,8 @@ "deps": [ "helm" ], - "commit": "924b5516270b3933e847562e8e14e3888dd24184", - "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" + "commit": "55e56975fe1456591a293bf60c183c3dda9f788f", + "sha256": "0py1k0r15frj67mazfjkdwi8sx5a51ykrrbzvfb73kakq2f55jap" }, "stable": { "version": [ @@ -49526,14 +49526,14 @@ "repo": "conao3/iceberg-theme.el", "unstable": { "version": [ - 20200510, - 552 + 20200515, + 934 ], "deps": [ "solarized-theme" ], - "commit": "50dc87567d450e32f91436badf25b45708126edf", - "sha256": "0r2v3x6gsqvvky66qcdzc7z1b4nj8wdz9nzhag2qv683sh1g82mg" + "commit": "9615307cbd37e698d6939a04128162ef893313cb", + "sha256": "02lsbzk5215z1rdvs6idnv2yff2487i4pqi1ljdjfn3g43ly5lr2" } }, { @@ -51177,19 +51177,19 @@ "repo": "dieter-wilhelm/inform", "unstable": { "version": [ - 20200510, - 1325 + 20200512, + 1351 ], - "commit": "9f9b98ead8aea4a50faf2bb4d60b28cab521c70e", - "sha256": "1i7ki31acn3y1mvsyn0rcnipmbj72n6s4n2fp8zy6228ss8kan18" + "commit": "54e0c51960c7f50de31a6831c034ea6adc5a8892", + "sha256": "0j3hc3f7yx9dklbvvwpcq0d2n3lp0z47l5066ngvmm52aihhhiyd" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "3f0c6e05964ba65e6f452bf043feb1f0b9fd3eee", - "sha256": "0gmj64zskb7misz1l7ymjlh984l8ykp7g93vrjm5bq7xmg2726bx" + "commit": "5e096549632b2691fe1f975394d07a31cf603fc6", + "sha256": "0bs0z957cs240cacl3bl72dp1sqcpd0j60yrv972w6p1j9v0f3rn" } }, { @@ -51354,11 +51354,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20191218, - 2038 + 20200515, + 421 ], - "commit": "8b648afaaab5eaddb7afcd602b8a76cbfb12412b", - "sha256": "0zfv4cnj11i7lagfyqmy4ch01szj450458yqffjn84hfikbf4q78" + "commit": "0f289a3f465728ed41d532674166eef09ac7209b", + "sha256": "1bchvrmmcbw8ird7i1klz0ds2xkfmwccz2pp59ixgys0j8cxnq4b" } }, { @@ -52132,11 +52132,11 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20200510, - 1355 + 20200512, + 2111 ], - "commit": "e2d8622343cb4bbbd6211533007eff2f417034eb", - "sha256": "1808dsc2zyzsbqm7zkz0zkpidgkw0vz8klmy2354ggjhb1klmxwj" + "commit": "b87c1e8ac50f728e8d33b5b69bf4124ef90b88ba", + "sha256": "09yasj1vfakryjvs22a3gd27wwa866b2pkvajwp8hlngk11sc3p3" }, "stable": { "version": [ @@ -52211,11 +52211,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200504, - 1931 + 20200515, + 1845 ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -52243,8 +52243,8 @@ "cl-lib", "swiper" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -52525,8 +52525,8 @@ "hydra", "ivy" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -53892,11 +53892,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200510, - 1041 + 20200516, + 1606 ], - "commit": "8525416b6d166ea022192e6f694c8405edc94160", - "sha256": "180rlz6fzb947kxwpp37v244py5fapxfiag4ipxmf3ld8g55g3mn" + "commit": "85214664a9f20faab7c45087b28bedd0feabb560", + "sha256": "0kvi1cqn4hdcs2mc4lsddy01yyixvm2ykqq6j4yb9h07lixrxih6" }, "stable": { "version": [ @@ -54626,8 +54626,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200505, - 1504 + 20200515, + 2010 ], "deps": [ "cl-lib", @@ -54638,8 +54638,8 @@ "spinner", "vterm" ], - "commit": "e2f1e60098b1a2b3e166130e989489f7b845f8e1", - "sha256": "1l9w8404jwj6dsr9q4zx5ij6mbyp9qyj8116hs83s6jxgidi6fp6" + "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", + "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" }, "stable": { "version": [ @@ -54647,7 +54647,7 @@ 0, 0, -1, - 3 + 4 ], "deps": [ "cl-lib", @@ -54658,8 +54658,8 @@ "spinner", "vterm" ], - "commit": "483d088853584a9f1603a062bce5705f0a7d99fe", - "sha256": "0k3lwq6r1y23gmlqx7a70psgzncf4k1zcykc7plzl79xas28rbrz" + "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", + "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" } }, { @@ -55549,11 +55549,11 @@ "repo": "chuntaro/emacs-keypression", "unstable": { "version": [ - 20200114, - 750 + 20200514, + 822 ], - "commit": "9ce977dabd8355ebe35d9d06821e4edb09060d2b", - "sha256": "0wrm5k1a9j90qqfx2w844nc9xd9a70x9krp1x3qm4zhal6mf0kzn" + "commit": "1e00bbdb451fd88bde9917526fd0b13b2a1bd26c", + "sha256": "06j8pqss8izhyahf0nw95mg34lbclhzk4f5vzfg35qcmjmbmqzg6" } }, { @@ -55842,8 +55842,8 @@ 20180702, 2029 ], - "commit": "db44e647c5e51251f0318b9b14e2c194163b4929", - "sha256": "19y8y66x4r4xmi3l1w79rp31pw17mmrxc8vcv6c49hd3js9jrx06" + "commit": "c0227c5ce4011033b5f0cf2815c352d123a13305", + "sha256": "1l3fjljm7abk29ibbbvds7nq72yqrgcsy5bv42s1czbffw62zcn6" }, "stable": { "version": [ @@ -55865,15 +55865,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200503, - 2312 + 20200512, + 1321 ], "deps": [ "cl-lib", "request" ], - "commit": "7fda4115d5f762f9a2c1db10406ab2562119050e", - "sha256": "0pz2gzf7czh0jfwal1bzpx3vi1iqycbv9s3nmb2z8i497zg42gw7" + "commit": "dd02284149027694e4cf16d6f4daf1f6dd011249", + "sha256": "0zhg9467id0jd516hnz4c6aqmjp5q1s95fkhjxbk3g9j11cnfjf0" }, "stable": { "version": [ @@ -56405,15 +56405,15 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20200508, - 437 + 20200513, + 1043 ], "deps": [ "eglot", "math-symbol-lists" ], - "commit": "f54599fe7656515320bec1e5e5fc16f7ee9c7a64", - "sha256": "01wvq0lpmsqffp1vxra4mj2g75k4lyblsb5mn0acwhhni369pa28" + "commit": "a3d4ae8863e268c88664ce869e9469c8a42d2e05", + "sha256": "1v8w70x1jnald6k22ipa7d9z1ggcf2imr97wbw3i48dp4iv21zqd" } }, { @@ -57362,11 +57362,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200505, - 1811 + 20200513, + 1742 ], - "commit": "f25e4011fc30a35983ab08041f4e972daad4b106", - "sha256": "1vvqlmwmpzhqkhawabhvl6ns5083fk9g5ya7zzzrgqm7fxljnp16" + "commit": "afda2d80b0bc98d431a3ac7c1563c76b8ace3a65", + "sha256": "0fapzkjnm3w4fgc5464a9bz2sld3m81zzls7sy4h0yxq9rpb284d" } }, { @@ -57514,11 +57514,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20200223, - 1431 + 20200515, + 1759 ], - "commit": "6c3b89276a149b2d009882f756a9edf866671f05", - "sha256": "1r59bw0dggjf6ry2vbl0vddd5hxxh1mshr5h2bk9z74gy04cfi4y" + "commit": "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a", + "sha256": "0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f" } }, { @@ -58958,8 +58958,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20200509, - 1700 + 20200515, + 2152 ], "deps": [ "dap-mode", @@ -58971,14 +58971,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "16d7568f1a7993d32319002a3880af8dba97cc8d", - "sha256": "0yqdzkw6nd97x0llsbf1aay50xz8k955kqjd8850vmd5x8kza117" + "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", + "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" }, "stable": { "version": [ 1, - 8, - 9 + 10, + 5 ], "deps": [ "dap-mode", @@ -58990,8 +58990,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "922389a2cc849852246c9f7e8bd7da1a907172d4", - "sha256": "01zqwqzkf6ib6b2wb306kyc6vm9xdjbxd65aa23n13a6kzk6c9m9" + "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", + "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" } }, { @@ -59158,15 +59158,15 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20200408, - 1412 + 20200511, + 1444 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "9f158a290168149fd301a1c1c2016600106ad5be", - "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv" + "commit": "b342e5f74f9b815d2a7db9fffee7b9c46850d293", + "sha256": "13haa9jvcq6wvj8g1bnqrrczg1j50lwk41pr4n7q0i7313r8f89v" }, "stable": { "version": [ @@ -59220,8 +59220,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200511, - 424 + 20200515, + 2000 ], "deps": [ "dash", @@ -59232,8 +59232,8 @@ "markdown-mode", "spinner" ], - "commit": "232dd55a9790691a1598150c2396e8d4256a59cc", - "sha256": "1h19fda1p9cqkdqsjkvmnjf9wmj1xmq6c897fwi150qkknic2zjj" + "commit": "17614737b6ae881d0e94ad6f0b87a01950062dba", + "sha256": "0zh2mllm7n3gj0w5rn4y6491kx361mrf6w0fa46jgdck26fkazfw" }, "stable": { "version": [ @@ -59375,8 +59375,8 @@ "cl-lib", "lsp-mode" ], - "commit": "324a0bf50be2ebbdafcfb532c573ac22d5170d10", - "sha256": "08ysclhww0jc9fbxqn59qy05m4nsfgdgjzdb7pwfxp27p5c282a4" + "commit": "97ad997c6c2e3bc8d12c02b2809960d47ad316b0", + "sha256": "11jad58shbrxd1r2r4amlvddx0qlx3ikbmq598sfwz2253ndzny1" }, "stable": { "version": [ @@ -59469,8 +59469,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "ab55e306af9dd9eb62fe7463e4e05d948ad3dfc6", - "sha256": "0z0pgp25hac6m2c58im05cqdyj3383672b3hnirxl5ky45c4rvhn" + "commit": "271b47cb33f11915295911f7cf8575f8a82a5e1c", + "sha256": "181j9anm3h5sfallls3sxik6cd7dw1fbi3q9mlfhk979wk6varjk" }, "stable": { "version": [ @@ -59498,8 +59498,8 @@ 20200508, 1316 ], - "commit": "a3a71b155ab63a64c077a48d1f83596b388bd564", - "sha256": "1k7i7vwn7nnia9dlgh7d3gqyzmvf1i3ipjlbfw8lwcdlzsly940y" + "commit": "35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c", + "sha256": "1bwyyp9fbvy0p4f3mmbqc0plxrcm0ag2r3zb74gb5k2vcxi2vdw4" }, "stable": { "version": [ @@ -59916,8 +59916,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200503, - 1905 + 20200514, + 1330 ], "deps": [ "async", @@ -59926,8 +59926,8 @@ "transient", "with-editor" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -60254,8 +60254,8 @@ "libgit", "magit" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" } }, { @@ -60403,14 +60403,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200425, - 2044 + 20200513, + 1503 ], "deps": [ "dash" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -61277,11 +61277,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20200509, - 1525 + 20200514, + 16 ], - "commit": "f47a2e9796dfdde6fae7920af23647fe027dc34e", - "sha256": "0rz7gk7hwvi9ialkhbvh7lmxvjks1yp9ihrdx2kf4k3jyf1sb9s9" + "commit": "705c77b9533970a425b09fb4c2fabf3b406117c7", + "sha256": "0i40pp0157azw2jkkr08f4cbal9ansp9dbscdbdzmlp9lf27kqjs" }, "stable": { "version": [ @@ -63058,11 +63058,11 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20200321, - 1331 + 20200511, + 2052 ], - "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d", - "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684" + "commit": "1cad46fddf741ed7ec5fc477d70e079e908e9ce6", + "sha256": "062np4d7blbwjc1kciqcp6hngmwr8i540zsv5f8p2qki4804b8ng" }, "stable": { "version": [ @@ -63100,11 +63100,11 @@ "repo": "Mulling/mlso-theme", "unstable": { "version": [ - 20200329, - 1516 + 20200513, + 1751 ], - "commit": "a4bb7b55ce81d8dcc0ad8d92acbde309c7cc1ea0", - "sha256": "15fmzsf5rpgx5f1fr45j24hgzmz95zxkj1jihdb64p049ak2h5a9" + "commit": "059c5773403b73a14a1b04d62d1d5b077a3f6e06", + "sha256": "1a00mybf269hlfzfhpcvlkkqgwck73hz5w1qsspg5w9w78qlymkn" } }, { @@ -63495,11 +63495,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200510, - 1103 + 20200513, + 601 ], - "commit": "a99bec324b712d9444fa1c2abd4ef083e6cba64d", - "sha256": "078vvx87mymgqj4n6dszw1f15k235cz522zpvxyavh5rhsf123fh" + "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", + "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" }, "stable": { "version": [ @@ -63519,11 +63519,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200507, - 1718 + 20200513, + 601 ], - "commit": "a99bec324b712d9444fa1c2abd4ef083e6cba64d", - "sha256": "078vvx87mymgqj4n6dszw1f15k235cz522zpvxyavh5rhsf123fh" + "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", + "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" }, "stable": { "version": [ @@ -63821,11 +63821,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20200113, - 2321 + 20200514, + 1946 ], - "commit": "2751d36152abcc2ac1479225392182b53f1e02dd", - "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586" + "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", + "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" }, "stable": { "version": [ @@ -64504,11 +64504,11 @@ "repo": "cdominik/mu2tex", "unstable": { "version": [ - 20200506, - 754 + 20200512, + 704 ], - "commit": "fef2f2390c002e21811375ce4d7a1c7a308248b1", - "sha256": "1119l71z00syg0zcp330z1757hjf0p06cwc8a4id6alkmbk70jba" + "commit": "4b84cdac955cb36a8c44a2be48f3310252e3d3ad", + "sha256": "05rgx0nb028k1kmb9gbv4b0s20ksbjl0nksyrva2zpvd7xc1nyz9" } }, { @@ -64786,11 +64786,11 @@ "repo": "manateelazycat/multi-term", "unstable": { "version": [ - 20200112, - 533 + 20200514, + 428 ], - "commit": "7307ddd456db44045206253e5a905d3d8c143d5c", - "sha256": "0cqq6y7whx4zwwd8360vdmbvsmkrvmxnn7cvz6hafrh5mrcfqmvn" + "commit": "017c77c550115936860e2ea71b88e585371475d5", + "sha256": "043dqd8i8h6hbcg11rzprxin2yq5lb902zlrb7mxah44vyp8wrdi" }, "stable": { "version": [ @@ -64912,15 +64912,15 @@ "repo": "matsievskiysv/multistate", "unstable": { "version": [ - 20200506, - 1536 + 20200514, + 2206 ], "deps": [ "cl-lib", "ht" ], - "commit": "e1175bae0cac6c16e3533c7e82347f0f15796afa", - "sha256": "1qv3n2bhw2jxc9bg0q4c3mpj19k97bkp4zp78r1k3b6r1is7bjgb" + "commit": "eadd0df2745bf10500a9ad4ee8f66f3cb470bef0", + "sha256": "081rangw4iqk1lcahk01skh518ljdp6g4ww7zydjr813x7jzv2kv" } }, { @@ -65869,8 +65869,8 @@ 20161029, 2023 ], - "commit": "ae60dc55822ea1715b203775179080c5d62700d8", - "sha256": "0q46r9r2vc50vn3bh321l317lgbbmmbylhgbxllbjpyaidfqzvb9" + "commit": "f5fe5832889d7b6eab7d45724e051f4edbe1983f", + "sha256": "15ljrcmmpfwqxvci0ilmn3xgjxj19wq638zvij0wh2g0n6nil6xx" }, "stable": { "version": [ @@ -66292,8 +66292,8 @@ 20181024, 1439 ], - "commit": "9a77d919525a6f844a5c18a1bcf2c2eeb9393ad7", - "sha256": "1x5qwp8f12szfvw0x0qxlfz4ds0z9nc7fmsaaqqhsj9p2yzvkcd4" + "commit": "c6148b0c3377a7d12b679f99f35e09cc7f36e940", + "sha256": "088znrs8hygsfx0ndqhpfdgra3l3jf6dyfwz2l6h4s7w4kc8mlnk" }, "stable": { "version": [ @@ -66391,20 +66391,20 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20200510, - 212 + 20200515, + 410 ], - "commit": "32b013cd622a37cd553c8899332064397c90105b", - "sha256": "0cg4kj8g08kiid6w5n55kc7kffl8rhccpa4xgs68d13isd70fdv2" + "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", + "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "2f4bd0f09c829c2c5f49be2c5455352eaa4c2e3d", - "sha256": "04xpgg9nba5m1bl7ci5l456whcb8nfhsbvgxyx89bp0zqgr005q7" + "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", + "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" } }, { @@ -68660,10 +68660,10 @@ "version": [ 1, 8, - 1 + 2 ], - "commit": "05bf3e4b39b765658a5be95d1db2a30084d1f564", - "sha256": "0h4ysh36q1fxc40inhsdq2swqpfm15lpilqqcafs5ska42pn7s68" + "commit": "9e26c0a2699b7076cebc04ece59fb354eb84c11c", + "sha256": "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3" } }, { @@ -69731,14 +69731,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200510, - 1834 + 20200516, + 1343 ], "deps": [ "org" ], - "commit": "ed99f7e38dd687800fb898f8934a0da0541ebcd9", - "sha256": "1pb9l4gxjm8bfw2xny06iwbd7yfvdjxsvdj4lydpa0z0kgdwd8cs" + "commit": "3ce2a33b81ce611695ad74bf21cb911ef90d9a1a", + "sha256": "0br8mqhxfx9pf1nslvlqk4x5rdlpjagixi6il0i0xpxhca7z3fya" } }, { @@ -69836,14 +69836,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200427, - 1413 + 20200512, + 2102 ], "deps": [ "org" ], - "commit": "e8b4ba8a10b8f356a712a75a87f1fe38dac32d9f", - "sha256": "0q505lxzakbv524ychswhlp650fym86l9j0sjsh7idasnz01sc2q" + "commit": "1dd73fd3db0e9382fa34d3b48c8ec608e65f3bdc", + "sha256": "0wfl416hd7f42j1fidap0f9zlcm3vhgjs12k99k672fggl0459h1" } }, { @@ -70501,28 +70501,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20200509, - 1615 + 20200516, + 1339 ], "deps": [ "dash", "org" ], - "commit": "dc0cc6b056aa9d820670e3c668f3bc2c6b3c1809", - "sha256": "0fikyhz08msn4zq1fb3a09s3lkrpv73669kvd72g1pqmy4fzgrjc" + "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", + "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" }, "stable": { "version": [ 1, 3, - 7 + 8 ], "deps": [ "dash", "org" ], - "commit": "dc0cc6b056aa9d820670e3c668f3bc2c6b3c1809", - "sha256": "0fikyhz08msn4zq1fb3a09s3lkrpv73669kvd72g1pqmy4fzgrjc" + "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", + "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" } }, { @@ -70557,20 +70557,28 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20200413, - 1609 + 20200516, + 1343 ], - "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", - "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" + "deps": [ + "dash", + "org" + ], + "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e", + "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n" }, "stable": { "version": [ 6, - 1, - 3 + 2, + 1 ], - "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", - "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" + "deps": [ + "dash", + "org" + ], + "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e", + "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n" } }, { @@ -70636,14 +70644,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200424, - 1917 + 20200514, + 1648 ], "deps": [ "org" ], - "commit": "8bf06b28d6f14f52d4968123e2b4b91930c8f947", - "sha256": "0k70k07c4lq20rqljmfkx1pfp8gq4qr0y46n8mh1smzxdznk9nlb" + "commit": "2c43b10eed0659f8e47797e5e53d2973f939284d", + "sha256": "1ppzq6hx7nc2iy6pnpgxd39znc701mgqbi2v4v71a0yp8zl6kbgs" }, "stable": { "version": [ @@ -70901,8 +70909,8 @@ 20200128, 1208 ], - "commit": "8f9f4f978a3c40adf2ff00eebb56bccfe4caf4e1", - "sha256": "0v0q3qzz6fwh0y9c9ci46284msr0x69jfki2ng89hpz8aab90bli" + "commit": "4fb77d9bb876e368e596d18324115cef6c1c71f3", + "sha256": "02js518d8h2qp8dxmw479gw61bdj3019j183hz6x1nn49ljx000k" }, "stable": { "version": [ @@ -70922,14 +70930,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200507, - 2043 + 20200513, + 1617 ], "deps": [ "htmlize" ], - "commit": "2d0540cbd659e6aaf1899f1e0b51f3850c83d5a6", - "sha256": "1slcg8mgdkn7cndmv5pkwqni0wm26jg3j0mds0rxf04w44ifvlql" + "commit": "d8a571c720b2b7dec9115fd85b114ae46d4ac4b7", + "sha256": "094nrd7fy7m7m758gks14kz7yfdcclcwvbz8p90dwg3dv311hii2" } }, { @@ -71586,8 +71594,8 @@ "deps": [ "alert" ], - "commit": "4f7677af740e8f3f7cfaf630ae2e594a125af760", - "sha256": "1xk4vp2138p58jdxn51vnmpnij5bzc2jbpq7y8avdcv0p7618fdc" + "commit": "a019c7186ec60c8c7c3657914cdce029811cf4e0", + "sha256": "0jyd7cbri0bmi0qzwm7d4fxdfa1224bg6izd63pqqg1x7s67x99z" }, "stable": { "version": [ @@ -71630,28 +71638,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200413, - 856 + 20200512, + 1701 ], "deps": [ "htmlize", "org" ], - "commit": "61549f4c00284a30e34caa3d76001b233ea5d2ad", - "sha256": "00r324nnci2l0jwx4jhzcrbyai5wmj5cjrav4253c23aqdn5ny96" + "commit": "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b", + "sha256": "0lkqq5n4dspnpiywaparn95wriwh7ffypdykz0a3mmlnv96rizyi" }, "stable": { "version": [ 2, 12, - 1 + 2 ], "deps": [ "htmlize", "org" ], - "commit": "14df7542f2a675f65501962e344e03d798cf0d39", - "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf" + "commit": "fa6f656f561ebb8377bfd904795aec90b4332bbd", + "sha256": "19nz77f2r49hqavz50ri222prhrd5890vhvc7jfazbascbcdjbqv" } }, { @@ -71902,8 +71910,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20200510, - 2117 + 20200516, + 1203 ], "deps": [ "dash", @@ -71913,8 +71921,8 @@ "org", "s" ], - "commit": "ad5fca5440e5c8a6b8078013684df43b3e43d773", - "sha256": "118dhbxf71cmx345hpi0lq7ycb75qg7bdvyqqqdkhl4v9fl9nxyy" + "commit": "265182a698be6babcbb11718c2821c747b1cff52", + "sha256": "159zi0a392p1f8bzlxvfkwmx12xm749cia5m0b3paz23mvvhgzgi" }, "stable": { "version": [ @@ -71942,7 +71950,7 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20200510, + 20200516, 1742 ], "deps": [ @@ -71952,8 +71960,8 @@ "org-roam", "s" ], - "commit": "4f82a8de96ea1f31c24a3cc2acf3bf26e85269ff", - "sha256": "0pqamdc03l5zzdc7dcqwylhw45mzijfgd9070wv93qys9qs1b1ph" + "commit": "4d60c7824e028b4bcdbe5dd589e416ec682a63c8", + "sha256": "010vgf2dlafx3673dpcpy94273i65pffpn5rz5vqvh0k3wwxhqyn" }, "stable": { "version": [ @@ -72955,20 +72963,20 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200501, - 1447 + 20200516, + 1341 ], - "commit": "9f180f037d632906a3043c4e14fafc8e6ed007a8", - "sha256": "0yczj42hl29snbh6g6r0w3ldr3vjg3i7448j55k3crm8b61rmwwv" + "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", + "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" }, "stable": { "version": [ 2, - 1, - 6 + 2, + 1 ], - "commit": "d6fff111930befa52a5cce128c986b0162ddf8c4", - "sha256": "1s9rqjn6c52kvz4v1ma6icdykvkvrvbyllpy5i1mg0pb4acbbwym" + "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", + "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" } }, { @@ -73091,8 +73099,8 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20200510, - 1951 + 20200516, + 1727 ], "deps": [ "dash-functional", @@ -73100,14 +73108,14 @@ "kv", "s" ], - "commit": "cdec8aa327096c63e0342d36a707165e518b5d18", - "sha256": "0jji70c38cssnmgsd9pmkz2mwfs413baxzr13f2mf98z52j6izf5" + "commit": "36d7789b7b3dfa2f4739a83692d322b601a0f4ea", + "sha256": "1j1cckvvghz9656bjkdxrc3gsfpz1wjvq3hlh6zblmnlbhhvbsan" }, "stable": { "version": [ 0, 2, - 0 + 2 ], "deps": [ "dash-functional", @@ -73115,8 +73123,8 @@ "kv", "s" ], - "commit": "24878ed965287d446af1289c33d50f639608d61b", - "sha256": "11f0nkyv3k6wra2753v6wa9jn38wrdkf0h0filliy40hqm7qqkfc" + "commit": "7be4a71ce55f2fdc7fe7f6414f03d58f19d43410", + "sha256": "0cxhmbbznvv9d3nmqfn0ggr164fa6yjbfac9wqi3c58vm3zri00k" } }, { @@ -73356,11 +73364,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20200511, - 618 + 20200516, + 1344 ], - "commit": "5847b4af6205de31bfd29c5fb11c49e2fec63063", - "sha256": "088xqmk5fwdf12pvfarp9b69km605a52iqmb3042kn0ci5h0ibjk" + "commit": "7426df13512f5eee921c26aa68cfc6e32e3061fc", + "sha256": "18n2xzwpqq8159qwqy7hy0b93a5qxdb5rjh0ls4jk8lmahk5jrqk" } }, { @@ -73386,14 +73394,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20200511, - 636 + 20200512, + 721 ], "deps": [ "cl-lib" ], - "commit": "f88f8c09929b1780b8e4b3bbeb27c68389130209", - "sha256": "01z5vvcl3pmd3agcbi9bkc0g9ah1vi7qwlprss64vffh08l5cw8j" + "commit": "5bfe2f6d53798d0fe071f9990e03d7428623e4a7", + "sha256": "16xcps2qlzh5z8c20sl0cnc0mlj8153vk6j1dnfd6l3a6kni88af" } }, { @@ -73454,8 +73462,8 @@ "deps": [ "reformatter" ], - "commit": "5d991188b511e9d650c84fc578f2f49c9f995693", - "sha256": "1x5nx064cgcjj99xwp7drcvhfmmav1f72jnwwlxllhas2is458m0" + "commit": "3141f9b65f8a68b4cbd6df4e08c64d98ce3aa3c9", + "sha256": "1j7q9rmcn6fkhbcvfh8w4y9dir2y0hhhqmjpsafs8m4zm1rvffbn" } }, { @@ -75432,14 +75440,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200424, - 1524 + 20200514, + 2047 ], "deps": [ "autothemer" ], - "commit": "766efdbd444cbefd9d01e7c6f55956d4c9a8db6c", - "sha256": "1jz9vf8wfjnnbbsnxzcpfvj19556w1z9887xvvwn6rsiqqlxgray" + "commit": "4fa14adbc043497fc942568fdb78505ca549e5b7", + "sha256": "1ply18yzdf1lxyia8knn6fk8wb4yzwicgdiscr2z87bpk8p5d2pb" }, "stable": { "version": [ @@ -75693,11 +75701,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20200303, - 2324 + 20200513, + 2352 ], - "commit": "6537b4d2a8cf34455b769b95dfd65de6a4a0e1d3", - "sha256": "1gy5rqnfnyhfa44vxy7qqqh7xada1d1gg34msczcalhhy6lm59if" + "commit": "3497b6068d78ae15ba1eaf94e4315d18e9ae6b00", + "sha256": "0vf9qrkc4dna2f9l0ry1qhfxy7yw1dlilgh38dlp42kqdyp5qny8" }, "stable": { "version": [ @@ -76456,15 +76464,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20200427, - 2136 + 20200512, + 1524 ], "deps": [ "let-alist", "tablist" ], - "commit": "d9712989fc4715443f674459199bdffa987054ac", - "sha256": "0lrh1c37vfgjafsp3j73rjqlz0mbginwbw25vak1l6vycb3s6122" + "commit": "c510442ab89c8a9e9881230eeb364f4663f59e76", + "sha256": "17z3cpn76g9dp62drjrgrqpp1bgf4gl5k5gspylskpvd4kj4bq4d" }, "stable": { "version": [ @@ -76863,25 +76871,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200418, - 1815 + 20200513, + 1416 ], "deps": [ "cl-lib" ], - "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", - "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" + "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", + "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" }, "stable": { "version": [ 2, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", - "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" + "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", + "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" } }, { @@ -79114,11 +79122,11 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20200506, - 1041 + 20200513, + 1054 ], - "commit": "f93b09ee8e5420e728cb8be199ec06504d2df97e", - "sha256": "1b63w9fvgvmw8hr6s8ckhg62psd68rxgsii71kgis1j4v0s6l0sn" + "commit": "308a438550173685cb852a8aadef75c25701513e", + "sha256": "1w4sds6h6q80drqzkmiz51nvy942a88s99zfrvmyvfrvwv7wlqqb" }, "stable": { "version": [ @@ -80414,8 +80422,8 @@ "deps": [ "pkg-info" ], - "commit": "768f0570cad57b6885c4472df803906d097cbc1a", - "sha256": "15855a99as5xmqdzckway0rvlg81wq6fhi5afr7hli62mrc8sgxa" + "commit": "f650faecf699e4b4659374cf5a949f6927feff3e", + "sha256": "142is55cbyya511zp0yl5d1x6i8mvxqjn8zky4gxif15rmmqrk9n" }, "stable": { "version": [ @@ -80967,19 +80975,17 @@ 20170526, 1650 ], - "commit": "bf3eef94c1fc5470407c4f69bb17cbed2c75b508", - "sha256": "1fi8hvxd2nfkqg6s5yz0npbhhclpsqmyfd6jd0d7ivqqglk5h93j" + "commit": "63da77bc971e08c2241cc1d9e65ede4bf335c421", + "sha256": "0b0shac978n6djxid6z9h4mfb2ah4hc1vvb0rg8rf65gs4cxjzlz" }, "stable": { "version": [ 3, 12, - 0, - -1, - 1 + 0 ], - "commit": "ef7cc8111676076d8c2b6f9929096477cc868dc3", - "sha256": "0i06nk5v3nl0xgmi6pxyqgcps8h16a6mcdg2bnjnrrmz6cnq97j2" + "commit": "0dd036d675508a4ecf69e61626fd0c88235a661d", + "sha256": "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a" } }, { @@ -81653,11 +81659,11 @@ "repo": "mattharrison/pycoverage.el", "unstable": { "version": [ - 20190607, - 2004 + 20200513, + 2047 ], - "commit": "01bd47171eefcab2e19d7cffd9a2dd3bd9bd6812", - "sha256": "1c7rdx5a7za0yg9c58255p4spq3zlc5pdgayrgv1mm80f3nc0sdk" + "commit": "3c69ed312121368f1b24cc04d54a29ce4ed4f743", + "sha256": "0vcg8sq8pbzary19xxdariz3kws93qd2agzssl9znw38sayj71wz" } }, { @@ -81947,8 +81953,8 @@ 20200503, 1624 ], - "commit": "f00144fb8faa81e1ce42516c2f58eb9fc797f7bd", - "sha256": "1hmrg1si9lf1xknfl4j4p2dg6iskaripy8k2askc8g0jjgmscq9f" + "commit": "1fc490c0a1d0df5d4d6a64da0ccf2dd711b9bf67", + "sha256": "0fkcn6dk67ljx73ww1zxxkmqp551xsshhz40z2fh1dxw00b470ga" } }, { @@ -82536,11 +82542,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20200329, - 719 + 20200514, + 1242 ], - "commit": "a3c4490a3bb08ee7819b330a93a284b2fd4cd70c", - "sha256": "1rm27y9zni9nscrvsmvi653nwkrlr4gd4cy5pyrynh3q32yhkqik" + "commit": "9ece62efa829c6b89ba61cb674f337764b266482", + "sha256": "1mvrpyiw53lrz6i7r7zlcfvksh8lsjb4vib6gnj5b849njzcjwhm" } }, { @@ -82649,11 +82655,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20200427, - 337 + 20200514, + 1506 ], - "commit": "2e37ce9e4b13359344dbd67fbfd7e39d46b2c6b6", - "sha256": "0w9y8b76ias2dgzjsggd7z1mhv9dsaxrf20f95rq8zanfw2vr0pq" + "commit": "a8752887b81fc2f4f4e4bcd3d2cf8abafb85edbb", + "sha256": "0zjhpgg6zkqx8v0gv7h7z73i64ipzszm9cqs4wwaldlz228316ra" }, "stable": { "version": [ @@ -82811,15 +82817,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200509, - 1405 + 20200513, + 1519 ], "deps": [ "faceup", "pos-tip" ], - "commit": "204845665cc4ec13edc59106b102fa251458e737", - "sha256": "0n376a48yjsd1ic8l31sg76aww3j1p5lriakljklzhf5s010vkss" + "commit": "0f1efa4a3cdcd26de1d2b002868ffc851cff25ac", + "sha256": "1zhn50apdrysm9d6ynv92slah78i39cismj88ym4ahrllwr1jnj4" } }, { @@ -83460,16 +83466,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20200418, - 1721 + 20200513, + 418 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "e03446f54c7ee0b4ed3ec7300597046cf1de2bb8", - "sha256": "160pv9jx66ygl3z1g8yrw7f786403lbb182nz972yl4nyjchbdw7" + "commit": "1238d8e72945a84bb06cd39d7ded75f37105d4d2", + "sha256": "0gx5fivzksanyp9a0ijdzrcbgg8nw94mbilhdh1jkra5mw3ndr63" }, "stable": { "version": [ @@ -85049,8 +85055,8 @@ "deps": [ "helm" ], - "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553", - "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3" + "commit": "88e6577a0e50f523f7da04de9f939b0bc168b514", + "sha256": "1k8330bgc9m7pnpvz3kjyjpjsmha43v4srnhns85xi0nv328g1iy" }, "stable": { "version": [ @@ -85073,16 +85079,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20200507, - 1417 + 20200516, + 1412 ], "deps": [ "s", "transient", "wgrep" ], - "commit": "4774ab1517f59fce998831671ef571a7b7ccd526", - "sha256": "1nyji041p0jxhzkz88p4x13l04sprw5736f7s45w8768iw9fqivf" + "commit": "f5456e006f22b6bc947e799261b36d55b075c5a2", + "sha256": "120n4vkw3c1l130932pziz9ivw85wyh6b75836w82dhx9d41h4cr" }, "stable": { "version": [ @@ -85357,14 +85363,14 @@ "repo": "thornjad/rivet-mode", "unstable": { "version": [ - 20191230, - 1842 + 20200514, + 1617 ], "deps": [ "web-mode" ], - "commit": "ac15de8c76978638e129c26869123c75d5b1f8c7", - "sha256": "19pv8qpcm0cllbbckzpjxrbkdavirq6b8p8jm274klkf4b7k32f8" + "commit": "9f2e6c4f777dbe306b715ab42663a6fc82a7e431", + "sha256": "09rsyq28caz4mrwm32i1f8wdzz35grigp7dilzxxqg0y4fpsf81f" }, "stable": { "version": [ @@ -86173,11 +86179,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200509, - 954 + 20200513, + 812 ], - "commit": "eca55c068eb90aa5e1f36c6b31de589ce1df2ff1", - "sha256": "00vb53jzhnmwkw9bzcadyicplvp3x1jdcf4d0jnvfkhl4ln5d9j0" + "commit": "bfe40565753295a4cf8403f4124710acd2827d21", + "sha256": "1bx0hfilw48cz8n58lf427yg6sfi50wr91vcmj0w0m4s26zbdrr2" }, "stable": { "version": [ @@ -86220,8 +86226,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200502, - 1247 + 20200516, + 759 ], "deps": [ "dash", @@ -86235,8 +86241,8 @@ "spinner", "xterm-color" ], - "commit": "cb2bfde237fd941f8c512e4d4f59ab5be53a5382", - "sha256": "1hv9py1jqn2pphcpdw1j4i1q4idm2mwz3gkyvimjm9w858sn5var" + "commit": "52b632d161b64bdca3f35e35180af63b668ce9fb", + "sha256": "1pcqm8463hjlv70bn6cpl2sv3z2h992yvkzrcz0w2rpz6jgrcfg1" } }, { @@ -86271,11 +86277,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20191017, - 1323 + 20200515, + 1703 ], - "commit": "3a54312eea7023a86ca3f8eb3c03c872554bff2f", - "sha256": "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95" + "commit": "5d988e8b3a5d3d6f2f58d97031d2f500ef55473b", + "sha256": "0p7f02h5vsf4500gf4nl95myvh7pha47rdllscgs3b9jcx1kgyz2" } }, { @@ -86532,11 +86538,11 @@ "repo": "djcb/sauron", "unstable": { "version": [ - 20181216, - 1200 + 20200516, + 1406 ], - "commit": "e20eb21c93492a7c9e89579409ae5a07f77aa9fd", - "sha256": "0sm69gr05y44zxmdzyydbyf5yw4lhxszq3zgz4mflcnb544kkrj3" + "commit": "d2e06866d1045fa16015d135b8964d9caacc2985", + "sha256": "04z3hn46m6xy3jpfd00c7x24h27dgv5zcysci3lxzmmq9k4iqsg3" }, "stable": { "version": [ @@ -87398,11 +87404,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20200510, - 1557 + 20200514, + 1440 ], - "commit": "fec02b6e0c10dc865e22be8f46649f7078d2b137", - "sha256": "1mk60xp66xrrkarz48cm4cjr0vzrgsqi1s04cfg1zrqchh8408v2" + "commit": "392fb1ba8a594a291854c27d2b6824b04cd0c2e7", + "sha256": "1rr7w8jlxsfn2kpryb1ywn066qlc31px1dbwd42hafp6k5cl870n" }, "stable": { "version": [ @@ -88200,15 +88206,15 @@ "repo": "mhayashi1120/Emacs-shelldoc", "unstable": { "version": [ - 20151115, - 325 + 20200513, + 1206 ], "deps": [ "cl-lib", "s" ], - "commit": "5df2264eb60e45066f3633df4f34834751667346", - "sha256": "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i" + "commit": "fa69f67b6229fad3f31d936955ca8d1982009b77", + "sha256": "0ma5j74vkwax9ha945dcgbmf3r4gajj4nvl63pbfyvxvy6svn84r" }, "stable": { "version": [ @@ -88717,11 +88723,11 @@ "repo": "webframp/sicp-info", "unstable": { "version": [ - 20200421, - 242 + 20200512, + 1137 ], - "commit": "3efcd37eb7888845c5f3292beeb18219f9993e92", - "sha256": "1qlgg7r9v62mcw07svdkzrf5ccm6n9vg64h4p704rfzkxys1cwfs" + "commit": "4002d83083d520c6b5ede2df36cc2cee885d450a", + "sha256": "0c9lknrhwhi4v3qnnzmy0k24d8pr3d3mpxi9xzcxq97f5w1x4fsk" } }, { @@ -89266,8 +89272,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200402, - 1656 + 20200512, + 1702 ], "deps": [ "alert", @@ -89277,8 +89283,8 @@ "request", "websocket" ], - "commit": "d53a57a18fb7034182c3d02503f937761e6a2a64", - "sha256": "1xcfgyw9cky6msai2ap9fgcdasvmvn3k73rjmvnwcj4axh6vjvyx" + "commit": "b30525d63bb46882240de6f86e951305bcc7af10", + "sha256": "1f35lr19g5ci1jba6b9hkl7vajg4iy1yw6wb8bhg8dyppdkwnmvy" } }, { @@ -90331,8 +90337,8 @@ "deps": [ "org" ], - "commit": "0a6374493363d10826a8151d37fc461b08cc9b9a", - "sha256": "0vfhcnlz0p4dsnn7ac0fjqbk6xklanaa6jk0zbqcrlf2ww926v29" + "commit": "531957d7356f623b026aa45923e536421f682c1a", + "sha256": "0rb8vjnkn9pp0lrmmvsfslmw7xya4n18s82vs98545phwc4bjga5" } }, { @@ -92053,14 +92059,14 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200504, - 2101 + 20200512, + 2217 ], "deps": [ "cl-lib" ], - "commit": "778bacc31773749dd76878e070051d49b7e6c450", - "sha256": "1sasnm0s3i1pj7r6bssgznfxiwlvvjgc0ijyk7xkv4n4588zcbcy" + "commit": "fd64b75f1051c4fe59209412f00a28625371588c", + "sha256": "1rh3nhwh75b698aq45cwmflv97r0596fq36w1rj08syfhmy3aari" }, "stable": { "version": [ @@ -92452,8 +92458,8 @@ 20171130, 1559 ], - "commit": "d185495d1ef2f8f1e343dc5a0d37e1fdbfd143a2", - "sha256": "0g39jyzrq451mh0k1ahs2svpddm5611lvj4gxcaz9iq02ich0jhc" + "commit": "fb180610de78c68736c963236afb28ee3ac952b4", + "sha256": "106jjrbjdgxp1s41h9vn877rq7a3m1jj9brlgdz1mrjgay266gcc" }, "stable": { "version": [ @@ -93337,16 +93343,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20200321, - 10 + 20200516, + 1836 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "e58f26b8ab9cf0522d52fe9890d39dc9e645577e", - "sha256": "1yx73wgvaf01wi26ahc9cblsk3sj98rgljb19dxc9ab7hjyncd46" + "commit": "e990ea6f5ea932763d002c3794dd9589add1532d", + "sha256": "1a4yrj3yjqgd5jssxd38dvx06cigsszrvs6hv7slfl60p729i0lw" }, "stable": { "version": [ @@ -93460,8 +93466,8 @@ "deps": [ "ivy" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -94385,11 +94391,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200416, - 2114 + 20200513, + 1728 ], - "commit": "eedf6a465b8ccc865c108a6f2715769300f5a499", - "sha256": "1p7wlv5i46f3d9kn3yiw6rga8mkln9m5xknzimzym2pyaclva41m" + "commit": "45625bd90cf5dbdcaed02b57baaa995e240ceb4c", + "sha256": "1s2xxscj675ps93hqczw1xcs3jsixblfzjcfpz74vbz9zkmq1ygm" }, "stable": { "version": [ @@ -94585,14 +94591,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200423, - 1038 + 20200516, + 1007 ], "deps": [ + "rainbow-identifiers", "visual-fill-column" ], - "commit": "50ef9bf06cc162b39cf3553b89b02faf5bc87835", - "sha256": "1h5100vmgwy52zp7ryarj4xw3gb9paj1qpm39mc9h62s6n1zysw7" + "commit": "e2fd3b1b34ae659d306749ab3129ed498b3a2720", + "sha256": "0h851m3p9cqblr5wpl769g8dl5vxjgx62c6grkdk2g0ip2cm4vcf" }, "stable": { "version": [ @@ -95595,18 +95602,18 @@ 20200212, 1903 ], - "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", - "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" + "commit": "81d2abd9097fc3497f77d830ebf8d8386beb7127", + "sha256": "0k9yr3dx12cl07dlz0zmaaf4zfr4zh54w5ix74b0kj1ny299f9q6" }, "stable": { "version": [ 2020, 5, - 4, + 11, 0 ], - "commit": "0580a039d7fe51d1c8f160985057e770c2cc7ae1", - "sha256": "1a4gdmcwn7msr2j98y4drlal2sk3fbs5jsy56b3j2njdyp7b5b98" + "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", + "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" } }, { @@ -95662,8 +95669,8 @@ "deps": [ "haskell-mode" ], - "commit": "4a63723555fbbd427dba0606e6ba9e48afbc93da", - "sha256": "1hmdrx0wnv15gks432xa0ic971m39kj3fbhvjx14k1xh3zp010zp" + "commit": "f68e58cd7f8c483307573a96307f1f872a1921a0", + "sha256": "1rwc1vk0gl1sjnvzvwz4x25m6c61r8ghf6wrjclgifrm8zf1na5d" }, "stable": { "version": [ @@ -96142,8 +96149,8 @@ "deps": [ "cl-lib" ], - "commit": "b3b85a1a4589430e9255a4ea28c4e94787c6b0fe", - "sha256": "148m78rlymxx5sr17xbvi5v864ki66jkg2hkszhyk9za4f0mgdx0" + "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", + "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" } }, { @@ -96762,8 +96769,8 @@ "repo": "cyberthal/treefactor", "unstable": { "version": [ - 20200131, - 621 + 20200516, + 1631 ], "deps": [ "avy", @@ -96771,14 +96778,14 @@ "f", "org" ], - "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", - "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" + "commit": "75357757022a4399ab772ff0d92065bd114dabe9", + "sha256": "0ks7ilc01j1jli1p1lqmqwcr3bfzn5p6vhxybc9wn2sk2sqn2kv8" }, "stable": { "version": [ 3, 2, - 1 + 2 ], "deps": [ "avy", @@ -96786,8 +96793,8 @@ "f", "org" ], - "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", - "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" + "commit": "75357757022a4399ab772ff0d92065bd114dabe9", + "sha256": "0ks7ilc01j1jli1p1lqmqwcr3bfzn5p6vhxybc9wn2sk2sqn2kv8" } }, { @@ -96798,8 +96805,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200506, - 1600 + 20200516, + 1204 ], "deps": [ "ace-window", @@ -96811,8 +96818,8 @@ "pfuture", "s" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96848,8 +96855,8 @@ "evil", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96879,8 +96886,8 @@ "cl-lib", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96911,8 +96918,8 @@ "pfuture", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96944,8 +96951,8 @@ "persp-mode", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96976,8 +96983,8 @@ "projectile", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -97844,11 +97851,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200510, - 425 + 20200512, + 19 ], - "commit": "ea41b40601e44409a0e1ee138fab628952cdae4c", - "sha256": "1wcqfrdy1iz6vb6m9qadd7x75iclrrry7il2w49a04dpqb7hcx99" + "commit": "2b1e53285a55ce50ca6fd60b050f2171e235d8f9", + "sha256": "0x7i7aj9fh8j0944xbym3hijr33mc0kfadl7v657k0d8nx00x3zh" } }, { @@ -98644,8 +98651,8 @@ 20190715, 1836 ], - "commit": "aa832e280cce7c5a7cb92e65609285932650bf49", - "sha256": "149a0h6mbgvkqcnkdz3npmkhr6qgnr1vjbyidajvi1agkxpfz7cl" + "commit": "952f97a46062bb3315d3ae20ecbfd58747019c25", + "sha256": "0bfi325y5yzjbwnmdww0l5bpf4h9ynwz4mwg60k8q3p3f82pkrrm" }, "stable": { "version": [ @@ -99283,11 +99290,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200506, - 1850 + 20200515, + 1734 ], - "commit": "825baa8c241efe8d567bf096bb60f2543738c006", - "sha256": "1dmy3rngjpah6g5qlnii6yzf2b20brfcrdadx36d4prw5fzp2vnw" + "commit": "af1f250fd34d53ecdf31be1756c8693b4182d452", + "sha256": "0zk52ddlf11rwsd1f70i6jjc9z81jddqapfr2dv1d4ghn6j382x5" }, "stable": { "version": [ @@ -100024,11 +100031,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200510, - 1856 + 20200515, + 1412 ], - "commit": "3decc51156e1b022955dc1333c3e358e20d94228", - "sha256": "1wqb3ajgzcwsvcvb6g6lmx3g2x4pi8g3vzp73a02h3lm52ljh6d1" + "commit": "8337e77520bcdb136eebb74837dc71ac8ec67601", + "sha256": "1wf8w8w0690mkih7c9xkk11i9f7r47abvfpyw4y576ansxlr5g1f" } }, { @@ -100039,14 +100046,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20200402, - 1516 + 20200516, + 1117 ], "deps": [ "vterm" ], - "commit": "15901e1e1eebd957ef18d38c920f944558ebd4fb", - "sha256": "1dcr242i9r7r4mr43qfv5ij254dnhf04gfi71y507zfpdr17zdix" + "commit": "fd55be72e8ad19e2284c8f73d5707c033dbde46d", + "sha256": "0q3459vpj5fp2i7nbk67mfd0nf78mpkgz771nhdj4a7xwghk6xgq" } }, { @@ -100970,8 +100977,8 @@ 20200217, 1030 ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -100997,8 +101004,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101027,8 +101034,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101057,8 +101064,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101087,8 +101094,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101776,8 +101783,8 @@ 20191114, 2340 ], - "commit": "33b4fcdd8a17aa19d57971e4f6db5fcb7758843c", - "sha256": "09rrv89b17s4sklkqgci1pmzlnkjlrira22884dh10sbfij42vbp" + "commit": "91ec8dc32652811861116e6f750f0fb41b21b771", + "sha256": "0nc9c1agzhmlbh4ijjrsa9yx19hvxzk06gv6p4pgrlx1yg2khnli" } }, { @@ -102198,8 +102205,8 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20141102, - 1922 + 20200516, + 1451 ], "deps": [ "anaphora", @@ -102207,8 +102214,8 @@ "dash", "f" ], - "commit": "bbefbb2579d463b243dcd4ecbfce82e1bdac3882", - "sha256": "0md6i2sawrzqza2br1g11zhhrda286abhlx0v9pgf65mafc4ilwi" + "commit": "239a5a3ba3b210be5d8fe527546d09241bd3185c", + "sha256": "16lzv61scc1iq1vsbfvyzla91cnxh5a7s84wx3x3kq9jggzh6hbs" }, "stable": { "version": [ @@ -102447,20 +102454,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20200421, - 441 + 20200516, + 1526 ], - "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", - "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" + "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", + "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" }, "stable": { "version": [ 0, 1, - 0 + 2 ], - "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", - "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" + "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", + "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" } }, { @@ -103099,11 +103106,11 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200510, - 1712 + 20200514, + 1932 ], - "commit": "137dfecedfdf6aff69b0f9b1c299aa0ae868fca0", - "sha256": "127lq50q62x06kd1xrf8lyc4rkqbfhfy86gsx1x4x169am2xk397" + "commit": "3d1a24ca84d26ad4507a79260107b010a1d6886b", + "sha256": "1qppbf4jidq6q8c7gby0syp4560xqc3kzgbdgdwl1jc5k08ln3cl" }, "stable": { "version": [ @@ -103306,11 +103313,11 @@ "repo": "drdv/yahtzee", "unstable": { "version": [ - 20171022, - 1412 + 20200511, + 2005 ], - "commit": "1ae37b1a949a6afcb6521e452588bf8a058f9e81", - "sha256": "0ya3injviifhrcsdfm9hkfw8xqfaa6hqvv5z0cfvfj7rcwjnbx9p" + "commit": "63b9b698fbb547603c3f66932c6d3e3bb217c443", + "sha256": "0v0lp2n0xdxfiasr3lcydj9q4krfvzqi568iyngq6zxlryc75wi0" } }, { @@ -103366,11 +103373,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20200511, - 952 + 20200512, + 2141 ], - "commit": "41adb32b886352827c4d4b4ad15cdf18a00c8c50", - "sha256": "1sp507iphis91581f51j3kc29vn5qkwjfiv7ma06scg22fps9qis" + "commit": "0b33131664719c61f834e77ff3b91ded3de2cd3b", + "sha256": "0ig5hpk0wb46yz6gml6g7x9am0l3cay1bzxldms0g2qjh5swxrq4" }, "stable": { "version": [ @@ -103981,8 +103988,8 @@ 20200510, 1405 ], - "commit": "adea3fa881baebed4fd6a4e6653c9a1d16a1ed52", - "sha256": "04xmvc7i4p7s9j3dx55vcakps50r5a95n5j6vzby9qm6rc3vss3m" + "commit": "828323f9acb654d8f61ccbca510b471fb00879ee", + "sha256": "1zixqicpdywzdc2pkx9h08y3kphmn9zcx44bj2rqg3h8xsmjayk5" } }, { @@ -104245,14 +104252,14 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200509, - 1040 + 20200516, + 1108 ], "deps": [ "deft" ], - "commit": "c0d36c5d1129a600bee51e0913ae2f851cc56b7b", - "sha256": "1l8lrgy3i0h174zvfcpc4h1v5h4vpxnmh963v32dh8jnj1vs0afx" + "commit": "f3503ec8fde88d733b7bbbd4431e85de396a3fe8", + "sha256": "0843k0i6szjvc7f51q0pm7vmxpfz68911d75m75rg54k1jbynazq" }, "stable": { "version": [ From ab0adc24cc51647e92035dccf74246fed3b1630f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 17 May 2020 02:19:18 +0200 Subject: [PATCH 266/310] openbox: Use python3 instead of python2 (#87846) --- .../window-managers/openbox/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index a4ec6d067dca..39329e8004c5 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python2 +{ stdenv, fetchurl, autoreconfHook, pkgconfig, python3 , libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: @@ -7,22 +7,24 @@ stdenv.mkDerivation rec { version = "3.6.1"; nativeBuildInputs = [ + autoreconfHook pkgconfig makeWrapper - python2.pkgs.wrapPython + python3.pkgs.wrapPython ]; buildInputs = [ libxml2 libXinerama libXcursor libXau libXrandr libICE libSM libstartup_notification + python3 ]; propagatedBuildInputs = [ pango imlib2 ]; - pythonPath = with python2.pkgs; [ + pythonPath = with python3.pkgs; [ pyxdg ]; @@ -36,6 +38,15 @@ stdenv.mkDerivation rec { sha256 = "1ci9lq4qqhl31yz1jwwjiawah0f7x0vx44ap8baw7r6rdi00pyiv"; }; + patches = [ + # Use fetchurl to avoid "fetchpatch: ignores file renames" #32084 + # This patch adds python3 support + (fetchurl { + url = "https://git.archlinux.org/svntogit/community.git/plain/openbox/trunk/py3.patch?id=90cb57ef53d952bb6ab4c33a184f815bbe1791c0"; + sha256 = "1ks99awlkhd5ph9kz94s1r6m1bfvh42g4rmxd14dyg5b421p1ljc"; + }) + ]; + postBuild = "gcc -O2 -o setlayout $(pkg-config --cflags --libs x11) $setlayoutSrc"; # Openbox needs XDG_DATA_DIRS set or it can't find its default theme From 1fc8b73b34b5bf8a09cc3f6699d20bc33a3e7ca7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 May 2020 00:34:04 +0000 Subject: [PATCH 267/310] adminer: 4.7.6 -> 4.7.7 --- pkgs/servers/adminer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix index 6d7b12df56d4..c58d2e6c2ba6 100644 --- a/pkgs/servers/adminer/default.nix +++ b/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ { stdenv, libbsd, fetchurl, phpPackages, php }: stdenv.mkDerivation rec { - version = "4.7.6"; + version = "4.7.7"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "1zgvscz7jk32qga8hp2dg89h7y72v05vz4yh4lq2ahhwwkbnsxpi"; + sha256 = "1rvvc7xml7ycpbpjgqbgkan8djplx67balrmfignk1b6h9cw3l4q"; }; nativeBuildInputs = with phpPackages; [ php composer ]; From a57176cab471b52e0010f07fb3272d967cade452 Mon Sep 17 00:00:00 2001 From: Ivar Date: Sun, 17 May 2020 02:26:34 +0200 Subject: [PATCH 268/310] ksuperkey: git-2015-07-21 -> 0.4 --- pkgs/tools/X11/ksuperkey/default.nix | 39 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index 1472e39c83c2..d5c2232dce11 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }: +{ stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }: -stdenv.mkDerivation { - name = "ksuperkey-git-2015-07-21"; +stdenv.mkDerivation rec { + pname = "ksuperkey"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "hanschen"; + repo = "ksuperkey"; + rev = "v${version}"; + sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a"; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libX11 libXtst xorgproto libXi - ]; + buildInputs = [ libX11 libXtst xorgproto libXi ]; - src = fetchgit { - url = "https://github.com/hanschen/ksuperkey"; - rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639"; - sha256 = "0y4wkak9dvcm14g54ll1ln9aks2az63hx8fv7b8d3nscxjbkxl6g"; - }; - - preConfigure = '' - makeFlags="$makeFlags PREFIX=$out" - ''; - - meta = { + meta = with stdenv.lib; { description = "A tool to be able to bind the super key as a key rather than a modifier"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.vozz ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/hanschen/ksuperkey"; + license = licenses.gpl3; + maintainers = [ maintainers.vozz ]; + platforms = platforms.linux; }; } From d32d97b72020ed1ec2f16171db81f8406c0e239e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 May 2020 01:04:47 +0000 Subject: [PATCH 269/310] audacity: 2.3.3 -> 2.4.0 --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index f1e652cbcad5..72669aa183ba 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.3"; + version = "2.4.0"; pname = "audacity"; src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0ddc03dbm4ixy877czmwd03fpjgr3y68bxfgb6n2q6cv4prp30ig"; + sha256 = "1f0lbzisqaj4pr9xxsx105a9ibym2qbngalnsb7iwmcvyrpc0l6a"; }; preConfigure = /* we prefer system-wide libs */ '' From d4ca62607a397d0554cae763c88f71e6118bb7b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 May 2020 02:13:22 +0000 Subject: [PATCH 270/310] cargo-flamegraph: 0.2.0 -> 0.3.0 --- pkgs/development/tools/cargo-flamegraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 26dd3a895ae4..08b248dd0f68 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1"; + sha256 = "0d6k2qr76p93na39j4zbcpc9kaswd806wrqhcwisqxdrcxrjbwhk"; }; - cargoSha256 = "10cw3qgc39id8rzziamvgm5s3yf8vgqrnx9v15dw9miapz88amcy"; + cargoSha256 = "1qz4a1b58j3bv3akqvc3bcgvqq4bi8cbm3gzws6a52dz7ycrgq46"; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ From 873e114cf49c739529f90cc1a04413f85a340b76 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 11 May 2020 08:42:26 +0200 Subject: [PATCH 271/310] =?UTF-8?q?ocamlPackages.ocurl:=200.9.0=20?= =?UTF-8?q?=E2=86=92=200.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index a1e524a86424..4c2e4ee6a301 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -5,10 +5,10 @@ then throw "ocurl is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocurl-0.9.0"; + name = "ocurl-0.9.1"; src = fetchurl { url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz"; - sha256 = "0v5qzfazaynjv1xy3ds2z5iz0np5mz8g831l91l1mrqz6fr1ah0f"; + sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; buildInputs = [ pkgconfig ocaml findlib ncurses ]; From 219382bf283274e0ad248e7dd1c21780e58b52cd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 May 2020 08:40:30 +0200 Subject: [PATCH 272/310] wpa_supplicant_gui: fix build with Inkscape 1.0 --- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index d60ff7f364c5..911b0331f4cd 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,14 +1,23 @@ -{ stdenv, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; inherit (wpa_supplicant) src; + patches = [ + # Fix build with Inkscape 1.0 + # https://github.com/NixOS/nixpkgs/issues/86930 + (fetchpatch { + url = "https://w1.fi/cgit/hostap/patch/?id=0388992905a5c2be5cba9497504eaea346474754"; + sha256 = "YDSY7l/qEco+aZYcYHLf/rxCKvPw35ibGoMorjA5GhY="; + }) + ]; + buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake inkscape imagemagick ]; - prePatch = '' + postPatch = '' cd wpa_supplicant/wpa_gui-qt4 ''; From b3e7e67a5e7fe812fed3fe3b83d22fa853eda2a4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 17 May 2020 11:19:40 +0300 Subject: [PATCH 273/310] vdirsyncer: Convert to a python module (#87865) * vdirsyncer: standardize derivation Use toPythonApplication and use callPackage from python-packages.nix. Make vdirsyncerStable somewhat functional again, but mark it as broken for Python 3.6 or higher. * vdirsyncer: use buildPythonPackage as it's a package now * vdirsyncer: move to python-modules/ * vdirsyncer: Move disabled logic into expression --- .../python-modules}/vdirsyncer/default.nix | 44 +++++++++++++--- .../python-modules}/vdirsyncer/stable.nix | 50 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 6 +-- pkgs/top-level/python-packages.nix | 7 +++ 4 files changed, 90 insertions(+), 17 deletions(-) rename pkgs/{tools/misc => development/python-modules}/vdirsyncer/default.nix (77%) rename pkgs/{tools/misc => development/python-modules}/vdirsyncer/stable.nix (55%) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix similarity index 77% rename from pkgs/tools/misc/vdirsyncer/default.nix rename to pkgs/development/python-modules/vdirsyncer/default.nix index 61c9b9df8772..1a5494634bb0 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,11 +1,36 @@ -{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, CoreServices, Security }: +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, fetchpatch +, rustPlatform +, pkg-config +, openssl +, CoreServices +, Security +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { version = "unstable-2018-08-05"; pname = "vdirsyncer"; name = "${pname}-${version}"; + disabled = isPy27; src = fetchFromGitHub { owner = "spk"; @@ -20,11 +45,11 @@ python3Packages.buildPythonApplication rec { inherit src; sourceRoot = "source/rust"; cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click click-log click-threading requests_toolbelt requests @@ -34,9 +59,16 @@ python3Packages.buildPythonApplication rec { shippai ]; - nativeBuildInputs = with python3Packages; [ setuptools_scm ]; + nativeBuildInputs = [ + setuptools_scm + ]; - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; patches = [ (fetchpatch { diff --git a/pkgs/tools/misc/vdirsyncer/stable.nix b/pkgs/development/python-modules/vdirsyncer/stable.nix similarity index 55% rename from pkgs/tools/misc/vdirsyncer/stable.nix rename to pkgs/development/python-modules/vdirsyncer/stable.nix index ada70678e34f..cb90bfbc5988 100644 --- a/pkgs/tools/misc/vdirsyncer/stable.nix +++ b/pkgs/development/python-modules/vdirsyncer/stable.nix @@ -1,17 +1,38 @@ -{ lib, python3Packages, fetchpatch }: +{ stdenv +, pythonAtLeast +, buildPythonPackage +, fetchPypi +, isPy27 +, fetchpatch +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: # Packaging documentation at: # https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { version = "0.16.7"; pname = "vdirsyncer"; + disabled = isPy27; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click click-log click-threading requests_toolbelt requests @@ -19,9 +40,16 @@ python3Packages.buildPythonApplication rec { atomicwrites ]; - nativeBuildInputs = with python3Packages; [ setuptools_scm ]; + nativeBuildInputs = [ + setuptools_scm + ]; - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; patches = [ # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 @@ -42,11 +70,19 @@ python3Packages.buildPythonApplication rec { checkPhase = '' make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test ''; + # Tests started to fail lately, for any python version even as low as 3.5 but + # if you enable the check, you'll see even severer errors with a higher then + # 3.5 python version. Hence it's marked as broken for higher then 3.5 and the + # checks are disabled unconditionally. As a general end user advice, use the + # normal "unstable" `vdirsyncer` derivation, not this one. + doCheck = false; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; license = licenses.mit; + # vdirsyncer (unstable) works with mainline python versions + broken = (pythonAtLeast "3.6"); maintainers = with maintainers; [ loewenheim ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158ce..fc8f53db0ad2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22369,11 +22369,9 @@ in vcv-rack = callPackage ../applications/audio/vcv-rack { }; - vdirsyncer = callPackage ../tools/misc/vdirsyncer { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; + vdirsyncerStable = with python3Packages; toPythonApplication vdirsyncerStable; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 513b5876bf0f..c7c14cc95cf7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1607,6 +1607,13 @@ in { vdf = callPackage ../development/python-modules/vdf { }; + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; + inherit (pkgs) pkg-config openssl rustPlatform; + }; + + vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + vidstab = callPackage ../development/python-modules/vidstab { }; webapp2 = callPackage ../development/python-modules/webapp2 { }; From 8cdc8687bffd411f6f5b5e458071f18b4c9dd109 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 17 May 2020 20:11:41 +1200 Subject: [PATCH 274/310] redis: handle changes to systemd support The 6.0 changelog notes that systemd support was rewritten. The effects of that seem to be twofold: * Redis will silently fail to sd_notify if not built with libsystemd, breaking our unit configuration. * It also appears to misbehave if told to daemonize when running under systemd -- note that upstream's sample unit configuration does not daemonize: https://github.com/antirez/redis/blob/unstable/utils/systemd-redis_server.service --- nixos/modules/services/databases/redis.nix | 3 +-- pkgs/servers/nosql/redis/default.nix | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 5c817422aae5..799c3db62166 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -11,12 +11,11 @@ let port ${toString cfg.port} ${condOption "bind" cfg.bind} ${condOption "unixsocket" cfg.unixSocket} - daemonize yes + daemonize no supervised systemd loglevel ${cfg.logLevel} logfile ${cfg.logfile} syslog-enabled ${redisBool cfg.syslog} - pidfile /run/redis/redis.pid databases ${toString cfg.databases} ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save} dbfilename dump.rdb diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 16d985f65598..3678f028cfe4 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lua, jemalloc, nixosTests }: +{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: stdenv.mkDerivation rec { version = "6.0.1"; @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua ]; + buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]; + ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] + ++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"]; enableParallelBuilding = true; From 68a09ca2d49396c25d962b460ea4d9f4b4f978dc Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 17 May 2020 21:14:52 +1200 Subject: [PATCH 275/310] redis: 6.0.1 -> 6.0.3 ================================================================================ Redis 6.0.3 Released Sat May 16 18:10:21 CEST 2020 ================================================================================ Upgrade urgency CRITICAL: a crash introduced in 6.0.2 is now fixed. 1eab62f7e Remove the client from CLOSE_ASAP list before caching the master. ================================================================================ Redis 6.0.2 Released Fri May 15 22:24:36 CEST 2020 ================================================================================ Upgrade urgency MODERATE: many not critical bugfixes in different areas. Critical fix to client side caching when keys are evicted from the tracking table but no notifications are sent. The following are the most serious fix: * XPENDING should not update consumer's seen-time * optimize memory usage of deferred replies - fixed * Fix CRC64 initialization outside the Redis server itself. * stringmatchlen() should not expect null terminated strings. * Cluster nodes availability checks improved when there is high Pub/Sub load on the cluster bus. * Redis Benchmark: Fix coredump because of double free * Tracking: send eviction messages when evicting entries. * rax.c updated from upstream antirez/rax. * fix redis 6.0 not freeing closed connections during loading. New features: * Support setcpuaffinity on linux/bsd * Client Side Caching: Add Tracking Prefix Number Stats in Server Info * Add --user argument to redis-benchmark.c (ACL) --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 3678f028cfe4..8089fa46f92d 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "6.0.1"; + version = "6.0.3"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "0wzjjcjy2pyd3fwwcb9g936ichrrmj4xqi4wp9ic3vbr0i1nwxdq"; + sha256 = "0fmvbhbgkrw75kqzgpklasylzff4zd0sxy2cvsrgg4pyh776v95w"; }; # Cross-compiling fixes From b5742ab4937cac4fffbbc4c7439d9a7e27ecd4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 17 May 2020 15:52:50 +0100 Subject: [PATCH 276/310] nvi: mark as broken --- pkgs/applications/editors/nvi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index e28b2b43061e..ed08954f8ba0 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation { homepage = "http://www.bostic.com/vi/"; description = "The Berkeley Vi Editor"; license = stdenv.lib.licenses.free; + broken = true; # since 2020-02-08 }; } From 4af94d0f21ae32a874081249bfe9bdc3a3f3d073 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 May 2020 10:56:00 -0500 Subject: [PATCH 277/310] pythonPackages.pdfminer: 20200402 -> 20200517 --- .../python-modules/pdfminer_six/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index ace2b618ef22..979b116b7137 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200402"; + version = "20200517"; disabled = !isPy3k; @@ -11,18 +11,9 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26"; + sha256 = "00272pxkh6djm37yvlvgd06w7ycf35srwk6n3p58ppw5hgmpkhc2"; }; - patches = [ - # Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408 - (fetchpatch { - url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch"; - sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21"; - excludes = [ "CHANGELOG.md" ]; - }) - ]; - propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ]; checkInputs = [ nose ]; @@ -37,4 +28,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy marsam ]; }; } - From 757d3ab21e81e643044de0defff5fc0ae84c1138 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 May 2020 10:57:00 -0500 Subject: [PATCH 278/310] pdfminer: make available as application --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 729f97d65a1e..b5beb4fa289d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5882,6 +5882,8 @@ in fmodex = callPackage ../games/zandronum/fmod.nix { }; + pdfminer = with python3Packages; toPythonApplication pdfminer; + pdfmod = callPackage ../applications/misc/pdfmod { }; pdf-quench = callPackage ../applications/misc/pdf-quench { }; From e958afa0a9a12de3e623a464a922ac7f9455c0d0 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 10 Apr 2020 19:11:24 -0400 Subject: [PATCH 279/310] nixos/zoneminder: fix evaluation with php refactor --- nixos/modules/services/misc/zoneminder.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index d5b3537068d3..d9d34b7fac9b 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -63,10 +63,6 @@ let ${cfg.extraConfig} ''; - phpExtensions = with pkgs.phpPackages; [ - { pkg = apcu; name = "apcu"; } - ]; - in { options = { services.zoneminder = with lib; { @@ -289,11 +285,9 @@ in { phpfpm = lib.mkIf useNginx { pools.zoneminder = { inherit user group; + phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]); phpOptions = '' date.timezone = "${config.time.timeZone}" - - ${lib.concatStringsSep "\n" (map (e: - "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)} ''; settings = lib.mapAttrs (name: lib.mkDefault) { "listen.owner" = user; From 2b5d59cbdc86731f0f4c85a9c21e1498e61e8bd5 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 17 May 2020 17:30:11 +0000 Subject: [PATCH 280/310] linux: Enable fbcon deferred takeover when possible This config value ensures that when booting through e.g. UEFI, the existing framebuffer contents stay put until the first character is printed. As the default NixOS stage-1 immediately outputs a welcome message on init, this does not impact it, but it will allow for a cleaner boot when configured as such. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 636d174b1551..c715c7baf787 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -219,6 +219,7 @@ let FB_3DFX_ACCEL = yes; FB_VESA = yes; FRAMEBUFFER_CONSOLE = yes; + FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; }; From 0e2a4780df77327adc2acb69d1468ba938278773 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 17 May 2020 11:05:01 -0400 Subject: [PATCH 281/310] oh-my-zsh: 2020-05-11 -> 2020-05-16 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 27add8e1d7c6..45acd8bb03a4 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-05-11"; + version = "2020-05-16"; pname = "oh-my-zsh"; - rev = "fd786291bab7468c7cdd5066ac436218a1fba9e2"; + rev = "cbd6fbe7a7c3ef260f497704092dc43f2e953c3f"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "197478z13m2ian2qfwn0bjz5nhv233w74vw4271a2r0kihbp6pp5"; + sha256 = "1h7q68n9nbmv9rgvzcx5ciisw8gh5p3ka0bz0abhmk00xsinhy09"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 4f35b7ec5ffe927f71d0d4dc8c5e37c90fa056dd Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 11 Apr 2020 13:28:52 -0400 Subject: [PATCH 282/310] nixos/zoneminder: add minimal test --- nixos/tests/all-tests.nix | 3 ++- nixos/tests/zoneminder.nix | 23 +++++++++++++++++++++++ pkgs/servers/zoneminder/default.nix | 7 +++++-- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 nixos/tests/zoneminder.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5caf1c958fb0..525e97c039e7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -348,6 +348,7 @@ in yabar = handleTest ./yabar.nix {}; yggdrasil = handleTest ./yggdrasil.nix {}; zfs = handleTest ./zfs.nix {}; - zsh-history = handleTest ./zsh-history.nix {}; + zoneminder = handleTest ./zoneminder.nix {}; zookeeper = handleTest ./zookeeper.nix {}; + zsh-history = handleTest ./zsh-history.nix {}; } diff --git a/nixos/tests/zoneminder.nix b/nixos/tests/zoneminder.nix new file mode 100644 index 000000000000..a4e1a05ec0ee --- /dev/null +++ b/nixos/tests/zoneminder.nix @@ -0,0 +1,23 @@ +import ./make-test-python.nix ({ lib, ...}: + +{ + name = "zoneminder"; + meta.maintainers = with lib.maintainers; [ danielfullmer ]; + + machine = { ... }: + { + services.zoneminder = { + enable = true; + database.createLocally = true; + database.username = "zoneminder"; + }; + time.timeZone = "America/New_York"; + }; + + testScript = '' + machine.wait_for_unit("zoneminder.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(8095) + machine.succeed("curl --fail http://localhost:8095/") + ''; +}) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 978893d28ffd..8dcbe36850af 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib -, coreutils, procps, psmisc }: +, coreutils, procps, psmisc, nixosTests }: # NOTES: # @@ -172,7 +172,10 @@ in stdenv.mkDerivation rec { "-DZM_WEB_GROUP=${user}" ]; - passthru = { inherit dirName; }; + passthru = { + inherit dirName; + tests = nixosTests.zoneminder; + }; postInstall = '' PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$out/${perl.libPrefix}" From 0f8e972f019a92f3670af5eb7ca3eb3c928330bb Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 17 May 2020 11:25:04 -0700 Subject: [PATCH 283/310] doas: enable timestamp by default and set pamdir * `--with-timestamp` enables the usage of the `persist` setting in `doas.conf`. It is possible some people might not want this, so the flag `withTimestamp` was added to control this. * `--pamdir` copies the PAM files to `$out/etc/pam.d`. This may or may not have a use in the future, but it removes a some errors from the build (when it tries to copy these files to /etc/pam.d). --- pkgs/tools/security/doas/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 58ada1086bcf..8cc9017a8fea 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , bison , pam + +, withTimestamp ? true }: stdenv.mkDerivation rec { @@ -19,6 +21,11 @@ stdenv.mkDerivation rec { # otherwise confuses ./configure dontDisableStatic = true; + configureFlags = [ + (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting + "--pamdir=${placeholder "out"}/etc/pam.d" + ]; + postPatch = '' sed -i '/\(chown\|chmod\)/d' bsd.prog.mk ''; From 9456522528a118d9eeb078a77064a4f85ae9b887 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sat, 21 Mar 2020 00:52:59 -0400 Subject: [PATCH 284/310] Refactor Gambit support Refactor the build rule: - Put files in $out/gambit instead of $out. - Make the optimization setting easy to override. - Make use of gccStdenv more explicit at this level. - Support new-style runtime options for forcing UTF-8 I/O. - Override the PACKAGE_VERSION and PACKAGE_STRING with git version. - Note that the license is lgpl21, not lpgl2 (Note: also dual asl20). - Try and fail to meaningfully add missing runtimeDeps. - Build using NIX_BUILD_CORES. --- .../compilers/gambit/bootstrap.nix | 22 +++---- pkgs/development/compilers/gambit/build.nix | 63 +++++++++++-------- pkgs/development/compilers/gambit/default.nix | 6 +- .../compilers/gambit/gambit-support.nix | 33 ++++++++++ .../development/compilers/gambit/unstable.nix | 6 +- pkgs/top-level/all-packages.nix | 3 +- 6 files changed, 89 insertions(+), 44 deletions(-) create mode 100644 pkgs/development/compilers/gambit/gambit-support.nix diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 2fb9e3ce2fc4..ec963ab3b8d4 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchurl, autoconf, gcc, coreutils, ... }: +# This derivation is a reduced-functionality variant of Gambit stable, +# used to compile the full version of Gambit stable *and* unstable. -stdenv.mkDerivation { +{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +# As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better + +gccStdenv.mkDerivation { pname = "gambit-bootstrap"; version = "4.9.3"; @@ -16,29 +20,25 @@ stdenv.mkDerivation { CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out + ./configure --prefix=$out/gambit ''; buildPhase = '' # Copy the (configured) sources now, not later, so we don't have to filter out # all the intermediate build products. - mkdir -p $out ; cp -rp . $out/ + mkdir -p $out/gambit ; cp -rp . $out/gambit/ # build the gsc-boot* compiler - make bootstrap + make -j$NIX_BUILD_CORES bootstrap ''; installPhase = '' - cp -fa ./ $out/ + cp -fa ./ $out/gambit/ ''; forceShare = [ "info" ]; - meta = { + meta = gambit-support.meta // { description = "Optimizing Scheme to C compiler, bootstrap step"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index e17241b6d98d..fc71128eb37c 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,11 +1,13 @@ -{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, gcc, src, coreutils }: +{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, + src, version, git-version, + gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, # clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling # Gambit output, producing code that is 3x slower. IIRC the benchmarks from Gambit@30, # the numbers were still heavily in favor of GCC in October 2019. # Thus we use GCC over clang, even on macOS. - +# # Also note that I (fare) just ran benchmarks from https://github.com/ecraven/r7rs-benchmarks # with Gambit 4.9.3 with -O1 vs -O2 vs -Os on Feb 2020. Which wins depends on the benchmark. # The fight is unclear between -O1 and -O2, where -O1 wins more often, by up to 17%, @@ -13,29 +15,34 @@ # However, -Os seems more consistent in winning slightly against both -O1 and -O2, # and is overall 15% faster than -O2. As for compile times, -O1 is fastest, # -Os is about 29%-33% slower than -O1, while -O2 is about 40%-50% slower than -O1. -# Overall, -Os seems like the best choice, and that's what we now use. +# +# Overall, -Os seems like the best choice, but I care more about compile-time, +# so I stick with -O1 (in the defaults above), which is also the default for Gambit. + +gccStdenv.mkDerivation rec { -stdenv.mkDerivation rec { pname = "gambit"; - inherit version; - inherit src; - - bootstrap = import ./bootstrap.nix ( pkgs ); + inherit src version git-version; + bootstrap = gambit-support.gambit-bootstrap; # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. buildInputs = [ git autoconf bootstrap openssl ]; + # TODO: patch gambit's source so it has the full path to sed, grep, fgrep? Is there more? + # Or wrap relevant programs to add a suitable PATH ? + #runtimeDeps = [ gnused gnugrep ]; + configureFlags = [ "--enable-single-host" - "--enable-c-opt=-Os" + "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-poll" "--enable-openssl" - "--enable-default-runtime-options=f8,-8,t8" # Default to UTF-8 for source and all I/O + "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing # "--enable-guide" @@ -53,11 +60,17 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \ - CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ + export CC=${gcc}/bin/gcc \ + CXX=${gcc}/bin/g++ \ + CPP=${gcc}/bin/cpp \ + CXXCPP=${gcc}/bin/cpp \ + LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out ${builtins.concatStringsSep " " configureFlags} + + ${gambit-params.fix-stamp git-version} + + ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags} # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ @@ -69,28 +82,26 @@ stdenv.mkDerivation rec { buildPhase = '' # Make bootstrap compiler, from release bootstrap mkdir -p boot && - cp -rp ${bootstrap}/. boot/. && + cp -rp ${bootstrap}/gambit/. boot/. && chmod -R u+w boot && cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ + cp ../gsc/makefile.in ../gsc/*.scm gsc/ && # */ ./configure && - for i in lib gsi gsc ; do (cd $i ; make ) ; done && + for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done && cd .. && cp boot/gsc/gsc gsc-boot && # Now use the bootstrap compiler to build the real thing! - make -j2 from-scratch + make -j$NIX_BUILD_CORES from-scratch + ''; + + postInstall = '' + mkdir $out/bin + cd $out/bin + ln -s ../gambit/bin/* . ''; doCheck = true; - meta = { - description = "Optimizing Scheme to C compiler"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - # NB regarding platforms: only actually tested on Linux, *should* work everywhere, - # but *might* need adaptation e.g. on macOS. - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; - }; + meta = gambit-support.meta; } diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 303f6a30aadb..8f77daa4173b 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: -callPackage ./build.nix { +callPackage ./build.nix rec { version = "4.9.3"; + git-version = version; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; }; - inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix new file mode 100644 index 000000000000..0e78831f2e4e --- /dev/null +++ b/pkgs/development/compilers/gambit/gambit-support.nix @@ -0,0 +1,33 @@ +{ pkgs, lib }: + +rec { + stable-params = { + defaultRuntimeOptions = "f8,-8,t8"; + buildRuntimeOptions = "f8,-8,t8"; + fix-stamp = git-version : ""; + }; + + unstable-params = { + defaultRuntimeOptions = "iL,fL,-L,tL"; + buildRuntimeOptions = "i8,f8,-8,t8"; + fix-stamp = git-version : '' + substituteInPlace configure \ + --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ + --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; + ''; + }; + + export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; + + gambit-bootstrap = import ./bootstrap.nix ( pkgs ); + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = lib.licenses.lgpl21; # dual, also asl20 + # NB regarding platforms: continuously tested on Linux, + # tested on macOS once in a while, *should* work everywhere. + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 4c33c83c67b1..7c4434acdc37 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ -{ stdenv, callPackage, fetchFromGitHub }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { version = "unstable-2020-02-24"; -# git-version = "4.9.3-979-gc69e9f70"; + git-version = "4.9.3-979-gc69e9f70"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc"; sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k"; }; - inherit stdenv; + gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 729f97d65a1e..8a26aea2beb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8203,7 +8203,8 @@ in fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; + gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; From 90835bc666881cfc9d4f632379f58684dea4a590 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sat, 21 Mar 2020 00:53:33 -0400 Subject: [PATCH 285/310] Refactor Gerbil support - Use the new Gambit support. - Move files from $out to $out/gerbil. - Use new Gerbil configuration and installation scripts. - Move some fixups from preBuild to postPatch. - Give up on previous failed attempts at using static libraries. - Add support for compiling libraries written in Gerbil. - Build using NIX_BUILD_CORES. - Register all those things in all-packages. --- pkgs/development/compilers/gerbil/build.nix | 81 +++++++------------ pkgs/development/compilers/gerbil/default.nix | 42 +++++++++- .../compilers/gerbil/gerbil-support.nix | 63 +++++++++++++++ .../development/compilers/gerbil/unstable.nix | 27 ++++++- pkgs/top-level/all-packages.nix | 8 +- 5 files changed, 161 insertions(+), 60 deletions(-) create mode 100644 pkgs/development/compilers/gerbil/gerbil-support.nix diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 21c2936fa0f8..0177e706af11 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,34 +1,35 @@ -{ stdenv, makeStaticLibraries, - coreutils, rsync, bash, +{ pkgs, gccStdenv, lib, coreutils, # makeStaticLibraries, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, - version, git-version, gambit, src }: + version, git-version, + gambit-support, + gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, + src, configurePhase, installPhase }: + +# We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix +let stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "gerbil"; inherit version; inherit src; - # Use makeStaticLibraries to enable creation of statically linked binaries buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ]; - buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - buildInputs = [ gambit rsync bash ] - ++ buildInputs_libraries ++ buildInputs_staticLibraries; + # TODO: either fix all of Gerbil's dependencies to provide static libraries, + # or give up and delete all tentative support for static libraries. + #buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ gambit ] + ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' - echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm - - patchShebangs . - + echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; + patchShebangs . ; grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do - substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - done - grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do - substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' - done - substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\"" + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; + done ; ''; ## TODO: make static compilation work. @@ -47,22 +48,20 @@ stdenv.mkDerivation rec { # LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF + inherit configurePhase installPhase; + buildPhase = '' runHook preBuild - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' - - # Enable autodetection of a default GERBIL_HOME - for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out\")" - done - for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out\")" - done - # gxprof testing uses $HOME/.cache/gerbil/gxc - export HOME=$$PWD + export HOME=$PWD + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_GXC=$PWD/bin/gxc + export GERBIL_BASE=$PWD + export GERBIL_HOME=$PWD + export GERBIL_PATH=$PWD/lib + export PATH=$PWD/bin:$PATH + ${gambit-support.export-gambopt gambit-params} # Build, replacing make by build.sh ( cd src && sh build.sh ) @@ -70,33 +69,15 @@ stdenv.mkDerivation rec { runHook postBuild ''; - installPhase = '' - runHook preInstall - mkdir -p $out/ - cp -fa bin lib etc doc $out/ - - cat > $out/bin/gxi < $out/gerbil/bin/gxi < "${version-path}" + fi + patchShebangs . ; + ''; + + postConfigure = '' + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_PATH=$PWD/.build + export GERBIL_LOADPATH=${gerbilLoadPath gerbilInputs} + ${pkgs.gambit-support.export-gambopt gambit-params} + ''; + + buildPhase = '' + runHook preBuild + ./build.ss + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil/lib + cp -fa .build/lib $out/gerbil/ + bins=(.build/bin/*) + if [ 0 -lt ''${#bins} ] ; then + cp -fa .build/bin $out/gerbil/ + mkdir $out/bin + cd $out/bin + ln -s ../gerbil/bin/* . + fi + runHook postInstall + ''; + + dontFixup = true; + }; +} diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index eb78eed35ee9..d14b4f7d349b 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,15 +1,34 @@ -{ stdenv, callPackage, fetchFromGitHub, gambit, gambit-unstable }: +{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, coreutils, bash }: callPackage ./build.nix { version = "unstable-2020-02-27"; git-version = "0.16-DEV-493-g1ffb74db"; - #gambit = gambit-unstable; - gambit = gambit; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41"; sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097"; }; - inherit stdenv; + inherit gambit-support; + gambit = gambit-unstable; + gambit-params = gambit-support.unstable-params; + configurePhase = '' + (cd src && ./configure \ + --prefix=$out/gerbil \ + --with-gambit=${gambit}/gambit \ + --enable-libxml \ + --enable-libyaml \ + --enable-zlib \ + --enable-sqlite \ + --enable-mysql \ + --enable-lmdb \ + --enable-leveldb) + ''; + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil $out/bin + (cd src; ./install) + (cd $out/bin ; ln -s ../gerbil/bin/* .) + runHook postInstall + ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a26aea2beb2..05a2f3ec5a20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8202,11 +8202,13 @@ in fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; + gambit = callPackage ../development/compilers/gambit { }; gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; - gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; + gerbil = callPackage ../development/compilers/gerbil { }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { }; + gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/9); gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc9; From da4aa17343f013c9b5e0873fbc1683e2d8496991 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 7 May 2020 17:21:17 -0400 Subject: [PATCH 286/310] gambit-unstable: 2020-02-24 -> 2020-05-13 --- pkgs/development/compilers/gambit/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 7c4434acdc37..3ac4f5363195 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-02-24"; - git-version = "4.9.3-979-gc69e9f70"; + version = "unstable-2020-05-15"; + git-version = "4.9.3-1109-g3c4d40de"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc"; - sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k"; + rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c"; + sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr"; }; gambit-params = gambit-support.unstable-params; } From 756c8a27d97efc87eaf65402f83495df949bf179 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 7 May 2020 17:22:24 -0400 Subject: [PATCH 287/310] gerbil-unstable: 2020-02-27 -> 2020-05-17 --- pkgs/development/compilers/gerbil/unstable.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index d14b4f7d349b..e8bf18a64299 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support, coreutils, bash }: -callPackage ./build.nix { - version = "unstable-2020-02-27"; - git-version = "0.16-DEV-493-g1ffb74db"; +callPackage ./build.nix rec { + version = "unstable-2020-05-17"; + git-version = "0.16-1-g36a31050"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41"; - sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097"; + rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698"; + sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv"; }; inherit gambit-support; gambit = gambit-unstable; From a311224450cd986ba297364b26848c09b87cdbe3 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Tue, 28 Apr 2020 16:08:13 +0200 Subject: [PATCH 288/310] obs-studio: 25.0.3 -> 25.0.8 --- pkgs/applications/video/obs-studio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index ceee3d022bea..45ebf0beb448 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -38,13 +38,13 @@ let inherit (stdenv.lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; - version = "25.0.3"; + version = "25.0.8"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; + sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; @@ -83,6 +83,7 @@ in mkDerivation rec { postFixup = stdenv.lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so + addOpenGLRunpath $out/lib/obs-plugins/*.so ''; meta = with stdenv.lib; { From f9360e7974e6cb57d99995dbffabaef863c3917d Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 7 May 2020 17:24:11 -0400 Subject: [PATCH 289/310] gerbilPackages.gerbil-utils: init at 2020-05-16 --- .../compilers/gerbil/gerbil-support.nix | 1 + .../compilers/gerbil/gerbil-utils.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/compilers/gerbil/gerbil-utils.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index af83cfa4a600..4e94b6e65de1 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -4,6 +4,7 @@ rec { # Gerbil libraries gerbilPackages-unstable = { + gerbil-utils = callPackage ./gerbil-utils.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix new file mode 100644 index 000000000000..075a63d7bf4c --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-utils"; + version = "unstable-2020-05-17"; + git-version = "33ef720"; + package = "clan"; + gerbil = gerbil-unstable; + gambit-params = gambit-support.unstable-params; + version-path = ""; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-utils"; + rev = "33ef720799ba98dc9eec773c662f070af4bac016"; + sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf"; + }; + meta = { + description = "Gerbil Clan: Community curated Collection of Common Utilities"; + homepage = "https://github.com/fare/gerbil-utils"; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} From 0d0f475f27b0978490a44327bdd558947d62c1e9 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sun, 17 May 2020 16:10:03 -0400 Subject: [PATCH 290/310] gerbil: 0.15.1 -> 0.16 Now that v0.16 was released at last, make the configurePhase and instalPhase the same again for default and unstable. --- pkgs/development/compilers/gerbil/build.nix | 26 +++++++++-- pkgs/development/compilers/gerbil/default.nix | 46 ++----------------- .../development/compilers/gerbil/unstable.nix | 21 +-------- 3 files changed, 27 insertions(+), 66 deletions(-) diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 0177e706af11..8297dafff8e2 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,9 +1,8 @@ -{ pkgs, gccStdenv, lib, coreutils, # makeStaticLibraries, +{ pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, version, git-version, gambit-support, - gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, - src, configurePhase, installPhase }: + gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }: # We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix let stdenv = gccStdenv; in @@ -48,7 +47,18 @@ stdenv.mkDerivation rec { # LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF - inherit configurePhase installPhase; + configurePhase = '' + (cd src && ./configure \ + --prefix=$out/gerbil \ + --with-gambit=${gambit}/gambit \ + --enable-libxml \ + --enable-libyaml \ + --enable-zlib \ + --enable-sqlite \ + --enable-mysql \ + --enable-lmdb \ + --enable-leveldb) + ''; buildPhase = '' runHook preBuild @@ -69,6 +79,14 @@ stdenv.mkDerivation rec { runHook postBuild ''; + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil $out/bin + (cd src; ./install) + (cd $out/bin ; ln -s ../gerbil/bin/* .) + runHook postInstall + ''; + dontStrip = true; meta = { diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index d7b1fe3cf5e2..3367ae581b2e 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,50 +1,12 @@ -{ callPackage, fetchFromGitHub, gambit, bash }: +{ callPackage, fetchFromGitHub }: callPackage ./build.nix rec { - version = "0.15.1"; - git-version = "0.15.1"; + version = "0.16"; + git-version = version; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; rev = "v${version}"; - sha256 = "0qpqms66hz41wwhxb1z0fnzj96ivkm7qi9h9d7lhlr3fsxm1kp1n"; + sha256 = "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f"; }; - configurePhase = '' - grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do - substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' ; - done ; - for f in etc/gerbil.el src/std/make.ss ; do - substituteInPlace "$f" --replace '"gxc"' "\"$out/bin/gxc\"" ; - done ; - - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' ; - - # Enable autodetection of a default GERBIL_HOME - for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do - substituteInPlace "$i" --replace '(define default-gerbil-home #f)' "(define default-gerbil-home \"$out/gerbil\")" ; - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out/gerbil\")" ; - done ; - for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out/gerbil\")" ; - done - ''; - installPhase = '' - runHook preInstall - mkdir -p $out/gerbil $out/bin - cp -fa bin lib etc doc $out/gerbil - cat > $out/gerbil/bin/gxi < Date: Sun, 17 May 2020 22:35:49 +0200 Subject: [PATCH 291/310] skaffold: 1.8.0 -> 1.9.1 --- pkgs/development/tools/skaffold/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index dce42380c503..7c673dea21ba 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.8.0"; + version = "1.9.1"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "bd280192092e28067f0f52584c8bcb4f4dc480e4"; + rev = "7bac6a150c9618465f5ad38cc0a5dbc4677c39ba"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0s1j1lij56idl981nq7dnvkil1ki283nfhcfqyl5g00payihlm73"; + sha256 = "0l0x89xv5brinafrvbz6hgs5kvmpl4ajcrsjdjh3myf7i0mvh3gm"; }; nativeBuildInputs = [ installShellFiles ]; From cf5dcbf49f8fa97cb5a1f02a9c3ff224ec392228 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Sun, 17 May 2020 12:43:24 -0700 Subject: [PATCH 292/310] Bump cudatoolkit in pycuda derivation, remove boost dependency --- pkgs/development/python-modules/pycuda/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index a03662aa961d..b9a75734b8e4 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -13,7 +13,6 @@ , python , mkDerivation , stdenv -, isPy3k }: let compyte = import ./compyte.nix { @@ -29,11 +28,12 @@ buildPythonPackage rec { sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; - preConfigure = '' + preConfigure = with stdenv.lib.versions; '' ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} + --boost-python-libname=boost_python${major python.version}${minor python.version} \ + --cuda-root=${cudatoolkit} ''; postInstall = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7c14cc95cf7..6c798eddbadc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3268,7 +3268,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit_7_5; + cudatoolkit = pkgs.cudatoolkit; inherit (pkgs.stdenv) mkDerivation; }; From 79083b4b75da0b3ec799e7e699d349fcecea77bb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 17 May 2020 23:36:01 +0200 Subject: [PATCH 293/310] mutt: 1.14.0 -> 1.14.1 (#88027) Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 736d7530be1e..e82769ad317a 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1y7racrhz06k9mwxw5qspfjfyvbj5fmwai3gsfgrm36k7al84bnz"; + sha256 = "09a4hhl9h6y57yfq1gx83fzqxp3wb88y17rl8f54ndpp6p1n9m9m"; }; patches = optional smimeSupport (fetchpatch { From 0dea98463465cf0a3b25894ed3e6a6b6437042b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:25:33 +0200 Subject: [PATCH 294/310] =?UTF-8?q?ansible:=20v2.9.7=20=E2=86=92=20v2.9.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index b9c710e68884..829b4137d512 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.7"; + version = "2.9.9"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s"; + sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml"; }; prePatch = '' From c0e6848ad74964ec753fb4f758b0c9e8e246daaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:25:58 +0200 Subject: [PATCH 295/310] =?UTF-8?q?ansible=5F2=5F8:=20v2.8.11=20=E2=86=92?= =?UTF-8?q?=20v2.8.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index d0cb07197cd3..adeaa22c360f 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,11 +7,11 @@ rec { ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.11"; + version = "2.8.12"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m"; + sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a"; }; })); From 25233a5db7293c8ca876bfcda3fe35ff119adf2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:27:40 +0200 Subject: [PATCH 296/310] =?UTF-8?q?ansible=5F2=5F7:=20v2.7.17=20=E2=86=92?= =?UTF-8?q?=20v2.7.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index adeaa22c360f..b3ecaa3479a1 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -17,11 +17,11 @@ rec { ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.17"; + version = "2.7.18"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz"; + sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; }; })); From cabcd8be104f02284f4ff195beb0860e858b85f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:29:02 +0200 Subject: [PATCH 297/310] ansible: default to ansible_2_9 Ansible 2.9 is the latest release and in full support since 2019/11/06. https://access.redhat.com/support/policy/updates/ansible-engine --- pkgs/tools/admin/ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index b3ecaa3479a1..23879c227102 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,7 +1,7 @@ { python3Packages, fetchurl }: rec { - ansible = ansible_2_8; + ansible = ansible_2_9; ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; From 410fdbada38b3f5821621ac91fa5e59032baac4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:33:21 +0200 Subject: [PATCH 298/310] ansible_2_6: drop Went EOL 2019/11/06. https://access.redhat.com/support/policy/updates/ansible-engine --- pkgs/tools/admin/ansible/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 23879c227102..174aef7c4bab 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -24,14 +24,4 @@ rec { sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; }; })); - - ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.6.20"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn"; - }; - })); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8b62553d017..51a758783e1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9890,7 +9890,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_6 ansible_2_7 ansible_2_8 ansible_2_9; From 9f98f41854c1e8acb9365058cdd7db404cc475e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:40:20 +0200 Subject: [PATCH 299/310] ansible: add myself as maintainer --- pkgs/development/python-modules/ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 829b4137d512..07ae08ada78c 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "http://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; - maintainers = with maintainers; [ joamaki costrouc ]; + maintainers = with maintainers; [ joamaki costrouc hexa ]; platforms = platforms.linux ++ platforms.darwin; }; } From 20b0143c113a7324c391d27f384b2defd0c2d585 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 11 May 2020 17:40:40 +0200 Subject: [PATCH 300/310] ocamlPackages.async_extra: remove at 112.24.00 This is a legacy version for OCaml 4.02 --- .../ocaml-modules/async_extra/default.nix | 26 ------------------- .../ocaml-modules/janestreet/async-extra.nix | 17 ------------ pkgs/top-level/ocaml-packages.nix | 9 ------- 3 files changed, 52 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/async_extra/default.nix delete mode 100644 pkgs/development/ocaml-modules/janestreet/async-extra.nix diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix deleted file mode 100644 index 53be875f4f31..000000000000 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix_p4, - bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "async_extra"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_extra/archive/${version}.tar.gz"; - sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28"; - }; - - buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 core_p4 bin_prot_p4 custom_printf - fieldslib_p4 herelib pipebang sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_extra"; - description = "Jane Street Capital's asynchronous execution library (extra)"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix deleted file mode 100644 index 3de02437dd97..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, buildOcamlJane, async_kernel, async_unix, - bin_prot, core, ppx_custom_printf, fieldslib, herelib, - pipebang, sexplib, async_rpc_kernel}: - -buildOcamlJane { - name = "async_extra"; - hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; - propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf - fieldslib herelib pipebang sexplib async_rpc_kernel ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_extra"; - description = "Jane Street Capital's asynchronous execution library (extra)"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 033e9239d3b4..26d2d9fed47a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -36,8 +36,6 @@ let astring = callPackage ../development/ocaml-modules/astring { }; - async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; - async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; @@ -1187,13 +1185,6 @@ let then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} else async_unix_p4; - async_extra = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_extra - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} - else async_extra_p4; - # Apps / from all-packages ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; From 09472fb9db040cf9b5bd100b6f52c638fabddf68 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 18 May 2020 12:11:11 +0300 Subject: [PATCH 301/310] cpu-x: 3.2.4 -> 4.0.0 --- pkgs/applications/misc/cpu-x/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index c058e6d5a983..fb81bbdd40c7 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses, curl -, json_c, libcpuid, pciutils, procps, wrapGAppsHook, nasm }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses +, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: stdenv.mkDerivation rec { pname = "cpu-x"; - version = "3.2.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "03y49wh9v7x6brmavj5a2clihn0z4f01pypl7m8ymarv4y3a6xkl"; + sha256 = "00xngmlayblvkg3l0rcfpxmnkkdz49ydh4smlhpii23gqii0rds3"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ]; buildInputs = [ - gtk3 ncurses curl json_c libcpuid pciutils procps + gtk3 ncurses libcpuid pciutils procps ]; + postInstall = '' + wrapProgram $out/bin/cpu-x \ + --prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]} + ''; + meta = with stdenv.lib; { description = "Free software that gathers information on CPU, motherboard and more"; homepage = src.meta.homepage; From 4e2715934e2c995554c5d70fe4eea12716425480 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 13 May 2020 16:29:34 +0200 Subject: [PATCH 302/310] nixos/binfmt: move systemd-binfmt.service to binfmt module Also, remove the dangling systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; in systemd.nix. If boot.binfmt.registrations != {}, systemd will install proc-sys-fs-binfmt_misc.automount, which will auto-mount `/proc/sys/fs/binfmt_misc` as soon as systemd-binfmt tries to access it. Fixes https://github.com/NixOS/nixpkgs/issues/87687 Fixes https://github.com/NixOS/nixops/issues/574 --- nixos/modules/system/boot/binfmt.nix | 9 +++++---- nixos/modules/system/boot/systemd.nix | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index a677ab4cb71a..9eeae0c3ef44 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -268,9 +268,10 @@ in { mkdir -p -m 0755 /run/binfmt ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ''; - systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) - [ "proc-sys-fs-binfmt_misc.automount" - "proc-sys-fs-binfmt_misc.mount" - ]; + systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; }; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7c4dc93e2fb6..99892a28115c 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -164,7 +164,6 @@ let "systemd-timedated.service" "systemd-localed.service" "systemd-hostnamed.service" - "systemd-binfmt.service" "systemd-exit.service" "systemd-update-done.service" ] ++ optionals config.services.journald.enableHttpGateway [ @@ -1056,7 +1055,6 @@ in systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; - systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; systemd.services.systemd-importd.environment = proxy_env; # Don't bother with certain units in containers. From 431106a17ea6ba67ecdb29d2bfa7572806603ad7 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 18 May 2020 11:25:00 +0200 Subject: [PATCH 303/310] nixos/zfs: add missing dependendy nettools Fix #87823 --- nixos/modules/tasks/filesystems/zfs.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 43347161a84c..71eed4d6f1a4 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -433,7 +433,16 @@ in services.zfs.zed.settings = { ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; - PATH = lib.makeBinPath [ packages.zfsUser pkgs.utillinux pkgs.gawk pkgs.gnused pkgs.gnugrep pkgs.coreutils pkgs.curl ]; + PATH = lib.makeBinPath [ + packages.zfsUser + pkgs.coreutils + pkgs.curl + pkgs.gawk + pkgs.gnugrep + pkgs.gnused + pkgs.nettools + pkgs.utillinux + ]; }; environment.etc = genAttrs From fd49155848a8ee8aa2f103fe765ddb9aed1b3d2d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 18 May 2020 11:16:56 +0200 Subject: [PATCH 304/310] nixosTests.systemd-binfmt: init This adds a simple test running GNU Hello cross-compiled for armv7l and aarch64 inside a x86_64 VM with configured binfmt. We already build the cross toolchains in other invocations, and building hello itself is small. --- nixos/tests/all-tests.nix | 1 + nixos/tests/systemd-binfmt.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 nixos/tests/systemd-binfmt.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 525e97c039e7..0acded892c7a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -304,6 +304,7 @@ in syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; systemd-analyze = handleTest ./systemd-analyze.nix {}; + systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {}; systemd-boot = handleTestOn ["x86_64-linux"] ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; diff --git a/nixos/tests/systemd-binfmt.nix b/nixos/tests/systemd-binfmt.nix new file mode 100644 index 000000000000..2a676f3da98b --- /dev/null +++ b/nixos/tests/systemd-binfmt.nix @@ -0,0 +1,24 @@ +# Teach the kernel how to run armv7l and aarch64-linux binaries, +# and run GNU Hello for these architectures. +import ./make-test-python.nix ({ pkgs, ... }: { + name = "systemd-binfmt"; + machine = { + boot.binfmt.emulatedSystems = [ + "armv7l-linux" + "aarch64-linux" + ]; + }; + + testScript = let + helloArmv7l = pkgs.pkgsCross.armv7l-hf-multiplatform.hello; + helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello; + in '' + machine.start() + assert "world" in machine.succeed( + "${helloArmv7l}/bin/hello" + ) + assert "world" in machine.succeed( + "${helloAarch64}/bin/hello" + ) + ''; +}) From 64decd9de6dfc9316fd69038b21cfbe98b1a8db8 Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Mon, 18 May 2020 08:01:29 +0000 Subject: [PATCH 305/310] gitea: fix wiki template incompatibility with go 1.14 Related to #87115. --- pkgs/applications/version-management/gitea/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 34a3d804707e..fda47fb2d967 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -29,6 +29,10 @@ buildGoPackage rec { url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch"; sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i"; }) + (fetchpatch { + url = "https://github.com/go-gitea/gitea/commit/e1c00bd6af677b944a102d84314eba8c487648b3.patch"; + sha256 = "1yf48fvky4as72w38lbrk4qpl4af31i2ckr90h3x5wf61yc105wv"; + }) ]; postPatch = '' From de77326db57287e2ddd80dccac2b68b548468a68 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 18 May 2020 16:17:37 +0300 Subject: [PATCH 306/310] ytop: 0.6.1 -> 0.6.2 (#88064) --- pkgs/tools/system/ytop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index 08e227d24541..64c3bf93aaa3 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -4,18 +4,18 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1p746v9xrfm6avc6v9dvcnpckhvdizzf53pcg9bpcp0lw5sh85da"; + sha256 = "02cpn5257yrmbakx3mlqs97kfambbn9ljb60jbqr1b9w24kd6zgf"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cargoSha256 = "15cpi0b5yqjwi1liry2q17sn9hpc4xf9gn33ri3rs6ls5qs7j7pa"; + cargoSha256 = "0alqzy9gbj9m4l7xj1jsrnl09pv6z7c73gq787cqwn0gj93aaj19"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; From 311e883b23ce854862f2edd07891993c63eadbbd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 14 May 2020 16:39:00 +0200 Subject: [PATCH 307/310] ocamlPackages.dune-private-libs: disable for OCaml < 4.07 --- pkgs/development/ocaml-modules/dune-private-libs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 14059070c9a0..6161bd1fe8e8 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (dune_2) src version; + minimumOCamlVersion = "4.07"; + dontAddPrefix = true; meta = with lib; { From f31adf28b7ac2cc31081ddbd566f94932740564e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 14 May 2020 16:39:04 +0200 Subject: [PATCH 308/310] ocamlPackages.dune_2: use pkgs.dune_2 for OCaml < 4.07 --- pkgs/top-level/ocaml-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 26d2d9fed47a..eafd45217071 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,7 +217,12 @@ let dune = callPackage ../development/tools/ocaml/dune { }; - dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; + dune_2 = + if lib.versionAtLeast ocaml.version "4.07" + then callPackage ../development/tools/ocaml/dune/2.nix { } + else if lib.versionAtLeast ocaml.version "4.02" + then pkgs.dune_2 + else throw "dune_2 is not available for OCaml ${ocaml.version}"; dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; From 4a873aa29ebd44601b86849d39648991939c32e2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 12 May 2020 21:14:39 +0200 Subject: [PATCH 309/310] ocamlPackages.ppxlib: minor refactoring --- .../ocaml-modules/ppxlib/default.nix | 29 ++++++++++++------- pkgs/top-level/ocaml-packages.nix | 18 ++++++------ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index bbaf9e27cf4d..8821e5621295 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, version ? "0.8.1" +{ lib, fetchFromGitHub, buildDunePackage, ocaml +, legacy ? false , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio }: -let sha256 = - { "0.8.1" = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; - "0.12.0" = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; - }."${version}" -; in +let param = + if legacy then { + version = "0.8.1"; + sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; + } else { + version = "0.12.0"; + sha256 = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; + }; in + +if lib.versionAtLeast ocaml.version "4.10" && legacy +then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}" +else buildDunePackage rec { pname = "ppxlib"; - inherit version; + inherit (param) version; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - inherit sha256; + inherit (param) sha256; }; propagatedBuildInputs = [ @@ -26,8 +33,8 @@ buildDunePackage rec { meta = { description = "Comprehensive ppx tool set"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index eafd45217071..2ab0e100adab 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -413,9 +413,7 @@ let js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {}; - js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { - ppxlib = ppxlib.override { version = "0.12.0"; }; - }; + js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { }; js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {}; @@ -815,7 +813,9 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {}; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { + ppxlib = ppxlib.override { legacy = true; }; + }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; @@ -824,7 +824,6 @@ let ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { - ppxlib = ppxlib.override { version = "0.12.0"; }; }; ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; @@ -965,20 +964,21 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes janePackage num octavius re; + inherit ctypes janePackage num octavius ppxlib re; inherit (pkgs) openssl; - ppxlib = ppxlib.override { version = "0.12.0"; }; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { - inherit ctypes janePackage num octavius ppxlib re; + inherit ctypes janePackage num octavius re; inherit (pkgs) openssl; + ppxlib = ppxlib.override { legacy = true; }; } else import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re ppxlib; + inherit ppx_deriving re; inherit (pkgs) openssl; + ppxlib = ppxlib.override { legacy = true; }; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { From 962f93c46b1eaaedbc118c06adfd439ce341a0db Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 11 May 2020 21:13:50 +0200 Subject: [PATCH 310/310] ocamlPackages.labltk: init at 8.06.8 for OCaml 4.10 --- .../ocaml-modules/labltk/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 0677202fab98..e7b68b907137 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -7,13 +7,13 @@ then throw "labltk is not available for OCaml ${ocaml.version}" else let param = -if OCamlVersionAtLeast "4.08" then rec { - version = "8.06.7"; - src = fetchzip { - url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; - sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; - }; -} else + let mkNewParam = { version, sha256 }: { + inherit version; + src = fetchzip { + url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; + inherit sha256; + }; + }; in let mkOldParam = { version, key, sha256 }: { src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz"; @@ -21,7 +21,7 @@ if OCamlVersionAtLeast "4.08" then rec { }; inherit version; }; in - { + rec { "4.04" = mkOldParam { version = "8.06.2"; key = "1628"; @@ -42,6 +42,16 @@ if OCamlVersionAtLeast "4.08" then rec { key = "1764"; sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; }; + _8_06_7 = mkNewParam { + version = "8.06.7"; + sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; + }; + "4.08" = _8_06_7; + "4.09" = _8_06_7; + "4.10" = mkNewParam { + version = "8.06.8"; + sha256 = "0lfjc7lscq81ibqb3fcybdzs2r1i2xl7rsgi7linq46a0pcpkinw"; + }; }.${builtins.substring 0 4 ocaml.version}; in