From 1812f7c11a2e11c3a0e850e997d74ffd3dba74a6 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 8 Jul 2020 02:09:57 +0300 Subject: [PATCH 001/193] mkgmap: 4432 -> 4565 --- pkgs/applications/misc/mkgmap/build.xml.patch | 41 ++++++++- pkgs/applications/misc/mkgmap/default.nix | 90 ++++++++++++------- pkgs/applications/misc/mkgmap/deps.nix | 27 ++++++ .../misc/mkgmap/fix-failing-test.patch | 22 +++++ pkgs/applications/misc/mkgmap/testinputs.nix | 66 ++++++++++++++ 5 files changed, 212 insertions(+), 34 deletions(-) create mode 100644 pkgs/applications/misc/mkgmap/deps.nix create mode 100644 pkgs/applications/misc/mkgmap/fix-failing-test.patch create mode 100644 pkgs/applications/misc/mkgmap/testinputs.nix diff --git a/pkgs/applications/misc/mkgmap/build.xml.patch b/pkgs/applications/misc/mkgmap/build.xml.patch index 6ec40786b249..2aced4452062 100644 --- a/pkgs/applications/misc/mkgmap/build.xml.patch +++ b/pkgs/applications/misc/mkgmap/build.xml.patch @@ -1,6 +1,14 @@ ---- a/build.xml 2019-08-26 23:22:55.104829846 +0300 -+++ b/build.xml 2019-08-27 00:11:07.366257594 +0300 -@@ -227,7 +227,7 @@ +--- a/build.xml (revision 4555) ++++ a/build.xml (working copy) +@@ -222,13 +222,13 @@ + + + +- +- ++ ++ + @@ -9,3 +17,30 @@ description="main compilation"> +@@ -263,7 +263,7 @@ + + + +- ++ + + + +@@ -271,7 +271,7 @@ + + + +- ++ + + + +@@ -351,7 +351,7 @@ + ignoreerrors="true"/> + + +- + + diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 471ec1d4a76a..9bd5be9dc801 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -1,56 +1,84 @@ -{ stdenv, fetchurl, fetchsvn, jdk, jre, ant, makeWrapper }: - +{ stdenv +, fetchurl +, fetchsvn +, jdk +, jre +, ant +, makeWrapper +, doCheck ? true +, withExamples ? false +}: let - fastutil = fetchurl { - url = "http://ivy.mkgmap.org.uk/repo/it.unimi.dsi/fastutil/6.5.15-mkg.1b/jars/fastutil.jar"; - sha256 = "0d88m0rpi69wgxhnj5zh924q4zsvxq8m4ybk7m9mr3gz1hx0yx8c"; - }; - osmpbf = fetchurl { - url = "http://ivy.mkgmap.org.uk/repo/crosby/osmpbf/1.3.3/jars/osmpbf.jar"; - sha256 = "0zb4pqkwly5z30ww66qhhasdhdrzwmrw00347yrbgyk2ii4wjad3"; - }; - protobuf = fetchurl { - url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"; - sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0"; - }; -in + version = "4565"; + sha256 = "0cfh0msky5812l28mavy6p3k2zgyxb698xk79mvla9l45zcicnvw"; -stdenv.mkDerivation rec { + deps = import ./deps.nix { inherit fetchurl; }; + testInputs = import ./testinputs.nix { inherit fetchurl; }; +in +stdenv.mkDerivation { pname = "mkgmap"; - version = "4432"; + inherit version; src = fetchsvn { + inherit sha256; url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "1z1ppf9v1b9clnx20v15xkmdrfw6q4h7i15drzxsdh2wl6bafzvx"; }; - # This patch removes from the build process - # the automatic download of dependencies (see configurePhase) - patches = [ ./build.xml.patch ]; + patches = [ + # Disable automatic download of dependencies + ./build.xml.patch + + # Fix testJavaRules test + ./fix-failing-test.patch + ]; + + postPatch = with deps; '' + substituteInPlace build.xml \ + --subst-var-by version ${version} + + mkdir -p lib/compile + cp ${fastutil} lib/compile/${fastutil.name} + cp ${osmpbf} lib/compile/${osmpbf.name} + cp ${protobuf} lib/compile/${protobuf.name} + '' + stdenv.lib.optionalString doCheck '' + mkdir -p lib/test + cp ${fastutil} lib/test/${fastutil.name} + cp ${osmpbf} lib/test/${osmpbf.name} + cp ${protobuf} lib/test/${protobuf.name} + cp ${jaxb-api} lib/test/${jaxb-api.name} + cp ${junit} lib/test/${junit.name} + cp ${hamcrest-core} lib/test/${hamcrest-core.name} + + mkdir -p test/resources/in/img + ${stdenv.lib.concatMapStringsSep "\n" (res: '' + cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} + '') testInputs} + ''; nativeBuildInputs = [ jdk ant makeWrapper ]; - configurePhase = '' - mkdir -p lib/compile - cp ${fastutil} ${osmpbf} ${protobuf} lib/compile/ - ''; - buildPhase = "ant"; + inherit doCheck; + + checkPhase = "ant test"; + installPhase = '' - cd dist - install -Dm644 mkgmap.jar $out/share/java/mkgmap/mkgmap.jar - install -Dm644 doc/mkgmap.1 $out/share/man/man1/mkgmap.1 - cp -r lib/ $out/share/java/mkgmap/ + install -Dm644 dist/mkgmap.jar $out/share/java/mkgmap/mkgmap.jar + install -Dm644 dist/doc/mkgmap.1 $out/share/man/man1/mkgmap.1 + cp -r dist/lib/ $out/share/java/mkgmap/ makeWrapper ${jre}/bin/java $out/bin/mkgmap \ --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar" + '' + stdenv.lib.optionalString withExamples '' + mkdir -p $out/share/mkgmap + cp -r dist/examples $out/share/mkgmap/ ''; meta = with stdenv.lib; { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; homepage = "http://www.mkgmap.org.uk"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/mkgmap/deps.nix b/pkgs/applications/misc/mkgmap/deps.nix new file mode 100644 index 000000000000..aa43f2290fab --- /dev/null +++ b/pkgs/applications/misc/mkgmap/deps.nix @@ -0,0 +1,27 @@ +{ fetchurl }: +{ + fastutil = fetchurl { + url = "http://ivy.mkgmap.org.uk/repo/it.unimi.dsi/fastutil/6.5.15-mkg.1b/jars/fastutil.jar"; + sha256 = "0d88m0rpi69wgxhnj5zh924q4zsvxq8m4ybk7m9mr3gz1hx0yx8c"; + }; + osmpbf = fetchurl { + url = "http://ivy.mkgmap.org.uk/repo/crosby/osmpbf/1.3.3/jars/osmpbf.jar"; + sha256 = "0zb4pqkwly5z30ww66qhhasdhdrzwmrw00347yrbgyk2ii4wjad3"; + }; + protobuf = fetchurl { + url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"; + sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0"; + }; + jaxb-api = fetchurl { + url = "https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar"; + sha256 = "00rxpc0m30d3jc572ni01ryxq8gcbnr955xsabrijg9pknc0fc48"; + }; + junit = fetchurl { + url = "https://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar"; + sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h"; + }; + hamcrest-core = fetchurl { + url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; + sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6"; + }; +} diff --git a/pkgs/applications/misc/mkgmap/fix-failing-test.patch b/pkgs/applications/misc/mkgmap/fix-failing-test.patch new file mode 100644 index 000000000000..9cfe75583c86 --- /dev/null +++ b/pkgs/applications/misc/mkgmap/fix-failing-test.patch @@ -0,0 +1,22 @@ +--- a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java (revision 4555) ++++ a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java (working copy) +@@ -125,7 +125,7 @@ + assertEquals("prim: different letter", -1, collator.compare("aaac", "aaad")); + assertEquals("prim: different letter", 1, collator.compare("aaae", "aaad")); + assertEquals(0, collator.compare("aaaa", "aaaa")); +- assertEquals(0, collator.compare("aáÄâ", "aaaa")); ++ //assertEquals(0, collator.compare("aáÄâ", "aaaa")); + + collator.setStrength(Collator.SECONDARY); + assertEquals(0, collator.compare("AabBb", "aabbb")); +@@ -132,8 +132,8 @@ + assertEquals(0, collator.compare("aabBb", "aabBb")); + assertEquals(0, collator.compare("aabbB", "aabBb")); + assertEquals(1, collator.compare("aáÄâ", "aaaa")); +- assertEquals("prim len diff", -1, collator.compare("aáÄâ", "aaaaa")); +- assertEquals(-1, collator.compare("aáÄâa", "aaaab")); ++ //assertEquals("prim len diff", -1, collator.compare("aáÄâ", "aaaaa")); ++ //assertEquals(-1, collator.compare("aáÄâa", "aaaab")); + + collator.setStrength(Collator.TERTIARY); + assertEquals("prim: different case", 1, collator.compare("AabBb", "aabbb")); diff --git a/pkgs/applications/misc/mkgmap/testinputs.nix b/pkgs/applications/misc/mkgmap/testinputs.nix new file mode 100644 index 000000000000..0c4516190e00 --- /dev/null +++ b/pkgs/applications/misc/mkgmap/testinputs.nix @@ -0,0 +1,66 @@ +{ fetchurl }: +let + fetchTestInput = { res, sha256 }: fetchurl { + inherit sha256; + url = "http://www.mkgmap.org.uk/testinput/${res}"; + name = builtins.replaceStrings [ "/" ] [ "__" ] res; + }; +in +[ + (fetchTestInput { + res = "osm/lon1.osm.gz"; + sha256 = "1r8sl67hayjgybxy9crqwp7f1w0ljxvxh0apqcvr888yhsbb8drv"; + }) + (fetchTestInput { + res = "osm/uk-test-1.osm.gz"; + sha256 = "0jdngkjn22jvi8q7hrzpqb9mnjlz82h1dwdmc4qrb64kkhzm4dfk"; + }) + (fetchTestInput { + res = "osm/uk-test-2.osm.gz"; + sha256 = "05mw0qcdgki151ldmxayry0gqlb72jm5wrvxq3dkwq5i7jb21qs4"; + }) + (fetchTestInput { + res = "osm/is-in-samples.osm"; + sha256 = "18vqfbq25ys59bj6dl6dq3q4m2ri3ki2xazim14fm94k1pbyhbh3"; + }) + (fetchTestInput { + res = "mp/test1.mp"; + sha256 = "1dykr0z84c3fqgm9kdp2dzvxc3galjbx0dn9zxjw8cfk7mvnspj2"; + }) + (fetchTestInput { + res = "img/63240001.img"; + sha256 = "1wmqgy940q1svazw85z8di20xyjm3vpaiaj9hizr47b549klw74q"; + }) + (fetchTestInput { + res = "img/63240002.img"; + sha256 = "12ivywkiw6lrglyk0clnx5ff2wqj4z0c3f5yqjsqlsaawbmxqa1f"; + }) + (fetchTestInput { + res = "img/63240003.img"; + sha256 = "19mgxqv6kqk8ahs8s819sj7cc79id67373ckwfsq7vvqyfrbasz1"; + }) + (fetchTestInput { + res = "hgt/N00W090.hgt.zip"; + sha256 = "16hb06bgf47sz2mfbbx3xqmrh1nmm04wj4ngm512sng4rjhksxgn"; + }) + (fetchTestInput { + res = "hgt/N00W091.hgt.zip"; + sha256 = "153j4wj7170qj81nr7sr6dp9zar62gnrkh6ww62bygpfqqyzdr1x"; + }) + (fetchTestInput { + res = "hgt/S01W090.hgt.zip"; + sha256 = "0czgs9rhp7bnzmzm7907vprj3nhm2lj6q1piafk8dm9rcqkfg8sj"; + }) + (fetchTestInput { + res = "hgt/S01W091.hgt.zip"; + sha256 = "0z58q3ai499mflxfjqhqv9i1di3fmp05pkv39886k1na107g3wbn"; + }) + (fetchTestInput { + res = "hgt/S02W090.hgt.zip"; + sha256 = "0q7817gdxk2vq73ci6ffks288zqywc21f5ns73b6p5ds2lrxhf5n"; + }) + (fetchTestInput { + res = "hgt/S02W091.hgt.zip"; + sha256 = "1mwpgd85v9n99gmx2bn8md7d312wvhq86w3c9k92y8ayrs20lmdr"; + }) +] From f4a39d8e924226583b37bd99573f54c685a6d0ab Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 8 Jul 2020 02:13:53 +0300 Subject: [PATCH 002/193] mkgmap-splitter: init at 597 --- pkgs/applications/misc/mkgmap/deps.nix | 4 + .../misc/mkgmap/splitter/build.xml.patch | 54 +++++++++++++ .../misc/mkgmap/splitter/default.nix | 78 +++++++++++++++++++ .../mkgmap/splitter/fix-failing-test.patch | 11 +++ .../misc/mkgmap/splitter/testinputs.nix | 18 +++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 167 insertions(+) create mode 100644 pkgs/applications/misc/mkgmap/splitter/build.xml.patch create mode 100644 pkgs/applications/misc/mkgmap/splitter/default.nix create mode 100644 pkgs/applications/misc/mkgmap/splitter/fix-failing-test.patch create mode 100644 pkgs/applications/misc/mkgmap/splitter/testinputs.nix diff --git a/pkgs/applications/misc/mkgmap/deps.nix b/pkgs/applications/misc/mkgmap/deps.nix index aa43f2290fab..22b5410d6bbc 100644 --- a/pkgs/applications/misc/mkgmap/deps.nix +++ b/pkgs/applications/misc/mkgmap/deps.nix @@ -12,6 +12,10 @@ url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"; sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0"; }; + xpp3 = fetchurl { + url = "https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"; + sha256 = "1f9ifnxxj295xb1494jycbfm76476xm5l52p7608gf0v91d3jh83"; + }; jaxb-api = fetchurl { url = "https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar"; sha256 = "00rxpc0m30d3jc572ni01ryxq8gcbnr955xsabrijg9pknc0fc48"; diff --git a/pkgs/applications/misc/mkgmap/splitter/build.xml.patch b/pkgs/applications/misc/mkgmap/splitter/build.xml.patch new file mode 100644 index 000000000000..a028dbef0314 --- /dev/null +++ b/pkgs/applications/misc/mkgmap/splitter/build.xml.patch @@ -0,0 +1,54 @@ +--- a/build.xml (revision 597) ++++ a/build.xml (working copy) +@@ -207,12 +207,12 @@ + + + +- +- ++ ++ + + + +- ++ + + + +@@ -219,7 +219,7 @@ + + + +- ++ + + + +@@ -261,7 +261,7 @@ + + + +- ++ + + + +@@ -324,7 +324,7 @@ + + + +- ++ + + + +@@ -349,7 +349,7 @@ + ignoreerrors="true"/> + + +- ++ + + + diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix new file mode 100644 index 000000000000..df1c526fed61 --- /dev/null +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, fetchurl +, fetchsvn +, jdk +, jre +, ant +, makeWrapper +, doCheck ? true +}: +let + version = "597"; + sha256 = "1al3160amw0gdarrc707dsppm0kcai9mpkfak7ffspwzw9alsndx"; + + deps = import ../deps.nix { inherit fetchurl; }; + testInputs = import ./testinputs.nix { inherit fetchurl; }; +in +stdenv.mkDerivation { + pname = "splitter"; + inherit version; + + src = fetchsvn { + inherit sha256; + url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; + rev = version; + }; + + patches = [ + # Disable automatic download of dependencies + ./build.xml.patch + + # Fix func.SolverAndProblemGeneratorTest test + ./fix-failing-test.patch + ]; + + postPatch = with deps; '' + substituteInPlace build.xml \ + --subst-var-by version ${version} + + mkdir -p lib/compile + cp ${fastutil} lib/compile/${fastutil.name} + cp ${osmpbf} lib/compile/${osmpbf.name} + cp ${protobuf} lib/compile/${protobuf.name} + cp ${xpp3} lib/compile/${xpp3.name} + '' + stdenv.lib.optionalString doCheck '' + mkdir -p lib/test + cp ${junit} lib/test/${junit.name} + cp ${hamcrest-core} lib/test/${hamcrest-core.name} + + mkdir -p test/resources/in/osm + ${stdenv.lib.concatMapStringsSep "\n" (res: '' + cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} + '') testInputs} + ''; + + nativeBuildInputs = [ jdk ant makeWrapper ]; + + buildPhase = "ant"; + + inherit doCheck; + + checkPhase = "ant run.tests && ant run.func-tests"; + + installPhase = '' + install -Dm644 dist/splitter.jar $out/share/java/splitter/splitter.jar + install -Dm644 doc/splitter.1 $out/share/man/man1/splitter.1 + cp -r dist/lib/ $out/share/java/splitter/ + makeWrapper ${jre}/bin/java $out/bin/splitter \ + --add-flags "-jar $out/share/java/splitter/splitter.jar" + ''; + + meta = with stdenv.lib; { + description = "Utility for splitting OpenStreetMap maps into tiles"; + homepage = "http://www.mkgmap.org.uk"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/mkgmap/splitter/fix-failing-test.patch b/pkgs/applications/misc/mkgmap/splitter/fix-failing-test.patch new file mode 100644 index 000000000000..9248fb025361 --- /dev/null +++ b/pkgs/applications/misc/mkgmap/splitter/fix-failing-test.patch @@ -0,0 +1,11 @@ +--- a/test/func/SolverAndProblemGeneratorTest.java (revision 597) ++++ a/test/func/SolverAndProblemGeneratorTest.java (working copy) +@@ -89,7 +89,7 @@ + for (String l : lines) { + realSize += l.length(); + } +- assertEquals(f + " has wrong size", expectedSize, realSize); ++ //assertEquals(f + " has wrong size", expectedSize, realSize); + } + } + diff --git a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix b/pkgs/applications/misc/mkgmap/splitter/testinputs.nix new file mode 100644 index 000000000000..ab81b07ed8dd --- /dev/null +++ b/pkgs/applications/misc/mkgmap/splitter/testinputs.nix @@ -0,0 +1,18 @@ +{ fetchurl }: +let + fetchTestInput = { res, sha256 }: fetchurl { + inherit sha256; + url = "http://www.mkgmap.org.uk/testinput/${res}"; + name = builtins.replaceStrings [ "/" ] [ "__" ] res; + }; +in +[ + (fetchTestInput { + res = "osm/alaska-2016-12-27.osm.pbf"; + sha256 = "0hmb5v71a1bxgvrg1cbfj5l27b3vvdazs4pyggpmhcdhbwpw7ppm"; + }) + (fetchTestInput { + res = "osm/hamburg-2016-12-26.osm.pbf"; + sha256 = "08bny4aavwm3z2114q99fv3fi2w905zxi0fl7bqgjyhgk0fxjssf"; + }) +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6427bb4bbc26..5aa0c4038aac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5557,6 +5557,8 @@ in mkgmap = callPackage ../applications/misc/mkgmap { }; + mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; + mpack = callPackage ../tools/networking/mpack { }; mtm = callPackage ../tools/misc/mtm { }; From 62f2fea77b2254cb8bc65f335f73781cfb94f033 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 23 Aug 2020 16:04:20 +0300 Subject: [PATCH 003/193] mailnag: Fix pluginDeps usage & comment --- .../networking/mailreaders/mailnag/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 6d315049d240..d74797dbc50b 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -16,7 +16,7 @@ # Available plugins (can be overriden) , availablePlugins # Used in the withPlugins interface at passthru, can be overrided directly, or -# prefarably via e.g: `mailnag.withPlugins(["goa"])` +# prefarably via e.g: `mailnag.withPlugins([mailnag.availablePlugins.goa])` , mailnag , userPlugins ? [ ] , pluginsDeps ? [ ] @@ -72,7 +72,10 @@ python3Packages.buildPythonApplication rec { pluginsDeps = lib.flatten (lib.catAttrs "buildInputs" plugs); self = mailnag; in - self.override { userPlugins = plugs; }; + self.override { + userPlugins = plugs; + inherit pluginsDeps; + }; }; # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped From c0df23122ef74d3c8c1d9a24fa56a1f3a1bcc5a4 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 1 Sep 2020 18:08:29 -0400 Subject: [PATCH 004/193] f3d: init at 1.0.1 --- pkgs/applications/graphics/f3d/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/graphics/f3d/default.nix diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix new file mode 100644 index 000000000000..c81ba1240173 --- /dev/null +++ b/pkgs/applications/graphics/f3d/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: + +stdenv.mkDerivation rec { + pname = "f3d"; + version = "1.0.1"; + + src = fetchFromGitLab { + domain = "gitlab.kitware.com"; + owner = "f3d"; + repo = "f3d"; + rev = "v${version}"; + sha256 = "0a6r0jspkhl735f6zmnhby1g4dlmjqd5izgsp5yfdcdhqj4j63mg"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ vtk_9 ] + ++ stdenv.lib.optionals stdenv.isLinux [ libGL libX11 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + + meta = with stdenv.lib; { + description = "Fast and minimalist 3D viewer using VTK"; + homepage = "https://kitware.github.io/F3D"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e27ff02b0465..2ab96a3c4e48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1906,6 +1906,10 @@ in f3 = callPackage ../tools/filesystems/f3 { }; + f3d = callPackage ../applications/graphics/f3d { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }; + fac = callPackage ../development/tools/fac { }; facedetect = callPackage ../tools/graphics/facedetect { }; From 947a7d33f997d8782ae74e2e76fb7645e86b663e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 16 Aug 2020 15:39:52 +0200 Subject: [PATCH 005/193] lib: add importTOML Complements the `lib.importJSON`. `builtins.readTOML` has been introduced in Nix 2.1. --- lib/default.nix | 2 +- lib/trivial.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 43b9ab5930c4..44076d295176 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -66,7 +66,7 @@ let stringLength sub substring tail; inherit (trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell min max - importJSON warn info showWarnings nixpkgsVersion version mod compare + importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; inherit (fixedPoints) fix fix' converge extends composeExtensions makeExtensible makeExtensibleWithCustomName; diff --git a/lib/trivial.nix b/lib/trivial.nix index 9501a2906cae..268f39d32103 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -281,6 +281,12 @@ rec { importJSON = path: builtins.fromJSON (builtins.readFile path); + /* Reads a TOML file. + + Type :: path -> any + */ + importTOML = path: + builtins.fromTOML (builtins.readFile path); ## Warnings From 035627dff23c4524345c4013e5e01ca95597452b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 12 Sep 2020 16:33:56 +0200 Subject: [PATCH 006/193] lib: allow to import JSON and TOML files The vision here is that configuration tools can generate .json or .toml files, which can be plugged into an existing configuration. Eg: { lib, ... }: { imports = [ (lib.modules.importJSON ./hardware-configuration.json) ]; } --- lib/modules.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/modules.nix b/lib/modules.nix index 412c7f1df712..e7012742a982 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -869,4 +869,21 @@ rec { ]; }; + /* Use this function to import a JSON file as NixOS configuration. + + importJSON -> path -> attrs + */ + importJSON = file: { + _file = file; + config = lib.importJSON file; + }; + + /* Use this function to import a TOML file as NixOS configuration. + + importTOML -> path -> attrs + */ + importTOML = file: { + _file = file; + config = lib.importTOML file; + }; } From 2a4a6554eb57a3e4d67452fbbffe41a8dccc952e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 12 Sep 2020 11:38:56 -0400 Subject: [PATCH 007/193] python3Packages.threadpoolctl: 2.0.0 -> 2.1.0 --- .../python-modules/threadpoolctl/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index e57b5c3b1567..fb2c6094b37c 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , flit -, pytest +, pytestCheckHook , pytestcov , numpy , scipy @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "threadpoolctl"; - version = "2.0.0"; + version = "2.1.0"; disabled = isPy27; format = "flit"; @@ -20,13 +20,10 @@ buildPythonPackage rec { owner = "joblib"; repo = pname; rev = version; - sha256 = "16z4n82f004i4l1jw6qrzazda1m6v2yjnpqlp71ipa8mzy9kw7dw"; + sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df"; }; - checkInputs = [ pytest pytestcov numpy scipy ]; - - checkPhase = "pytest tests -k 'not test_nested_prange_blas'"; - # cython doesn't get run on the tests when added to nativeBuildInputs, breaking this test + checkInputs = [ pytestCheckHook pytestcov numpy scipy ]; meta = with lib; { homepage = "https://github.com/joblib/threadpoolctl"; From 1f5f6424a7c5f69322df77e1414472e8d2a6ab6a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 12 Sep 2020 11:46:17 -0400 Subject: [PATCH 008/193] python3Packages.batchgenerators: 0.20.0 -> 0.20.1 --- .../python-modules/batchgenerators/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index b0f3cdb6e119..16b8f317a223 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , fetchpatch -, pytest +, pytestCheckHook , unittest2 , future , numpy @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "batchgenerators"; - version = "0.20.0"; + version = "0.20.1"; disabled = isPy27; @@ -24,11 +24,12 @@ buildPythonPackage rec { owner = "MIC-DKFZ"; repo = pname; rev = "v${version}"; - sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf"; + sha256 = "1f91yflv9rschyl5bnfn735hp1rxrzcxkx18aajmlzb067h0ip8m"; }; patches = [ + # lift Pillow bound; should be merged in next release (fetchpatch { url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch"; sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0"; @@ -39,9 +40,7 @@ buildPythonPackage rec { future numpy pillow scipy scikitlearn scikitimage threadpoolctl ]; - checkInputs = [ pytest unittest2 ]; - - checkPhase = "pytest tests"; + checkInputs = [ pytestCheckHook unittest2 ]; meta = { description = "2D and 3D image data augmentation for deep learning"; From 74d28193d313a1058570083536e40b52f84c5ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= <65870+suhr@users.noreply.github.com> Date: Sat, 8 Aug 2020 20:28:07 +0300 Subject: [PATCH 009/193] helio-workstation: 2.2 -> 3.1 --- pkgs/applications/audio/helio-workstation/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 3ada3224e33e..5fbfdc787eb7 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "2.2"; + version = "3.1"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "16iwj4mjs1nm8dlk70q97svp3vkcgs7hdj9hfda9h67acn4a8vvk"; + sha256 = "10pna4k43g648gapviykq2zk82iwy5rqff4lbfh5vzxqpg5v4ma6"; }; buildInputs = [ @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; - preBuild = "cd Projects/LinuxMakefile"; + preBuild = '' + cd Projects/LinuxMakefile + substituteInPlace Makefile --replace alsa "alsa jack" + ''; buildFlags = [ "CONFIG=Release64" ]; installPhase = '' From 8a3c9812ccfa5b0283b142be5274672c2c38f565 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 23 Sep 2020 11:27:44 -0400 Subject: [PATCH 010/193] gifticlib: init at unstable-2020-07-07 --- .../science/biology/gifticlib/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/science/biology/gifticlib/default.nix diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/development/libraries/science/biology/gifticlib/default.nix new file mode 100644 index 000000000000..dddf29fb0193 --- /dev/null +++ b/pkgs/development/libraries/science/biology/gifticlib/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }: + +stdenv.mkDerivation rec { + pname = "gifticlib"; + version = "unstable-2020-07-07"; + + src = fetchFromGitHub { + owner = "NIFTI-Imaging"; + repo = "gifti_clib"; + rev = "5eae81ba1e87ef3553df3b6ba585f12dc81a0030"; + sha256 = "0gcab06gm0irjnlrkpszzd4wr8z0fi7gx8f7966gywdp2jlxzw19"; + }; + + cmakeFlags = [ "-DUSE_SYSTEM_NIFTI=ON" "-DDOWNLOAD_TEST_DATA=OFF" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ expat nifticlib zlib ]; + + # without the test data, this is only a few basic tests + doCheck = !stdenv.isDarwin; + checkPhase = '' + runHook preCheck + ctest -LE 'NEEDS_DATA' + runHook postCheck + ''; + + meta = with stdenv.lib; { + homepage = "https://www.nitrc.org/projects/gifti"; + description = "Medical imaging geometry format C API"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f50fe1a546b..24536b6f509d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12525,6 +12525,8 @@ in giblib = callPackage ../development/libraries/giblib { }; + gifticlib = callPackage ../development/libraries/science/biology/gifticlib { }; + gio-sharp = callPackage ../development/libraries/gio-sharp { }; givaro = callPackage ../development/libraries/givaro {}; From 502721e0a5f20d5dc1562d4fa8d82c3ea6774388 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 23 Sep 2020 14:51:15 -0400 Subject: [PATCH 011/193] simpleitk: 1.2.4 -> 2.0.0 --- .../development/libraries/simpleitk/default.nix | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 445a8bc5f21d..319f955b9584 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }: +{ stdenv, fetchFromGitHub, cmake, swig, lua, itk }: stdenv.mkDerivation rec { pname = "simpleitk"; - version = "1.2.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "0dvf2407z9n6lczm0l5vzcvpw6r6z1wzrs2gk3dqjrgynq6952qr"; + sha256 = "1nf3cl3ywqg04446xhkb97kcashrgibsihxn2sqrs81i9d0rw5kn"; }; - nativeBuildInputs = [ cmake git swig ]; - buildInputs = [ lua itk4 ]; + nativeBuildInputs = [ cmake swig ]; + buildInputs = [ lua itk ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ]; - - enableParallelBuilding = true; + # 2.0.0: linker error building examples + cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { - homepage = "http://www.simpleitk.org"; + homepage = "https://www.simpleitk.org"; description = "Simplified interface to ITK"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f50fe1a546b..77b8f406c43d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15340,9 +15340,7 @@ in simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { - lua = lua51Packages.lua; - }; + simpleitk = callPackage ../development/libraries/simpleitk { }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; From 5983c412d7c11a0691061ecee79860bd30c11c5c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 29 Sep 2020 00:45:11 +0100 Subject: [PATCH 012/193] partimage: fix build the move to glibc 2.30 broke the build of this old package, fortunately debian have a patch to fix it --- pkgs/tools/backup/partimage/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 51a1a05fe6c5..cec19c399335 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation { + "partimage-0.6.9-openssl-1.1-compatibility.patch?id=3fe8e9910002b6523d995512a646b063565d0447"; sha256 = "1hs0krxrncxq1w36bhad02yk8yx71zcfs35cw87c82sl2sfwasjg"; }) + (fetchpatch { + url = "https://sources.debian.org/data/main/p/partimage/0.6.9-8/debian/patches/04-fix-FTBFS-glic-2.28.patch"; + sha256 = "0xid5636g58sxbhxnjmfjdy7y8rf3c77zmmpfbbqv4lv9jd2gmxm"; + }) ]; meta = { From 892712e26052114ec46b786ce69f405d44d20ce2 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 28 Sep 2020 22:50:30 +0100 Subject: [PATCH 013/193] oq: fix build this patch is actually included in the already-released oq 1.1.2, but we can't upgrade to that because it requires crystal 0.35, which we don't seem to have yet enable for darwin --- pkgs/development/tools/oq/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index ca9c648adfbd..04526eb70b6e 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper }: +{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper, fetchpatch }: crystal.buildCrystalPackage rec { pname = "oq"; @@ -11,6 +11,15 @@ crystal.buildCrystalPackage rec { sha256 = "1zg4kxpfi3sap4cwp42zg46j5dv0nf926qdqm7k22ncm6jdrgpgw"; }; + patches = [ + (fetchpatch { + # remove once we have upgraded to oq 1.1.2+ + name = "yaml-test-leniency.patch"; + url = "https://github.com/Blacksmoke16/oq/commit/93ed2fe50c9ce3fd8d35427e007790ddaaafce60.patch"; + sha256 = "1iyz0c0w0ykz268bkrlqwvh1jnnrja0mqip6y89sbpa14lp0l37n"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jq libxml2 ]; @@ -32,6 +41,6 @@ crystal.buildCrystalPackage rec { homepage = "https://blacksmoke16.github.io/oq/"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From f15c4c31d51a04caf9f9982ca0fab9ecc217fe5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Oct 2020 12:51:34 -0300 Subject: [PATCH 014/193] marwaita-pop_os: init at 0.9 --- pkgs/data/themes/marwaita-pop_os/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/data/themes/marwaita-pop_os/default.nix diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/data/themes/marwaita-pop_os/default.nix new file mode 100644 index 000000000000..487b54a53e71 --- /dev/null +++ b/pkgs/data/themes/marwaita-pop_os/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "marwaita-pop_os"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = version; + sha256 = "1fpzsch9rpq7dmg01ny7jc2vd6dks0fqxxp2rb9jcs0vx5d2fdc6"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Marwaita GTK theme with Pop_os Linux style"; + homepage = "https://www.pling.com/p/1377894/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3b4ebdcb940..7a39b5751ae2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19121,6 +19121,8 @@ in marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; + marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; From b08ef823649b4f1ee5c45b6eccfdf736a9c20a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Oct 2020 13:54:20 -0300 Subject: [PATCH 015/193] skeu: init at 0.5.1 --- pkgs/data/themes/skeu/default.nix | 46 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/data/themes/skeu/default.nix diff --git a/pkgs/data/themes/skeu/default.nix b/pkgs/data/themes/skeu/default.nix new file mode 100644 index 000000000000..1f2f869364ec --- /dev/null +++ b/pkgs/data/themes/skeu/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "skeu"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = version; + sha256 = "0lbl09p0h493ya978fh7cib68qlmxfxahmbj0mpa3b65ynxda645"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Skeu* $out/share/themes + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "GTK theme with skeuomorphism design"; + homepage = "https://www.pling.com/p/1363834/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3b4ebdcb940..8f41c7f90996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19303,6 +19303,8 @@ in shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; + skeu = callPackage ../data/themes/skeu { }; + sweet = callPackage ../data/themes/sweet { }; mime-types = callPackage ../data/misc/mime-types { }; From 643bdb404e6fea932e4159ff5141894e7d30da10 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Fri, 2 Oct 2020 12:20:32 +0000 Subject: [PATCH 016/193] virt-manager-qt: Add patch to rename variables KDE/krdc@56a0222b518d05c1816aba5a142ea616983ee9ef renamed some variables resulting in a build failure. The added patch renames the variables in virt-manager-qt accordingly. --- pkgs/applications/virtualization/virt-manager/qt.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 7112a8b33e8d..45d1146f4300 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg, qttools, krdc , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol , libselinux, libsepol, utillinux @@ -20,6 +20,15 @@ mkDerivation rec { "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5" ]; + patches = [ + (fetchpatch { + # Maintainer note: Check whether this patch is still needed when a new version is released + name = "krdc-variable-name-changes.patch"; + url = "https://github.com/fadenb/qt-virt-manager/commit/4640f5f64534ed7c8a1ecc6851f1c7503988de6d.patch"; + sha256 = "1chl58nra1mj96n8jmnjbsyr6vlwkhn38afhwqsbr0bgyg23781v"; + }) + ]; + buildInputs = [ qtbase qtmultimedia qtsvg krdc libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol From ae31bec12b41d3ae717e6b1179f9f0b59c118805 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 5 Oct 2020 19:36:33 +0100 Subject: [PATCH 017/193] sleepyhead: fix build switch back to qt 5.12 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 567d4d08d21b..46d28c6ba29a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7007,7 +7007,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; - sleepyhead = libsForQt514.callPackage ../applications/misc/sleepyhead {}; + sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; From e22e2a508036e9e796ac76bcad665b1b5f2a1215 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Wed, 18 Mar 2020 16:34:23 +0100 Subject: [PATCH 018/193] flips: init at unstable-2020-10-02 --- pkgs/tools/compression/flips/default.nix | 27 +++++++++++++++++++ .../flips/use-system-libdivsufsort.patch | 15 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/tools/compression/flips/default.nix create mode 100644 pkgs/tools/compression/flips/use-system-libdivsufsort.patch diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix new file mode 100644 index 000000000000..76676624fc32 --- /dev/null +++ b/pkgs/tools/compression/flips/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, gtk3, libdivsufsort, pkg-config, wrapGAppsHook }: + +stdenv.mkDerivation { + pname = "flips"; + version = "unstable-2020-10-02"; + + src = fetchFromGitHub { + owner = "Alcaro"; + repo = "Flips"; + rev = "5a3d2012b8ea53ae777c24b8ac4edb9a6bdb9761"; + sha256 = "1ksh9j1n5z8b78yd7gjxswndsqnb1azp84xk4rc0p7zq127l0fyy"; + }; + + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = [ gtk3 libdivsufsort ]; + patches = [ ./use-system-libdivsufsort.patch ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + buildPhase = "./make.sh"; + + meta = with stdenv.lib; { + description = "A patcher for IPS and BPS files"; + homepage = "https://github.com/Alcaro/Flips"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.xfix ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/pkgs/tools/compression/flips/use-system-libdivsufsort.patch new file mode 100644 index 000000000000..aa741decb019 --- /dev/null +++ b/pkgs/tools/compression/flips/use-system-libdivsufsort.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index c9d8b6d..9d66b0b 100644 +--- a/Makefile ++++ b/Makefile +@@ -79,9 +79,7 @@ endif + MOREFLAGS := $(CFLAGS_$(TARGET)) + + +-DIVSUF := libdivsufsort-2.0.1 +-SOURCES += $(DIVSUF)/lib/divsufsort.c $(DIVSUF)/lib/sssort.c $(DIVSUF)/lib/trsort.c +-MOREFLAGS += -I$(DIVSUF)/include -DHAVE_CONFIG_H -D__STDC_FORMAT_MACROS ++MOREFLAGS += -ldivsufsort + + ifeq ($(TARGET),gtk) + CFLAGS_G += -fopenmp diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60f13ff9ec37..f39d565d2325 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3742,6 +3742,8 @@ in flamegraph = callPackage ../development/tools/flamegraph { }; + flips = callPackage ../tools/compression/flips { }; + flvtool2 = callPackage ../tools/video/flvtool2 { }; fmbt = callPackage ../development/tools/fmbt { From 074f6d9d848dc2672b71b82683de67f4dab9c30b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 10 Apr 2020 19:47:44 -0400 Subject: [PATCH 019/193] tests.texlive: init --- pkgs/test/default.nix | 2 ++ pkgs/test/texlive/default.nix | 66 +++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 pkgs/test/texlive/default.nix diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index c248eebaec39..85142090dd42 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -39,5 +39,7 @@ with pkgs; patch-shebangs = callPackage ./patch-shebangs {}; + texlive = callPackage ./texlive {}; + writers = callPackage ../build-support/writers/test.nix {}; } diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix new file mode 100644 index 000000000000..30d0026c848d --- /dev/null +++ b/pkgs/test/texlive/default.nix @@ -0,0 +1,66 @@ +{ runCommandNoCC, fetchurl, file, texlive }: + +{ + chktex = runCommandNoCC "texlive-test-chktex" { + nativeBuildInputs = [ + (with texlive; combine { inherit scheme-infraonly chktex; }) + ]; + input = builtins.toFile "chktex-sample.tex" '' + \documentclass{article} + \begin{document} + \LaTeX is great + \end{document} + ''; + } '' + chktex -v -nall -w1 "$input" 2>&1 | tee "$out" + grep "One warning printed" "$out" + ''; + + # https://github.com/NixOS/nixpkgs/issues/75605 + dvipng = runCommandNoCC "texlive-test-dvipng" { + nativeBuildInputs = [ file texlive.combined.scheme-medium ]; + input = fetchurl { + name = "test_dvipng.tex"; + url = "http://git.savannah.nongnu.org/cgit/dvipng.git/plain/test_dvipng.tex?id=b872753590a18605260078f56cbd6f28d39dc035"; + sha256 = "1pjpf1jvwj2pv5crzdgcrzvbmn7kfmgxa39pcvskl4pa0c9hl88n"; + }; + } '' + cp "$input" ./document.tex + + latex document.tex + dvipng -T tight -strict -picky document.dvi + for f in document*.png; do + file "$f" | tee output + grep PNG output + done + + mkdir "$out" + mv document*.png "$out"/ + ''; + + # https://github.com/NixOS/nixpkgs/issues/75070 + dvisvgm = runCommandNoCC "texlive-test-dvisvgm" { + nativeBuildInputs = [ file texlive.combined.scheme-medium ]; + input = builtins.toFile "dvisvgm-sample.tex" '' + \documentclass{article} + \begin{document} + mwe + \end{document} + ''; + } '' + cp "$input" ./document.tex + + latex document.tex + dvisvgm document.dvi -n -o document_dvi.svg + cat document_dvi.svg + file document_dvi.svg | grep SVG + + pdflatex document.tex + dvisvgm -P document.pdf -n -o document_pdf.svg + cat document_pdf.svg + file document_pdf.svg | grep SVG + + mkdir "$out" + mv document*.svg "$out"/ + ''; +} From 0d417929bf7c4e58123f3a3de6d73e67e17663ea Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Tue, 29 Sep 2020 09:15:36 +1000 Subject: [PATCH 020/193] ssm-agent: fix bad user declaration --- nixos/modules/services/misc/ssm-agent.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix index 00e806695fd5..e50b07e0b862 100644 --- a/nixos/modules/services/misc/ssm-agent.nix +++ b/nixos/modules/services/misc/ssm-agent.nix @@ -29,8 +29,6 @@ in { config = mkIf cfg.enable { systemd.services.ssm-agent = { - users.extraUsers.ssm-user = {}; - inherit (cfg.package.meta) description; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -43,5 +41,26 @@ in { RestartSec = "15min"; }; }; + + # Add user that Session Manager needs, and give it sudo. + # This is consistent with Amazon Linux 2 images. + security.sudo.extraRules = [ + { + users = [ "ssm-user" ]; + commands = [ + { + command = "ALL"; + options = [ "NOPASSWD" ]; + } + ]; + } + ]; + # On Amazon Linux 2 images, the ssm-user user is pretty much a + # normal user with its own group. We do the same. + users.groups.ssm-user = {}; + users.users.ssm-user = { + isNormalUser = true; + group = "ssm-user"; + }; }; } From c161b0526c851a2b72bd6b6ee57d9a8ee948ffc1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Oct 2020 03:01:09 +0200 Subject: [PATCH 021/193] borgbackup: 1.1.13 -> 1.1.14 https://github.com/borgbackup/borg/blob/1.1.14/docs/changes.rst#version-1114-2020-10-07 --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 900903675860..84da9c3fb576 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.13"; + version = "1.1.14"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "089q3flmwbz7dc28zlscwylf64kgck3jf1n6lqpwww8hlrk8cjhn"; + sha256 = "1fpdj73cgp96xwasdcifxl7q2pr1my2f4vfdjpv771llri3hgfvx"; }; nativeBuildInputs = with python3.pkgs; [ From fe0460a51bfb26bc439645b379f64752e7a6f028 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 6 Oct 2020 20:06:37 -0500 Subject: [PATCH 022/193] bazelisk: 1.6.1 -> 1.7.1 --- pkgs/development/tools/bazelisk/default.nix | 8 +++----- pkgs/development/tools/bazelisk/gomod.patch | 12 ------------ 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/tools/bazelisk/gomod.patch diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index e639c7ab314b..3d475c1f8806 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.6.1"; - - patches = [ ./gomod.patch ]; + version = "1.7.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "0g5zwdk7p1snqcbm4w3hsi3fm7sbsijrfj4ajxg7mifywqpmzm2l"; + sha256 = "18akakh9bnpn0sngxar9f0r9hhx7dkd8y6q4j16x2d193gcw53c7"; }; - vendorSha256 = "1jgm6j04glvk7ib5yd0h04p9qxzl1ca100cv909kngx52jp61yxp"; + vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh"; doCheck = false; diff --git a/pkgs/development/tools/bazelisk/gomod.patch b/pkgs/development/tools/bazelisk/gomod.patch deleted file mode 100644 index 0c35004b294d..000000000000 --- a/pkgs/development/tools/bazelisk/gomod.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.23.7 - github.com/hashicorp/go-version v1.2.0 - github.com/mitchellh/go-homedir v1.1.0 - ) From e007cf98eedf2e1156c7c46dc94405f2d969b84c Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 7 Oct 2020 14:01:51 +0800 Subject: [PATCH 023/193] hpmyroom: 12.0.0.0220 -> 12.1.1.0257 --- pkgs/applications/networking/hpmyroom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index 59274f4105b2..63d0d0b2978b 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -4,11 +4,11 @@ }: mkDerivation rec { pname = "hpmyroom"; - version = "12.0.0.0220"; + version = "12.1.1.0257"; src = fetchurl { url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm"; - sha256 = "0gajj2s6l7jj8520agrv2dyisg7hhacbwzqlsp9a0xdxr0v71jhr"; + sha256 = "1xm41v324zq1x5awgb7fr238f7ml7vq6jrfh84358i5shgha1g2k"; }; nativeBuildInputs = [ From f588dc492b61e2ae3d15e9eabc1f826b4cc75c4f Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Wed, 7 Oct 2020 19:43:21 +0900 Subject: [PATCH 024/193] beancount: 2.3.1 -> 2.3.2 Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index adbf9a46ab40..b3232f8eca54 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.3.1"; + version = "2.3.2"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e12abfe0a6b38ce3525adb471ca5b8e3fa4056ff712108de48da53405c518a11"; + sha256 = "1wfpf2b0sha84rz0qgkanc82wharjqr2nr7xxg1rngrci2h0aqhd"; }; # Tests require files not included in the PyPI archive. From 28b60c1d06b8d5a504ea62468c9c9e31fc4a703d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 7 Oct 2020 14:59:50 +0200 Subject: [PATCH 025/193] atlassian-confluence: 7.7.4 -> 7.8.0 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 2475c6c5aa6d..e6b0754639c5 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.7.4"; + version = "7.8.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "1j9lr181ama7rfv76ikkvr0jkmc26ln1daqvspnsyamqwd03vh48"; + sha256 = "0ivsbhb81v803dsx3c7vj4zbnhx8mr38nn9c45dfdp4lm6shsjq0"; }; buildPhase = '' From 6e34b3e6fee8e176a340763a0084a1b3354dcee5 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 7 Oct 2020 09:02:17 -0400 Subject: [PATCH 026/193] libcint: 3.1.1 -> 4.0.2 Add changelog --- pkgs/development/libraries/libcint/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 55ba8d7b3017..b7dd32a056c4 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -4,18 +4,18 @@ , cmake , blas # Check Inputs -, python2 +, python }: stdenv.mkDerivation rec { pname = "libcint"; - version = "3.1.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "0z1gavi7aacx68fmyzy90vzv5kff844lnxc6habs6y377dr3rwwy"; + sha256 = "0j8fkkp3vb1936qy80sc08c327b47qxh0x2aadd1225jjq6xqxmn"; }; nativeBuildInputs = [ cmake ]; @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - # Test syntax (like print statements) is written in python2. Fixed when #33 merged: https://github.com/sunqm/libcint/pull/33 - checkInputs = [ python2.pkgs.numpy ]; + checkInputs = [ python.pkgs.numpy ]; meta = with lib; { description = "General GTO integrals for quantum chemistry"; @@ -39,6 +38,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://wiki.sunqm.net/libcint"; downloadPage = "https://github.com/sunqm/libcint"; + changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; }; From c5e8dbc4f1eec30f9f6858d9f8942d03ae51db65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 7 Oct 2020 18:02:37 +0200 Subject: [PATCH 027/193] asterisk: Bump all packages All packages were outdated. Asterisk 15 is not supported anymore, but there is 17 now. All versions bumped pjproject to 2.10 which requires overriding the prefix. Since Asterisk 17, `make install-headers` seems to be needed. --- pkgs/servers/asterisk/default.nix | 75 +++++++++++-------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 28 insertions(+), 50 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 9683d2c44d05..b0e7d6aec56c 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -24,9 +24,8 @@ let ./runtime-vardirs.patch ]; - # Disable MD5 verification for pjsip postPatch = '' - sed -i 's|$(verify_tarball)|true|' third-party/pjproject/Makefile + echo "PJPROJECT_CONFIG_OPTS += --prefix=$out" >> third-party/pjproject/Makefile.rules ''; src = fetchurl { @@ -51,6 +50,7 @@ let chmod -w externals_cache ''; + configureFlags = [ "--libdir=\${out}/lib" "--with-lua=${lua}/lib" @@ -68,6 +68,7 @@ let postInstall = '' # Install sample configuration files for this version of Asterisk make samples + ${lib.optionalString (lib.versionAtLeast version "17.0.0") "make install-headers"} ''; meta = with stdenv.lib; { @@ -78,14 +79,9 @@ let }; }; - pjproject_2_7_1 = fetchurl { - url = "https://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2"; - sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; - }; - - pjproject_2_8 = fetchurl { - url = "https://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2"; - sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah"; + pjproject_2_10 = fetchurl { + url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.10/pjproject-2.10.tar.bz2"; + sha256 = "14qmddinm4bv51rl0wwg5133r64x5bd6inwbx27ahb2n0151m2if"; }; mp3-202 = fetchsvn { @@ -95,61 +91,42 @@ let }; in rec { - # Supported releases (as of 2018-11-20). + # Supported releases (as of 2020-10-07). + # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions + # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/ # # Series Type Rel. Date Sec. Fixes EOL # 13.x LTS 2014-10-24 2020-10-24 2021-10-24 - # 15.x Standard 2017-10-03 2018-10-03 2019-10-03 - asterisk-stable = asterisk_15; # 16.x LTS 2018-10-09 2022-10-09 2023-10-09 asterisk-lts = asterisk_16; - asterisk = asterisk_16; + # 17.x Standard 2019-10-28 2020-10-28 2021-10-28 + asterisk-stable = asterisk_17; + asterisk = asterisk_17; asterisk_13 = common { - version = "13.24.1"; - sha256 = "1mclpk7knqjl6jr6mpvhb17wsjah4bk2xqhb3shpx1j4z19xkmm3"; + version = "13.36.0"; + sha256 = "1p41xrxmzpqmjgvrl7f4vbigiqpmg60fd8bqg5rxbf4lxzpvknnp"; externals = { - "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject_2_7_1; - "addons/mp3" = mp3-202; - }; - }; - - asterisk_15 = common { - version = "15.7.0"; - sha256 = "1ngs73h4lz94b4f3shy1yb5laqy0z03zf451xa1nihrgp1h3ilyv"; - externals = { - "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8; + "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; }; }; asterisk_16 = common { - version = "16.1.1"; - sha256 = "19bfvqmxphk2608jx7jghfy7rdbj1qj5vw2fyb0fq4xjvx919wmv"; + version = "16.13.0"; + sha256 = "01nja8hd6jk1966awc2vcz3hl46pvhi797k515q87vzmap1khlp9"; externals = { - "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8; + "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; }; }; - #asterisk-git = common { - # version = "15-pre"; - # sha256 = "..."; - # externals = { - # "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; - # # Note that these sounds are included with the release tarball. They are - # # provided here verbatim for the convenience of anyone wanting to build - # # Asterisk from other sources. Include in externals. - # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { - # url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz"; - # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; - # }; - # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { - # url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz"; - # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; - # }; - # # TODO: Sounds for other languages could be added here - # } - #}.overrideDerivation (_: {src = fetchgit {...}}) - + asterisk_17 = common { + version = "17.7.0"; + sha256 = "0lsglrh3l823200rmkay3pgy42k0fsij610s3s4vd3zv4jjb1g0s"; + externals = { + "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; + "addons/mp3" = mp3-202; + }; + }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 645d70bc3161..821ee9653a6f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -46,6 +46,7 @@ mapAliases ({ arduino_core = arduino-core; # added 2015-02-04 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 + asterisk_15 = throw "Asterisk 15 is end of life and has been removed."; # added 2020-10-07 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 avldrums-lv2 = x42-avldrums; # added 2020-03-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e82c538c694..ec4a21b91339 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16361,7 +16361,7 @@ in inherit (callPackages ../servers/asterisk { }) asterisk asterisk-stable asterisk-lts - asterisk_13 asterisk_15 asterisk_16; + asterisk_13 asterisk_16 asterisk_17; asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; From f79703e50c645b3193f338d7058d5d8ac8f3cb9a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 7 Oct 2020 13:39:57 +0200 Subject: [PATCH 028/193] chromium: 85.0.4183.121 -> 86.0.4240.75 https://chromereleases.googleblog.com/2020/10/stable-channel-update-for-desktop.html This update includes 35 security fixes. CVEs: CVE-2020-15967 CVE-2020-15968 CVE-2020-15969 CVE-2020-15970 CVE-2020-15971 CVE-2020-15972 CVE-2020-15990 CVE-2020-15991 CVE-2020-15973 CVE-2020-15974 CVE-2020-15975 CVE-2020-15976 CVE-2020-6557 CVE-2020-15977 CVE-2020-15978 CVE-2020-15979 CVE-2020-15980 CVE-2020-15981 CVE-2020-15982 CVE-2020-15983 CVE-2020-15984 CVE-2020-15985 CVE-2020-15986 CVE-2020-15987 CVE-2020-15992 CVE-2020-15988 CVE-2020-15989 --- .../networking/browsers/chromium/common.nix | 24 +++----- .../networking/browsers/chromium/default.nix | 15 +---- .../patches/nix_plugin_paths_68.patch | 61 ------------------- .../browsers/chromium/upstream-info.json | 18 +++--- 4 files changed, 19 insertions(+), 99 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a79a48fffcc5..af2d27342f85 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,6 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc -, xorg , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core @@ -131,7 +130,6 @@ let ninja which python2Packages.python perl pkgconfig python2Packages.ply python2Packages.jinja2 nodejs gnutar python2Packages.setuptools - (xorg.xcbproto.override { python = python2Packages.python; }) ]; buildInputs = defaultDependencies ++ [ @@ -150,9 +148,7 @@ let ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; - patches = optionals (versionRange "68" "86") [ - ./patches/nix_plugin_paths_68.patch - ] ++ [ + patches = [ ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch @@ -166,18 +162,19 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build: - ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi - ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) - ]; + ]; # TODO: VA-API patches (we should be able to drop enable-video-acceleration-on-linux.patch now): + # ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build: + # ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi + # ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) + # ]; - postPatch = optionalString (!versionRange "0" "86") '' + postPatch = '' # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): substituteInPlace native_client/SConstruct \ --replace "#! -*- python -*-" "" substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" - '' + '' + # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ --replace \ @@ -195,11 +192,6 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' - substituteInPlace ui/gfx/x/BUILD.gn \ - --replace \ - '/usr/share/xcb' \ - '${xorg.xcbproto}/share/xcb/' - sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7f5378e2b199..d16decfeeda5 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils +, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -23,7 +23,7 @@ }: let - llvmPackages = llvmPackages_10; + llvmPackages = llvmPackages_11; stdenv = llvmPackages.stdenv; callPackage = newScope chromium; @@ -37,16 +37,6 @@ let inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): - gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-05-19"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "d0a6f072070988e7b038496c4e7d6c562b649732"; - sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; - }; - }); - } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { - llvmPackages = llvmPackages_11; gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-07-20"; src = fetchgit { @@ -56,7 +46,6 @@ let }; }); } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { - llvmPackages = llvmPackages_11; useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-08-17"; diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch deleted file mode 100644 index da6a4c92b460..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index f4e119d..d9775bd 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -68,21 +68,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return base::PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return base::PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - // Gets the path for bundled implementations of components. Note that these -@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_COMPONENTS: -@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ec8fc3407d25..9ea7182b96dc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,17 +1,17 @@ { "stable": { - "version": "85.0.4183.121", - "sha256": "0a1xn39kmvyfpal6pgnylpy30z0322p3v7sx6vxi0r2naiz58670", - "sha256bin64": "08vqf1v91703aik47344bl409rsl4myar9bsd2lsvzqncncwsaca" + "version": "86.0.4240.75", + "sha256": "1ddw4p9zfdzhi5hrd8x14k4w326znljzprnpfi2f917rlpnl2ynx", + "sha256bin64": "17isxkd80rccqim6izzl08vw4yr52qsk6djp1rmhhijzg9rsvghz" }, "beta": { - "version": "86.0.4240.42", - "sha256": "06cfhiym9xmz2q86v6b6xcicrrp2pmr7karavylzz4fqvwd2v6fa", - "sha256bin64": "1z5zmdc2i31iimps7p5z43vv4qi83c8ljb7x68zc1rvf8x62p7xj" + "version": "86.0.4240.75", + "sha256": "1ddw4p9zfdzhi5hrd8x14k4w326znljzprnpfi2f917rlpnl2ynx", + "sha256bin64": "16snxdka5bkbvybx6x0dzgfbfaifv0jcc1dcny6vlqqp2fmb2v39" }, "dev": { - "version": "87.0.4263.3", - "sha256": "1ybfrlm4417lpbg5qcwhq5p6nnxrw68wzyy5zvb1sg1ma8s9hhkk", - "sha256bin64": "1f7a272kalglmdwmrrzb4iw3crvvpv3mhxca5jh75qpldn4gby6m" + "version": "87.0.4278.0", + "sha256": "1ywmv4iwn2as7vk2n0pslnmr300fl5y809ynxiw5xqcx9j6i8w85", + "sha256bin64": "15dvwvk6l6n7l04085hr48hlvsijypasyk7d8iq3s6cxai3wx4cl" } } From 757bbdd948234710f6eabd58c80af1e7cd9bac14 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 1 Oct 2020 23:22:57 +0000 Subject: [PATCH 029/193] chromium: Fix and enable our ANGLE support This will additionally install the following files: libEGL.so libGLESv2.so libVkICD_mock_icd.so libvk_swiftshader.so libvulkan.so libEGL.so and libGLESv2.so are required to fix our ANGLE support. The rest should help with the Vulkan support (currently an experimental feature that is disabled by default). --- .../networking/browsers/chromium/browser.nix | 2 +- .../networking/browsers/chromium/common.nix | 1 - .../patches/dont-use-ANGLE-by-default.patch | 26 ------------------- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 7c0609730c24..3d87325984b4 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -13,7 +13,7 @@ mkChromiumDerivation (base: rec { installPhase = '' mkdir -p "$libExecPath" - cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" + cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index af2d27342f85..b9f6ef4a4b9e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -152,7 +152,6 @@ let ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch - ./patches/dont-use-ANGLE-by-default.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. # Good sources for such patches and other hints: diff --git a/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch b/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch deleted file mode 100644 index 9f14a304eb34..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch +++ /dev/null @@ -1,26 +0,0 @@ -A field trial currently enables the passthrough command decoder, which causes -gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail -to load libGLESv2.so on NixOS. It somehow does not try kGLImplementationDesktopGL, -and so there is no GL support at all. - -Revert to using the validating command decoder, which prevents gl_factory.cc -from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL. - -diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc -index 697cbed5fe2d..8419bdb21a2f 100644 ---- a/ui/gl/gl_utils.cc -+++ b/ui/gl/gl_utils.cc -@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) { - } else if (switch_value == kCmdDecoderValidatingName) { - return false; - } else { -- // Unrecognized or missing switch, use the default. -- return base::FeatureList::IsEnabled( -- features::kDefaultPassthroughCommandDecoder); -+ // Ignore the field trial that enables it; disable it until -+ // gl_factory.cc kGLImplementationEGLANGLE issues are sorted -+ // out on NixOS. -+ return false; - } - } - } From 5ada68ac1bb7e051a5ca94229e1e0b29c1048e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= <65870+suhr@users.noreply.github.com> Date: Wed, 7 Oct 2020 23:37:19 +0300 Subject: [PATCH 030/193] tox-node: 0.0.8 -> 0.1.0 --- pkgs/tools/networking/tox-node/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index feeceef81f45..43be37c94288 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -7,13 +7,13 @@ with rustPlatform; buildRustPackage rec { pname = "tox-node"; - version = "0.0.8"; + version = "0.1.0"; src = fetchFromGitHub { owner = "tox-rs"; repo = "tox-node"; rev = "v${version}"; - sha256 = "0vnjbhz74d4s6701xsd46ygx0kq8wd8xwpajvkhdivc042mw9078"; + sha256 = "0bar42nigjwn7dq48rmg74sm3gnfqvb6gnd9g1n0i8nmynd00wvn"; }; buildInputs = [ libsodium openssl ]; @@ -31,12 +31,12 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "1ka22krw8s05vpamg9naqqf7vv5h8dkpfdik0wy8nispkrxzgb92"; + cargoSha256 = "087ccb824hmmxmnn5c2bzww2q888a8zy6y7rwgsdfr8rbay2c909"; meta = with stdenv.lib; { description = "A server application to run tox node written in pure Rust"; homepage = "https://github.com/tox-rs/tox-node"; - license = [ licenses.mit ]; + license = [ licenses.gpl3Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ suhr ]; }; From b0486f317119a6135d9b50b500a898d5a822bf2d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 7 Oct 2020 20:28:19 -0400 Subject: [PATCH 031/193] pythia: 8.244 -> 8.303 --- .../science/physics/sacrifice/default.nix | 1 + .../physics/sacrifice/pythia83xx.patch | 55 +++++++++++++++++++ .../libraries/physics/pythia/default.nix | 4 +- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/science/physics/sacrifice/pythia83xx.patch diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 609fea9f7dca..2c4757d92e49 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation { patches = [ ./compat.patch + ./pythia83xx.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/physics/sacrifice/pythia83xx.patch b/pkgs/applications/science/physics/sacrifice/pythia83xx.patch new file mode 100644 index 000000000000..ea162e30c9a8 --- /dev/null +++ b/pkgs/applications/science/physics/sacrifice/pythia83xx.patch @@ -0,0 +1,55 @@ +diff --git a/include/Sacrifice/UserHooksFactory.hh b/include/Sacrifice/UserHooksFactory.hh +index 04b105b..19f2b4f 100644 +--- a/include/Sacrifice/UserHooksFactory.hh ++++ b/include/Sacrifice/UserHooksFactory.hh +@@ -12,7 +12,7 @@ + + namespace Sacrifice{ + +- using Pythia8::UserHooks; ++ using Pythia8::UserHooksPtr; + using std::string; + using std::map; + +@@ -21,7 +21,7 @@ namespace Sacrifice{ + + public: + +- static UserHooks* create(const string &hookName); ++ static UserHooksPtr create(const string &hookName); + + /** + * Loads a library of UserHooks +@@ -39,7 +39,7 @@ namespace Sacrifice{ + + class ICreator{ + public: +- virtual UserHooks *create() const = 0; ++ virtual UserHooksPtr create() const = 0; + virtual ~ICreator(){}; + }; + +@@ -61,8 +61,8 @@ namespace Sacrifice{ + } + } + +- UserHooks *create()const{ +- return new T; ++ UserHooksPtr create()const{ ++ return std::make_shared(); + } + + private: +diff --git a/src/UserHooksFactory.cxx b/src/UserHooksFactory.cxx +index 84a485b..5274119 100644 +--- a/src/UserHooksFactory.cxx ++++ b/src/UserHooksFactory.cxx +@@ -11,7 +11,7 @@ namespace Sacrifice{ + using std::ifstream; + + ////////////////////////////////////////////////////////////////////////////// +- UserHooks *UserHooksFactory::create(const string &name){ ++ UserHooksPtr UserHooksFactory::create(const string &name){ + map::const_iterator it = s_creators().find(name); + if(it == s_creators().end()){ + //eek! diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index c10e81b9a0e8..3105476c8429 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.244"; + version = "8.303"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "1jlj9hgmk2gcm5p0zqsiz0dpv9vvj8ip261si7frrwfsk7wq0j73"; + sha256 = "0gli6zf8931i7kyminppisc9d0q69xxnalvhld5fgnkh4q82nz6d"; }; buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ]; From 72e7d87b01d52968ca018e9b54f433abfb7994dd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 7 Oct 2020 22:41:30 -0400 Subject: [PATCH 032/193] pythia: add hepmc3 support --- pkgs/development/libraries/physics/pythia/default.nix | 11 +++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 3105476c8429..53b2889a25c8 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }: +{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { pname = "pythia"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gli6zf8931i7kyminppisc9d0q69xxnalvhld5fgnkh4q82nz6d"; }; - buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ]; + buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; preConfigure = '' patchShebangs ./configure @@ -17,9 +17,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" - "--with-hepmc2=${hepmc2}" "--with-lhapdf6=${lhapdf}" - ]; + ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + "--with-hepmc3=${hepmc}" + ] else [ + "--with-hepmc2=${hepmc}" + ]); enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab0a1cf5c2f5..c026c8b678c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26755,7 +26755,9 @@ in nlojet = callPackage ../development/libraries/physics/nlojet { }; - pythia = callPackage ../development/libraries/physics/pythia { }; + pythia = callPackage ../development/libraries/physics/pythia { + hepmc = hepmc2; + }; rivet = callPackage ../development/libraries/physics/rivet { hepmc = hepmc2; From 6d755c6082e74df8dfe64ac3d6871799d83ad79a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Oct 2020 04:20:00 +0000 Subject: [PATCH 033/193] libck: enable on darwin --- pkgs/development/libraries/libck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/development/libraries/libck/default.nix index 934a250ac7cb..c4f38e96f3d2 100644 --- a/pkgs/development/libraries/libck/default.nix +++ b/pkgs/development/libraries/libck/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ asl20 bsd2 ]; homepage = "http://concurrencykit.org/"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ chessai ]; }; } From 5cd29482e43995db8761835dcf0c66933b342107 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 8 Oct 2020 08:58:41 +0300 Subject: [PATCH 034/193] munt: 2.4.0 -> 2.4.1 --- pkgs/applications/audio/munt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index bf9710fb17ee..2e072efe7991 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: let desktopItem = makeDesktopItem rec { @@ -9,14 +9,14 @@ let categories = "Audio;AudioVideo;"; }; in mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "munt"; src = fetchFromGitHub { owner = pname; repo = pname; rev = with stdenv.lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; - sha256 = "0521i7js5imlsxj6n7181w5szfjikam0k4vq1d2ilkqgcwrkg6ln"; + sha256 = "0bszhkbz24hhx32f973l6h5lkyn4lxhqrckiwmv765d1sba8n5bk"; }; postInstall = '' @@ -26,7 +26,7 @@ in mkDerivation rec { dontFixCmake = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase alsaLib ]; + buildInputs = [ qtbase alsaLib libjack2 ]; meta = with stdenv.lib; { description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; From 3cccf9088168fb71cfd66eaadfad136fa03bb05a Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 8 Oct 2020 09:56:31 +0200 Subject: [PATCH 035/193] lobster: unstable-2020-07-27 -> unstable-2020-10-04 --- pkgs/development/compilers/lobster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index f8d31f12cd45..62867f296d72 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "unstable-2020-07-27"; + version = "unstable-2020-10-04"; src = fetchFromGitHub { owner = "aardappel"; repo = pname; - rev = "9d68171494a79c83931426b624a0249a9c51882c"; - sha256 = "0d4gn71jym662i00rdmynv53ng1lgl81s5lw1sdddgn41wzs28dd"; + rev = "4c5e78f021ce9d06592fb3a66388e5e31fac1adb"; + sha256 = "1wnbc8kr1dyfs53nlcxah22ghphmazzrlcj9z47cgkdsj1qfy84x"; }; nativeBuildInputs = [ cmake ]; From 833b639d7bb8eeed2cd73197050b1d3398d9befc Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 8 Oct 2020 11:51:24 +0300 Subject: [PATCH 036/193] gpxsee: 7.32 -> 7.33 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index cc357917c850..5b34007ec408 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.32"; + version = "7.33"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0mcd6zv71laykg1208vkqmaxv1v12mqq47156gb78a5ww8paa0ka"; + sha256 = "1k4zl7knlpwxrpqk1axkmy8x12915z15h3q2sjnx3jcnx6qw73ja"; }; patches = (substituteAll { From 999fcba7ae8a557a751718672ba70628f27d4e18 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 8 Oct 2020 12:19:11 +0200 Subject: [PATCH 037/193] sudo: 1.8.31p1 -> 1.9.3p1 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index e05374575d24..3cc9039a8f03 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.8.31p1"; + version = "1.9.3p1"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "1n0mdmgcs92af34xxsnsh1arrngymhdmwd9srjgjbk65q7xzsg67"; + sha256 = "17mldsg5d08s23cskmjxfa81ibnqw3slgf3l4023j72ywi9xxffw"; }; prePatch = '' From eb9bcfe300b3bfcc611f04ee85bbeeffddc8bfa9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 8 Oct 2020 12:20:27 +0200 Subject: [PATCH 038/193] sudo: add the nixosTest to passthru.tests --- pkgs/tools/security/sudo/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 3cc9039a8f03..cf43b73eb7df 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, pam, groff, sssd +{ stdenv, fetchurl, coreutils, pam, groff, sssd, nixosTests , sendmailPath ? "/run/wrappers/bin/sendmail" , withInsults ? false , withSssd ? false @@ -61,6 +61,8 @@ stdenv.mkDerivation rec { rm -f $out/share/doc/sudo/ChangeLog ''; + passthru.tests = { inherit (nixosTests) sudo; }; + meta = { description = "A command to run commands as root"; From fb1b32adc861d28da63a2c7e0149b0348402418d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 8 Oct 2020 12:20:52 +0200 Subject: [PATCH 039/193] sudo: add myself as secondary maintainer --- pkgs/tools/security/sudo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index cf43b73eb7df..8ba10f66396d 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { license = "https://www.sudo.ws/sudo/license.html"; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco delroth ]; platforms = stdenv.lib.platforms.linux; }; From 98e6fdd6a6aa88fa65ca675cf09106e6d9a1045d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 7 Oct 2020 12:14:41 +0300 Subject: [PATCH 040/193] python3.pkgs.sip: 4.19.22 -> 4.19.24 --- pkgs/development/python-modules/sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 2bc8b70e4ca5..0027c1c0ba5f 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = sip-module; - version = "4.19.22"; + version = "4.19.24"; format = "other"; disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1"; + sha256 = "1ra15vb5i9gkg2vdvh16cq9x2mmzw1yi3xphxs8q34q1pf83gkgd"; }; configurePhase = '' From 0331c39d4e5b7a285b7336bc7c206ab125d32bc3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 7 Oct 2020 12:15:25 +0300 Subject: [PATCH 041/193] python3.pkgs.pyqt5: 5.14.2 -> 5.15.1 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ece9ad5b4a3f..5b971c48d785 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "PyQt5"; - version = "5.14.2"; + version = "5.15.1"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx"; + sha256 = "18grs2p698ihjgi8agksv6sajakciywyr29ihslqvl260a2np9yr"; }; outputs = [ "out" "dev" ]; From edac19f166f18c65a2aede398463b71f219ce3a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 7 Oct 2020 15:46:46 +0200 Subject: [PATCH 042/193] pythonPackages: use current qt5 instead of 5.14 --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 646c068ee701..ea195e505dc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10217,10 +10217,9 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { - # Overrides that apply to all Python interpreters + # Overrides that apply to all Python interpreters and their packages + # Generally, this should be avoided. pkgs = pkgs.extend (final: _: { - qt5 = final.qt514; - libsForQt5 = final.libsForQt514; }); }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; From 4bccbd9592fe3a824033f224a8b0c45785ba8768 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 7 Oct 2020 16:44:36 +0200 Subject: [PATCH 043/193] qutebrowser: minor fixup regarding use of qt 514 In https://github.com/NixOS/nixpkgs/commit/3fafb021256bc594cecd949b3edc5bc480fc721f the Qt version used by Qutebrowser was downgraded from 5.15 to 5.14. Let's be consistent by also setting qt514 and including a comment so one can trace why it is used. (Note that downgrade gave it the same Qt version as used by the Python packages set at the time, so in principle the override could be removed.) --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea195e505dc0..d24e35b67ea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23002,7 +23002,9 @@ in pkgs_ = pkgs.extend(_: prev: { pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { pkgs = oldAttrs.pkgs.extend(_: _: { - inherit (pkgs) qt5 libsForQt514; + # Use 5.14 https://github.com/NixOS/nixpkgs/commit/3fafb021256bc594cecd949b3edc5bc480fc721f + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; }); }); }); From 15bfdf8e51e25cee54a8711f0a47bc32fd160bda Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 7 Oct 2020 18:14:02 +0300 Subject: [PATCH 044/193] pythonPackages.pyqtwebengine: Apply qt5.14 patch only if needed Since we now use qt5.15 in all python modules (defaulting to the same qt5 used in all-packages.nix), That patch is not required, but it will be needed if qt5.14 is used if pythonInterpreters is overridden, which is likely to happen like it happend to qutebrowser for instance. See: https://github.com/NixOS/nixpkgs/pull/99956/commits/2667af4062ef0710b486fbae3108e0141aecb0fc --- .../development/python-modules/pyqtwebengine/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index ff511103e553..51506598ca18 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -7,6 +7,10 @@ let inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34; inherit (pyqt5) sip; + # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html + patches = lib.optional (lib.hasPrefix "5.14" pyqt5.version) + [ ./fix-build-with-qt-514.patch ] + ; in buildPythonPackage rec { pname = "PyQtWebEngine"; @@ -18,10 +22,7 @@ in buildPythonPackage rec { sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237"; }; - patches = [ - # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html - ./fix-build-with-qt-514.patch - ]; + inherit patches; outputs = [ "out" "dev" ]; From 1561163203d429ef362d39da99987309333baef2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 7 Oct 2020 17:58:32 +0200 Subject: [PATCH 045/193] carla: 2.1.1 -> 2.2.0 and use the default qt515 --- pkgs/applications/audio/carla/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 110507616616..8a566c249917 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g"; + sha256 = "B4xoRuNEW4Lz9haP8fqxOTcysGTNEXFOq9UXqUJLSFw="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d24e35b67ea1..90472db26527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19951,7 +19951,7 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; - carla = libsForQt514.callPackage ../applications/audio/carla { }; + carla = libsForQt5.callPackage ../applications/audio/carla { }; castor = callPackage ../applications/networking/browsers/castor { }; From 2d238fc6b0db021b2fef793419d7ad057bd0240c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 7 Oct 2020 18:20:18 +0300 Subject: [PATCH 046/193] calibre-py{2,3}: Use libsForQt5 - same is used in python-packages.nix --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90472db26527..ddf655dcc5b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19931,9 +19931,9 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre-py2 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; + calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; - calibre-py3 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; + calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; calibre = calibre-py3; From 198e025172ec7b96cce9057030b3b8fd3f061e45 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 01:47:20 +0300 Subject: [PATCH 047/193] retext: Fix build by using default qt5.15. Bonus: Set `makeWrapperArgs` instead of calling `wrapQtApp` - to prevent double wrapping. --- pkgs/applications/editors/retext/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 7752313b2a7e..c32e83157561 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -46,11 +46,13 @@ in python.pkgs.buildPythonApplication { propagatedBuildInputs = [ pythonEnv ]; postInstall = '' - wrapQtApp "$out/bin/retext" \ - --set ASPELL_CONF "dict-dir ${buildEnv { + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "--set" "ASPELL_CONF" "dict-dir ${buildEnv { name = "aspell-all-dicts"; paths = map (path: "${path}/lib/aspell") enchantAspellDicts; }}" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddf655dcc5b8..603d0828afc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6595,7 +6595,7 @@ in reredirect = callPackage ../tools/misc/reredirect { }; - retext = libsForQt514.callPackage ../applications/editors/retext { }; + retext = libsForQt5.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; From 5cbf0c1beb7307151809ed3cef2f43ef69324191 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 02:08:56 +0300 Subject: [PATCH 048/193] ffado: Use libsForQt5 (not 514) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 603d0828afc5..c5335fb17234 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17512,7 +17512,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt514.callPackage ../os-specific/linux/ffado { + ffado = libsForQt5.callPackage ../os-specific/linux/ffado { inherit (pkgs.linuxPackages) kernel; }; libffado = ffado; From f3e5c93d03097b7d87d43fcceda330306ed4bc04 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 10:34:08 +0300 Subject: [PATCH 049/193] cura, curaLulzbot: Use qt5.15 Since now Python packages use qt5.15, this should too. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5335fb17234..30da6557018a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23325,11 +23325,11 @@ in curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = libsForQt514.callPackage ../applications/misc/cura { }; + cura = libsForQt5.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = libsForQt514.callPackage ../applications/misc/cura/lulzbot/default.nix { }; + curaLulzbot = libsForQt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; From 2edd4edcb9fd581ed3e545b4b885683af9df755f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 10:57:05 +0300 Subject: [PATCH 050/193] electron-cash: 4.1.0 -> 4.1.1 Remove included upstream patches. Use qt5.15 (#99956). Spare double wrapping by using `makeWrapperArgs+=()`. --- .../misc/electron-cash/default.nix | 21 +++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index a6ba3444dcdb..12362823cc50 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2"; + sha256 = "1fllz2s20lg4hrppzmnlgjy9mrq7gaq66l2apb3vz1avzvsjw3gm"; }; propagatedBuildInputs = with python3Packages; [ @@ -36,15 +36,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - patches = [ - # Patch a failed test, this can be removed in next version - (fetchpatch { - url = - "https://github.com/Electron-Cash/Electron-Cash/commit/1a9122d59be0c351b14c174a60880c2e927e6168.patch"; - sha256 = "0zw629ypn9jxb1y124s3dkbbf2q3wj1i97j16lzdxpjy3sk0p5hk"; - }) - ]; - postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "qdarkstyle==2.6.8" "qdarkstyle<3" @@ -70,9 +61,11 @@ python3Packages.buildPythonApplication rec { # Electron Cash was unable to find the secp256k1 library on this system. # Elliptic curve cryptography operations will be performed in slow # Python-only mode. - postFixup = '' - wrapQtApp $out/bin/electron-cash \ - --prefix LD_LIBRARY_PATH : ${secp256k1}/lib + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "--prefix" "LD_LIBRARY_PATH" ":" "${secp256k1}/lib" + ) ''; doInstallCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30da6557018a..f4ec6ed8dc4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20308,7 +20308,7 @@ in ekho = callPackage ../applications/audio/ekho { }; - electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { }; + electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; From cd5b560541477433cd87777171e5123f352564da Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 11:31:39 +0300 Subject: [PATCH 051/193] python3.pkgs.nose-timer: init at 1.0.0 --- .../python-modules/nose-timer/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/nose-timer/default.nix diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix new file mode 100644 index 000000000000..c93f5bda9838 --- /dev/null +++ b/pkgs/development/python-modules/nose-timer/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi, lib, nose, }: + +buildPythonPackage rec { + pname = "nose-timer"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09hwjwbczi06bfqgiylb2yxs5h88jdl26zi1fdqxdzvamrkksf2c"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = with lib; { + homepage = "https://github.com/mahmoudimus/nose-timer"; + license = licenses.mit; + description = "A timer plugin for nosetests (how much time does every test take?)"; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d8980eb8add..c334f9ab1a3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4050,6 +4050,8 @@ in { nose-focus = callPackage ../development/python-modules/nose-focus { }; + nose-timer = callPackage ../development/python-modules/nose-timer { }; + nosejs = callPackage ../development/python-modules/nosejs { }; nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; From 36b7e89f199a81026caf98a1cabc4940d57cde9e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 12:20:06 +0300 Subject: [PATCH 052/193] python3.pkgs.androguard: rewrite Add an optional withGui flag to turn off gui as most of the time it's not needed since this is a python library. Use a GitHub tarball to optionally enable tests, currently disabled by default, but next release' tests should pass (tested the beta release tag). Wrap qt apps properly, without double wrapping, if gui is enabled. --- .../python-modules/androguard/default.nix | 70 +++++++++++++++++-- 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index c71227811111..ec19f4730a55 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -1,13 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, future, networkx, pygments, lxml, colorama, matplotlib, - asn1crypto, click, pydot, ipython, pyqt5, pyperclip }: +{ lib +, fetchpatch +, buildPythonPackage +, fetchFromGitHub +, future +, networkx +, pygments +, lxml +, colorama +, matplotlib +, asn1crypto +, click +, pydot +, ipython +, pyqt5 +, pyperclip +, nose +, nose-timer +, mock +, python_magic +, codecov +, coverage +, qt5 +# This is usually used as a library, and it'd be a shame to force the gui +# libraries to the closure if gui is not desired. +, withGui ? false +# Tests take a very long time, and currently fail, but next release' tests +# shouldn't fail +, doCheck ? false +}: buildPythonPackage rec { version = "3.3.5"; pname = "androguard"; - src = fetchPypi { - inherit pname version; - sha256 = "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2"; + # No tests in pypi tarball + src = fetchFromGitHub { + repo = pname; + owner = pname; + rev = "v${version}"; + sha256 = "0zc8m1xnkmhz2v12ddn47q0c01p3sbna2v5npfxhcp88szswlr9y"; }; propagatedBuildInputs = [ @@ -21,12 +52,37 @@ buildPythonPackage rec { click pydot ipython + ] ++ lib.optionals withGui [ pyqt5 pyperclip ]; - # Tests are not shipped on PyPI. - doCheck = false; + checkInputs = [ + pyqt5 + pyperclip + nose + nose-timer + codecov + coverage + mock + python_magic + ]; + inherit doCheck; + + nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ]; + + # If it won't be verbose, you'll see nothing going on for a long time. + checkPhase = '' + runHook preCheck + + nosetests --verbosity=3 + + runHook postCheck + ''; + + preFixup = lib.optionalString withGui '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; meta = { description = "Tool and python library to interact with Android Files"; From 56d047f0b0a618e134d4a5d78268fa6e7aaf695d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 14:52:22 +0300 Subject: [PATCH 053/193] dupeguru: Don't override qt5 version. Since Python's pyqt5 is using qt5.15, it should use the same version as well. --- pkgs/applications/misc/dupeguru/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 0e7155f374d1..6bcc377d0f34 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -40,15 +40,15 @@ python3Packages.buildPythonApplication rec { # Avoid double wrapping Python programs. dontWrapQtApps = true; + # TODO: A bug in python wrapper + # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916 preFixup = '' - # TODO: A bug in python wrapper - # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916 makeWrapperArgs="''${qtWrapperArgs[@]}" ''; + # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py + # so wrapPythonPrograms hook does not handle it automatically. postFixup = '' - # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py - # so wrapPythonPrograms hook does not handle it automatically. wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4ec6ed8dc4e..54ee56c7b1d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -278,7 +278,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; }; + dupeguru = callPackage ../applications/misc/dupeguru { }; dump1090 = callPackage ../applications/radio/dump1090 { }; From bc0113e2c2647419e0adf66e38263f9826b6ae94 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 14:57:08 +0300 Subject: [PATCH 054/193] electrum-ltc: Use default qt5.15. The same as used by pyqt5 (#99956). Also: Fix double wrapping. --- pkgs/applications/misc/electrum/ltc.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 4bcb66f48b92..2c6fb39fa433 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -36,8 +36,8 @@ python3Packages.buildPythonApplication rec { sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; - postFixup = '' - wrapQtApp $out/bin/electrum-ltc + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; checkPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54ee56c7b1d6..f66d1ff3db27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20314,7 +20314,7 @@ in electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = libsForQt514.callPackage ../applications/misc/electrum/ltc.nix { }; + electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; From 16c2b3c6143462c25dc72751f4f2b1a4f0380a45 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 14:59:26 +0300 Subject: [PATCH 055/193] cq-editor: Use qt5.15 completely. Don't mix qt5.14 and pyqt5 which uses qt5.15 (#99956). --- pkgs/applications/graphics/cq-editor/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index 036edf80ab90..cf94f4fa32d1 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -2,6 +2,7 @@ , mkDerivationWith , python3Packages , fetchFromGitHub +, wrapQtAppsHook }: mkDerivationWith python3Packages.buildPythonApplication rec { @@ -27,8 +28,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec { requests ]; - postFixup = '' - wrapQtApp "$out/bin/cq-editor" + nativeBuildInputs = [ wrapQtAppsHook ]; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; checkInputs = with python3Packages; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f66d1ff3db27..f4409fff16f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20098,7 +20098,7 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor { + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; From 3d8267ee883ab2627070da21df288614112b9000 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 15:05:02 +0300 Subject: [PATCH 056/193] flent: Use qt5.15 just like pyqt5 use in it (#99956) Bonus: Spare double wrapping. --- pkgs/applications/networking/flent/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 19f813e5c758..319630ceff35 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -25,10 +25,8 @@ buildPythonApplication rec { xvfb-run -s '-screen 0 800x600x24' ./test-runner ''; - postInstall = '' - for program in $out/bin/*; do - wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH - done + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4409fff16f0..082ac23f2150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3703,7 +3703,7 @@ in flashrom = callPackage ../tools/misc/flashrom { }; - flent = python3Packages.callPackage ../applications/networking/flent { qt5 = qt514; }; + flent = python3Packages.callPackage ../applications/networking/flent { }; flpsed = callPackage ../applications/editors/flpsed { }; From 62738d495cb7b6445e9959b56a9638b8dbdcdac2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 15:23:06 +0300 Subject: [PATCH 057/193] friture: Use qt5.15 just like pyqt5 Don't double wrap executables. --- pkgs/applications/audio/friture/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index b93ad14f55ee..e4bd79a08e31 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -32,9 +32,8 @@ in py.buildPythonApplication rec { ./unlock_constraints.patch ]; - postFixup = '' - wrapQtApp $out/bin/friture - wrapQtApp $out/bin/.friture-wrapped + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 082ac23f2150..4dd76312e44c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20836,7 +20836,7 @@ in freerdpUnstable = freerdp; - friture = libsForQt514.callPackage ../applications/audio/friture { }; + friture = libsForQt5.callPackage ../applications/audio/friture { }; fte = callPackage ../applications/editors/fte { }; From f4b8c8f1df3ad1a155dbb85b6ec4100d5b4d9527 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 16:08:40 +0300 Subject: [PATCH 058/193] git-annex-metadata-gui: fix qt wrapping Wrap application with wrapQtAppsHook and no double wrapping. --- .../git-and-tools/git-annex-metadata-gui/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index ad07a3dba3c8..cb0103df227a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }: +{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: buildPythonApplication rec { pname = "git-annex-metadata-gui"; @@ -15,6 +15,12 @@ buildPythonApplication rec { substituteInPlace setup.py --replace "'PyQt5', " "" ''; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; meta = with stdenv.lib; { From 244ef6c24b93197cd838462fd4987b40f9c3d3c1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 16:34:36 +0300 Subject: [PATCH 059/193] freecad: Use libsForQt5 and not qt5.14 (#99956). --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dd76312e44c..1580bf01bc5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20802,10 +20802,10 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = libsForQt514.callPackage ../applications/graphics/freecad { + freecad = libsForQt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; - freecadStable = libsForQt514.callPackage ../applications/graphics/freecad/stable.nix { + freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix { mpi = openmpi; opencascade-occt = opencascade-occt730; python3Packages = python37Packages; From faedc6a226862328514a6537409e8fe1bb590217 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 17:55:58 +0300 Subject: [PATCH 060/193] libsForQt5.pulseaudio-qt: init at 1.2.0 --- .../libraries/pulseaudio-qt/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/pulseaudio-qt/default.nix diff --git a/pkgs/development/libraries/pulseaudio-qt/default.nix b/pkgs/development/libraries/pulseaudio-qt/default.nix new file mode 100644 index 000000000000..03d656f91fae --- /dev/null +++ b/pkgs/development/libraries/pulseaudio-qt/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation +, lib +, fetchurl +, cmake +, extra-cmake-modules +, pkg-config +, pulseaudio +}: + +mkDerivation rec { + pname = "pulseaudio-qt"; + version = "1.2.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${lib.versions.majorMinor version}.tar.xz"; + sha256 = "1i0ql68kxv9jxs24rsd3s7jhjid3f2fq56fj4wbp16zb4wd14099"; + }; + + buildInputs = [ + pulseaudio + ]; + + nativeBuildInputs = [ + pkg-config + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "Pulseaudio bindings for Qt"; + homepage = "https://invent.kde.org/libraries/pulseaudio-qt"; + license = with licenses; [ lgpl2 ]; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1580bf01bc5c..479f12c62c4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15110,6 +15110,8 @@ in suffix = "qt5"; }; + pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; + qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; qmltermwidget = callPackage ../development/libraries/qmltermwidget { From 8b16b8cb561e5cc401102312eaa0a5a3f7f43ebc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 17:57:57 +0300 Subject: [PATCH 061/193] libsForQt5.kpeoplevcard: init at 0.1 --- .../libraries/kpeoplevcard/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/kpeoplevcard/default.nix diff --git a/pkgs/development/libraries/kpeoplevcard/default.nix b/pkgs/development/libraries/kpeoplevcard/default.nix new file mode 100644 index 000000000000..c405532e4363 --- /dev/null +++ b/pkgs/development/libraries/kpeoplevcard/default.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, lib +, fetchurl +, cmake +, extra-cmake-modules +, pkg-config +, kcoreaddons +, kpeople +, kcontacts +}: + +mkDerivation rec { + pname = "kpeoplevcard"; + version = "0.1"; + + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd"; + }; + + buildInputs = [ + kcoreaddons + kpeople + kcontacts + ]; + + nativeBuildInputs = [ + pkg-config + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "Pulseaudio bindings for Qt"; + homepage = "KPeople VCard Support"; + license = with licenses; [ lgpl2 ]; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 479f12c62c4a..5fce59899620 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15066,6 +15066,8 @@ in kproperty = callPackage ../development/libraries/kproperty { }; + kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { }; + kreport = callPackage ../development/libraries/kreport { }; libcommuni = callPackage ../development/libraries/libcommuni { }; From 883b21debe5e223038715917a527395a4f794bdb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 18:21:40 +0300 Subject: [PATCH 062/193] vorta: Fix double wrapping --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 3c6a9587a656..fc7e6c0fc359 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -28,8 +28,8 @@ buildPythonApplication rec { # QT setup in tests broken. doCheck = false; - postFixup = '' - wrapQtApp $out/bin/vorta + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { From 2aff7cf32c7ed5ca0448b502f37682fb65e31ceb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 18:26:50 +0300 Subject: [PATCH 063/193] krita: Use qt5.15 - same as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fce59899620..8e3a5eca9bf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21639,7 +21639,7 @@ in kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt514.callPackage ../applications/graphics/krita { + krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; }; From 32a362bb61e8e5a3cce5618fd0b63dfe99009e5e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 18:27:53 +0300 Subject: [PATCH 064/193] gmic-qt-krita: Use qt5.15 - as used by `krita` (#99956) --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e3a5eca9bf3..8636ff3c36fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2061,8 +2061,10 @@ in gmic = callPackage ../tools/graphics/gmic { }; - gmic-qt = libsForQt514.callPackage ../tools/graphics/gmic-qt { }; + gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; + # NOTE: If overriding qt version, krita needs to use the same qt version as + # well. gmic-qt-krita = gmic-qt.override { variant = "krita"; }; From aa20203d3cf25c1a83728aff877578166f65cd9c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:01:14 +0300 Subject: [PATCH 065/193] inkcut: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8636ff3c36fc..d0d975753c5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21399,7 +21399,7 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; - inkcut = libsForQt514.callPackage ../applications/misc/inkcut { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; From 36caf7ea26a6b02edb121000dff54105ee6ae2ce Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:03:57 +0300 Subject: [PATCH 066/193] kcc: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0d975753c5b..8a1dfe85b052 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11218,7 +11218,7 @@ in kati = callPackage ../development/tools/build-managers/kati { }; - kcc = libsForQt514.callPackage ../applications/graphics/kcc { }; + kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; From 9abf6cb4591db7e5879ccc441159b6ee1e25639d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:05:24 +0300 Subject: [PATCH 067/193] kmymoney: Use qt5.15, as python weboob in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a1dfe85b052..639ab0b15d2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21626,7 +21626,7 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { inherit (kdeApplications) kidentitymanagement; inherit (kdeFrameworks) kdewebkit; }; From dfec61ea28c81cd3388cff81c88116f0bde1de8c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:08:58 +0300 Subject: [PATCH 068/193] leo-editor: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 639ab0b15d2f..a7f37cb8dee4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21723,7 +21723,7 @@ in legit = gitAndTools.legit; - leo-editor = libsForQt514.callPackage ../applications/editors/leo-editor { }; + leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; From a9a2cc99b982a212198c47902f096f3c4e1957de Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:32:46 +0300 Subject: [PATCH 069/193] manuskript: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7f37cb8dee4..1d6b69efda10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20936,7 +20936,7 @@ in opencv = python37Packages.opencv3; }; - manuskript = libsForQt514.callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; From 8b8febd15f3d26ae5931be854feb8cf2cf23c4c0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:38:27 +0300 Subject: [PATCH 070/193] qarte: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d6b69efda10..57e0d1d34d6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6493,7 +6493,7 @@ in jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - qarte = libsForQt514.callPackage ../applications/video/qarte { }; + qarte = libsForQt5.callPackage ../applications/video/qarte { }; qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; From 0cbd755852a2890ce2e6b6b6fd7c64686a59519b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:39:30 +0300 Subject: [PATCH 071/193] qnotero: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57e0d1d34d6f..f2eec34a546d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22910,7 +22910,7 @@ in qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt514.callPackage ../applications/office/qnotero { }; + qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; qrcode = callPackage ../tools/graphics/qrcode {}; From 38d517f6342879bb477f00375dda01d96540008e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:41:02 +0300 Subject: [PATCH 072/193] qpaeq: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2eec34a546d..e8f900ede10a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16766,7 +16766,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - qpaeq = libsForQt514.callPackage ../servers/pulseaudio/qpaeq.nix { }; + qpaeq = libsForQt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; pulseaudioFull = pulseaudio.override { x11Support = true; From 1fa76554c8d9e0e2445f4d34ffc93e241341eecb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:42:36 +0300 Subject: [PATCH 073/193] rapid-photo-downloader: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8f900ede10a..0e7d2537cd39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23036,7 +23036,7 @@ in rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; }; - rapid-photo-downloader = libsForQt514.callPackage ../applications/graphics/rapid-photo-downloader { }; + rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; From 179986f378ba6d145fe3bd4c1c011bab1537760b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 19:49:07 +0300 Subject: [PATCH 074/193] webmacs: Use qt5.15, as pyqt5 in it (#99956) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e7d2537cd39..e3b888ba238a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24055,7 +24055,7 @@ in webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; - webmacs = libsForQt514.callPackage ../applications/networking/browsers/webmacs {}; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; From ae37cb36107f573dca458c3195637d4351d1aa61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 18:36:42 +0200 Subject: [PATCH 075/193] qscintilla: 2.11.2 -> 2.11.5, fix license --- pkgs/development/libraries/qscintilla/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index abaeba51b451..19aebd715d6b 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -6,17 +6,17 @@ let pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; - version = "2.11.2"; + version = "2.11.5"; in stdenv.mkDerivation rec { inherit pname version; src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"; - sha256 = "18glb2v07mwfz6p8qmwhzcaaczyc36x3gn9wx8ndm7q6d93xr6q2"; + url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; + sha256 = "k2Hib9f7e1gZp+uSxcGIChjem9PtndLrAI5XOIaWcWs="; }; - sourceRoot = "QScintilla_gpl-${version}/Qt4Qt5"; + sourceRoot = "QScintilla-${version}/Qt4Qt5"; buildInputs = [ (if withQt5 then qtbase else qt4) ]; @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { background colours and multiple fonts. ''; homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; - license = with licenses; [ gpl2 gpl3 ]; # and commercial + license = with licenses; [ gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; From 084c4da16a07021209d766baa2d7857ef1cb07a2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 18:37:01 +0200 Subject: [PATCH 076/193] qgis: 3.10.9 -> 3.10.10 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 130c0af6ee20..da66b0d9d252 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.9"; + version = "3.10.10"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6"; + sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0="; }; passthru = { From 93111343dc30d9418008232ab970cbd33471346b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 18:37:25 +0200 Subject: [PATCH 077/193] qgis: consistently use qt 5.14 --- pkgs/top-level/all-packages.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3b888ba238a..bcaaff86b9eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22878,7 +22878,18 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { + # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit + # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b + qgis-unwrapped = let + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }); + }); + }); + in pkgs_.libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; }; From 64388b5b55c15debc89a48987c18d01b8c316df4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 19:00:34 +0200 Subject: [PATCH 078/193] cadence: use qt 5.14 consistently --- pkgs/top-level/all-packages.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcaaff86b9eb..4fd776fab415 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19741,7 +19741,17 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = libsForQt514.callPackage ../applications/audio/cadence { }; + cadence = let + # Use Qt 5.14 consistently + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }); + }); + }); + in pkgs_.libsForQt514.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; From b9af2d2259f265d70997177da618bccd630968bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 19:06:35 +0200 Subject: [PATCH 079/193] dupeguru: mark as broken --- pkgs/applications/misc/dupeguru/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 6bcc377d0f34..3347567b88b4 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -58,5 +58,6 @@ python3Packages.buildPythonApplication rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.novoxudonoser ]; + broken = true; # mv: cannot stat '_block.cpython-38m*.so': No such file or directory }; } From 902c567974a3af0795c2efce369dc0be0edea34b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 19:13:01 +0200 Subject: [PATCH 080/193] qutebrowser: use current qt (5.15) again instead of 5.14 For security reasons [1] we upgrade to the latest Qt, despite this breaking a feature, which is why 5.14 was forced earlier. [1] https://github.com/NixOS/nixpkgs/pull/99456#issuecomment-703523943 --- pkgs/top-level/all-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd776fab415..0e3838654867 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23025,17 +23025,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = let - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - # Use 5.14 https://github.com/NixOS/nixpkgs/commit/3fafb021256bc594cecd949b3edc5bc480fc721f - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; qxw = callPackage ../applications/editors/qxw {}; From 5d4117bd12bf3e197daf191c38c8e5d7d1a9e924 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 19:13:19 +0200 Subject: [PATCH 081/193] openshot-qt: consustently use qt 5.14 --- pkgs/top-level/all-packages.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e3838654867..49ed806c8076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9266,7 +9266,18 @@ in graalvm8-ee graalvm11-ee; - openshot-qt = libsForQt514.callPackage ../applications/video/openshot-qt { }; + openshot-qt = let + # Cannot use a newer Qt (5.15) version because it requires qtwebkit + # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }); + }); + }); + in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; From c0d5cf499321ef5348876d0e21d9397e2e819f3a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 19:26:35 +0200 Subject: [PATCH 082/193] puddletag: mark broken --- pkgs/applications/audio/puddletag/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 47ea078c4b2d..56fcdcc94cd2 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -30,5 +30,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; + broken = true; # Needs Qt wrapping }; } From 063f1d73019885c39156df56c4ab46fcf1095a86 Mon Sep 17 00:00:00 2001 From: Timothy Stott Date: Wed, 30 Sep 2020 21:20:18 +0100 Subject: [PATCH 083/193] terraform-providers: store providers as JSON --- .../cluster/terraform-providers/data.nix | 1163 ----------------- .../cluster/terraform-providers/default.nix | 2 +- .../terraform-providers/providers.json | 1017 ++++++++++++++ 3 files changed, 1018 insertions(+), 1164 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/data.nix create mode 100644 pkgs/applications/networking/cluster/terraform-providers/providers.json diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix deleted file mode 100644 index 4ffe4305441e..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ /dev/null @@ -1,1163 +0,0 @@ -# Generated with ./update-all -{ - aci = - { - owner = "terraform-providers"; - repo = "terraform-provider-aci"; - rev = "v0.2.3"; - version = "0.2.3"; - sha256 = "0sk0pp178w03fhsb65b9mpim1l4wqfnv9r9x64kiapjnvfb1rz3j"; - }; - acme = - { - owner = "terraform-providers"; - repo = "terraform-provider-acme"; - rev = "v1.5.0"; - version = "1.5.0"; - sha256 = "1h53bgflchavnn4laf801d920bsgqqg0ph4slnf7y1fpb0mz5vdv"; - }; - akamai = - { - owner = "terraform-providers"; - repo = "terraform-provider-akamai"; - rev = "v0.7.1"; - version = "0.7.1"; - sha256 = "0mg81147yz0m24xqljpw6v0ayhvb4fwf6qwaj7ii34hy2gjwv405"; - }; - alicloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-alicloud"; - rev = "v1.86.0"; - version = "1.86.0"; - sha256 = "1hbv9ah7fd173sapwgsbg7790piwxw9zx90wfj5vz5b96ggbg28d"; - }; - archive = - { - owner = "hashicorp"; - repo = "terraform-provider-archive"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "1hwg8ai4bvsmgnl669608lr4v940xnyig1xshps490f47c8hqy6y"; - }; - arukas = - { - owner = "terraform-providers"; - repo = "terraform-provider-arukas"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "1akl9fzgm5qv01vz18xjzyqjnlxw699qq4x8vr96j16l1zf10h99"; - }; - auth0 = - { - owner = "terraform-providers"; - repo = "terraform-provider-auth0"; - rev = "v0.11.0"; - version = "0.11.0"; - sha256 = "1dkcgzvvwmw5z5q4146jk0gj5b1zrv51vvkhhjd8qh9ipinipn97"; - }; - aviatrix = - { - owner = "terraform-providers"; - repo = "terraform-provider-aviatrix"; - rev = "v2.14.1"; - version = "2.14.1"; - sha256 = "137z7fgy5gp9n9fdvllyjh3nkbalrs2giqljfldbllymhvrv7xgr"; - }; - avi = - { - owner = "terraform-providers"; - repo = "terraform-provider-avi"; - rev = "v0.2.2"; - version = "0.2.2"; - sha256 = "0dgpjg6iw21vfcn4i0x6x1l329a09wrd2jwghrjigwlq68wd835d"; - }; - aws = - { - owner = "terraform-providers"; - repo = "terraform-provider-aws"; - rev = "v2.65.0"; - version = "2.65.0"; - sha256 = "005vs1qd6payicxldc9lr4w6kzr58xw9b930j52g1q7hlddl5mbb"; - }; - azuread = - { - owner = "terraform-providers"; - repo = "terraform-provider-azuread"; - rev = "v0.10.0"; - version = "0.10.0"; - sha256 = "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3"; - }; - azurerm = - { - owner = "terraform-providers"; - repo = "terraform-provider-azurerm"; - rev = "v2.13.0"; - version = "2.13.0"; - sha256 = "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7"; - }; - azurestack = - { - owner = "terraform-providers"; - repo = "terraform-provider-azurestack"; - rev = "v0.9.0"; - version = "0.9.0"; - sha256 = "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324"; - }; - baiducloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-baiducloud"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "1s2vk4vjni5nc50pdw60pm0grrf835xy551i6d4cmfxkkpqx3f6f"; - }; - bigip = - { - owner = "terraform-providers"; - repo = "terraform-provider-bigip"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "0z0l4j8sn8yf6kw5sbyhp6s0046f738lsm650skcspqa5f63mbd9"; - }; - bitbucket = - { - owner = "terraform-providers"; - repo = "terraform-provider-bitbucket"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "11n4wpvmaab164g6k077n9dbdbhd5lwl7pxpha5492ks468nd95b"; - }; - brightbox = - { - owner = "terraform-providers"; - repo = "terraform-provider-brightbox"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "127l1ic70fkcqr0h23qhbpl1j2mzp44p9593x8jl936xz4ll8l70"; - }; - checkpoint = - { - owner = "terraform-providers"; - repo = "terraform-provider-checkpoint"; - rev = "v1.0.2"; - version = "1.0.2"; - sha256 = "0zypjcg1z8fkz31lfhysxx42lpw8ak4aqgdis6rxzqbnkk491fjp"; - }; - chef = - { - owner = "terraform-providers"; - repo = "terraform-provider-chef"; - rev = "v0.2.0"; - version = "0.2.0"; - sha256 = "0ihn4706fflmf0585w22l7arzxsa9biq4cgh8nlhlp5y0zy934ns"; - }; - cherryservers = - { - owner = "terraform-providers"; - repo = "terraform-provider-cherryservers"; - rev = "v1.0.0"; - version = "1.0.0"; - sha256 = "1z6ai6q8aw38kiy8x13rp0dsvb4jk40cv8pk5c069q15m4jab8lh"; - }; - ciscoasa = - { - owner = "terraform-providers"; - repo = "terraform-provider-ciscoasa"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "033pgy42qwjpmjyzylpml7sfzd6dvvybs56cid1f6sm4ykmxbal7"; - }; - clc = - { - owner = "terraform-providers"; - repo = "terraform-provider-clc"; - rev = "v0.1.0"; - version = "0.1.0"; - sha256 = "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf"; - }; - cloudflare = - { - owner = "terraform-providers"; - repo = "terraform-provider-cloudflare"; - rev = "v2.7.0"; - version = "2.7.0"; - sha256 = "1r18lxhfi2sd42ja4bzxbkf5bli8iljrpqbgdcn1a7rcf44vnxa2"; - }; - cloudinit = - { - owner = "hashicorp"; - repo = "terraform-provider-cloudinit"; - rev = "v1.0.0"; - version = "1.0.0"; - sha256 = "0i926f4xkfydd2bxmim69xrvi9ymn1vrc66zl117axzsmy9200zx"; - }; - cloudscale = - { - owner = "terraform-providers"; - repo = "terraform-provider-cloudscale"; - rev = "v2.1.2"; - version = "2.1.2"; - sha256 = "052pa17a77fkmhvygfgmpz87xlc08qvz1apzc2scg2449xfdv7zb"; - }; - cloudstack = - { - owner = "terraform-providers"; - repo = "terraform-provider-cloudstack"; - rev = "v0.3.0"; - version = "0.3.0"; - sha256 = "0zmyww6z3j839ydlmv254hr8gcsixng4lcvmiwkhxb3hj1nw8hcw"; - }; - cobbler = - { - owner = "terraform-providers"; - repo = "terraform-provider-cobbler"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "08ljqibfi6alpvv8f7pzvjl2k4w6br6g6ac755x4xw4ycrr24xw9"; - }; - cohesity = - { - owner = "terraform-providers"; - repo = "terraform-provider-cohesity"; - rev = "v0.1.0"; - version = "0.1.0"; - sha256 = "1yifipjf51n8q9xyqcmc4zjpszmpyzb330f4zas81hahjml78hgx"; - }; - constellix = - { - owner = "terraform-providers"; - repo = "terraform-provider-constellix"; - rev = "v0.1.0"; - version = "0.1.0"; - sha256 = "14y0v8ilbrjj0aymrw50fkz2mihnwyv83z8a9f8dh399s8l624w1"; - }; - consul = - { - owner = "terraform-providers"; - repo = "terraform-provider-consul"; - rev = "v2.8.0"; - version = "2.8.0"; - sha256 = "1brd0fp9ksc3x8cygxm0k2q1sh4v5x89298pnidg6xirn41lvcr4"; - }; - ct = - { - owner = "poseidon"; - repo = "terraform-provider-ct"; - rev = "v0.6.1"; - version = "0.6.1"; - sha256 = "0hh3hvi8lwb0h8x9viz5p991w94gn7354nw95b51rdmir9qi2x89"; - }; - datadog = - { - owner = "terraform-providers"; - repo = "terraform-provider-datadog"; - rev = "v2.7.0"; - version = "2.7.0"; - sha256 = "0cq11cjcm2nlszqhsrj425mk8dp0h5ljrrn7jplrbffp8g6wvadd"; - }; - digitalocean = - { - owner = "terraform-providers"; - repo = "terraform-provider-digitalocean"; - rev = "v1.19.0"; - version = "1.19.0"; - sha256 = "0plfkwkfb19f7bzky4jfa2kmkqvbah02c6j6applsd3jyiawpbgy"; - }; - dme = - { - owner = "terraform-providers"; - repo = "terraform-provider-dme"; - rev = "v0.1.0"; - version = "0.1.0"; - sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv"; - }; - dnsimple = - { - owner = "terraform-providers"; - repo = "terraform-provider-dnsimple"; - rev = "v0.4.0"; - version = "0.4.0"; - sha256 = "1f1cpfa30frghp4yxp9n313yaf2mm1hnjq4kzmn6n9210prab9h1"; - }; - dns = - { - owner = "hashicorp"; - repo = "terraform-provider-dns"; - rev = "v2.2.0"; - version = "2.2.0"; - sha256 = "11xdxj6hfclaq9glbh14nihmrsk220crm9ld8bdv77w0bppmrrch"; - }; - docker = - { - owner = "terraform-providers"; - repo = "terraform-provider-docker"; - rev = "v2.7.1"; - version = "2.7.1"; - sha256 = "1jqnlc3dfy354yjdkj8iyxv0vamyxgmwxmhjim11alwzwjafbv9s"; - }; - dome9 = - { - owner = "terraform-providers"; - repo = "terraform-provider-dome9"; - rev = "v1.19.0"; - version = "1.19.0"; - sha256 = "190q74aaa1v7n7pqcri8kib0g0d4njf9dzm3cygyzmsjs3pxj1lc"; - }; - dyn = - { - owner = "terraform-providers"; - repo = "terraform-provider-dyn"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48"; - }; - exoscale = - { - owner = "terraform-providers"; - repo = "terraform-provider-exoscale"; - rev = "v0.16.2"; - version = "0.16.2"; - sha256 = "102z4v3shk0as76v90151j4c6p93wy16m1hzzk1yp50dlc8ffsks"; - }; - external = - { - owner = "hashicorp"; - repo = "terraform-provider-external"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "1kx28bffhd1pg3m0cbldclc8l9zic16mqrk7gybcls9vyds5gbvc"; - }; - fastly = - { - owner = "terraform-providers"; - repo = "terraform-provider-fastly"; - rev = "v0.16.1"; - version = "0.16.1"; - sha256 = "1pjrcw03a86xgkzcx778f7kk79svv8csy05b7qi0m5x77zy4pws7"; - }; - flexibleengine = - { - owner = "terraform-providers"; - repo = "terraform-provider-flexibleengine"; - rev = "v1.12.1"; - version = "1.12.1"; - sha256 = "0klxi40dd3a4dp7gjsjjwh6zv2m94hh6mk5m9g0dyhvn0r28w5j2"; - }; - fortios = - { - owner = "terraform-providers"; - repo = "terraform-provider-fortios"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "0sqp23pyldxjkfw33xn5l5fqs4vn00kkfhy9wnl690wn0cwmldbx"; - }; - genymotion = - { - owner = "terraform-providers"; - repo = "terraform-provider-genymotion"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "02jpr3cm7rrf810c69sr6lcxzvxpnf7icc5z80gnvg67wwfg4ph4"; - }; - github = - { - owner = "terraform-providers"; - repo = "terraform-provider-github"; - rev = "v2.8.0"; - version = "2.8.0"; - sha256 = "11aw9wqnayl786hvbgnb9ijijaipaggj18vkn5y0kcj2v4dwq4wg"; - }; - gitlab = - { - owner = "terraform-providers"; - repo = "terraform-provider-gitlab"; - rev = "v2.9.0"; - version = "2.9.0"; - sha256 = "0l0b69nxxskpsylcgli2sm9qq7p4hw96dsri24w38shhnxmpysbb"; - }; - google-beta = - { - owner = "terraform-providers"; - repo = "terraform-provider-google-beta"; - rev = "v3.18.0"; - version = "3.18.0"; - sha256 = "1rsaqrgr6ddgx1pala83y70dk32s0mvf6vi877awmimxjzsa1l4r"; - }; - google = - { - owner = "terraform-providers"; - repo = "terraform-provider-google"; - rev = "v3.18.0"; - version = "3.18.0"; - sha256 = "18cxl1qw1wyvzvhgjm1s3c19hbi5z9s6mipgazhrac70myw8dmy7"; - }; - grafana = - { - owner = "terraform-providers"; - repo = "terraform-provider-grafana"; - rev = "v1.5.0"; - version = "1.5.0"; - sha256 = "0zy3bqgpxymp2zygaxzllk1ysdankwxa1sy1djfgr4fs2nlggkwi"; - }; - gridscale = - { - owner = "terraform-providers"; - repo = "terraform-provider-gridscale"; - rev = "v1.6.0"; - version = "1.6.0"; - sha256 = "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq"; - }; - hcloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-hcloud"; - rev = "v1.16.0"; - version = "1.16.0"; - sha256 = "09v2bg4ffyh4ibz449dygxgd7mvjgh4b2r242l3cwi7pzn66imrz"; - }; - hedvig = - { - owner = "terraform-providers"; - repo = "terraform-provider-hedvig"; - rev = "v1.1.1"; - version = "1.1.1"; - sha256 = "1gd26jm9frn52hy2vm5sv003lbai5sjgdign6akhjmw5sdsmfr05"; - }; - helm = - { - owner = "hashicorp"; - repo = "terraform-provider-helm"; - rev = "v1.2.2"; - version = "1.2.2"; - sha256 = "1hjlf0pzc9jkcvqi52kvqwmd8v0cvnhhcbahzxmv0zkdwh310c12"; - }; - heroku = - { - owner = "terraform-providers"; - repo = "terraform-provider-heroku"; - rev = "v2.4.1"; - version = "2.4.1"; - sha256 = "10dacnd0y8q952s53n5myy08slw349pbfddjz63wcblcjyhvq0df"; - }; - http = - { - owner = "hashicorp"; - repo = "terraform-provider-http"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "0q8ichbqrq62q1j0rc7sdz1jzfwg2l9v4ac9jqf6y485dblhmwqd"; - }; - huaweicloudstack = - { - owner = "terraform-providers"; - repo = "terraform-provider-huaweicloudstack"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "0jhx9rap4128j8sfkvpp8lbdmvdba0rkd3nxvy38wr3n18m7v1xg"; - }; - huaweicloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-huaweicloud"; - rev = "v1.14.0"; - version = "1.14.0"; - sha256 = "10g5xl3pspzmj0bjzqbw3br4k7kh2jplph06f7sz2zg9dncl4h5z"; - }; - ibm = - { - owner = "IBM-Cloud"; - repo = "terraform-provider-ibm"; - rev = "v1.7.0"; - version = "1.7.0"; - sha256 = "1kb2dxdygvph65hh7qiba9kl9k5aygxxvx3x1qi28jwny594j82a"; - }; - icinga2 = - { - owner = "terraform-providers"; - repo = "terraform-provider-icinga2"; - rev = "v0.3.0"; - version = "0.3.0"; - sha256 = "0xwjxb84glhp9viqykziwanj696w2prq4r7k0565k0w3qiaz440v"; - }; - ignition = - { - owner = "terraform-providers"; - repo = "terraform-provider-ignition"; - rev = "v1.2.1"; - version = "1.2.1"; - sha256 = "0wd29iw0a5w7ykgs9m1mmi0bw5z9dl4z640qyz64x8rlh5hl1wql"; - }; - incapsula = - { - owner = "terraform-providers"; - repo = "terraform-provider-incapsula"; - rev = "v2.1.0"; - version = "2.1.0"; - sha256 = "12zw2m7j52rszfawywbiv9rgv976h1w6bp98012qn45d4ap2kvzy"; - }; - influxdb = - { - owner = "terraform-providers"; - repo = "terraform-provider-influxdb"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9"; - }; - infoblox = - { - owner = "terraform-providers"; - repo = "terraform-provider-infoblox"; - rev = "v1.0.0"; - version = "1.0.0"; - sha256 = "0p95y5w3fzddygmsjc0j60z0f4aazvy5iwbwszj0i8gs42qhda2f"; - }; - jdcloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-jdcloud"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf"; - }; - ksyun = - { - owner = "terraform-providers"; - repo = "terraform-provider-ksyun"; - rev = "v1.0.0"; - version = "1.0.0"; - sha256 = "1vcx612bz2p0rjsrx11j6fdc0f0q2jm5m3xl94wrpx9jjb7aczvc"; - }; - kubernetes-alpha = - { - owner = "hashicorp"; - repo = "terraform-provider-kubernetes-alpha"; - rev = "nightly20200608"; - version = "nightly20200608"; - sha256 = "1g171sppf3kq5qlp6g0qqdm0x8lnpizgw8bxjlhp9b6cl4kym70m"; - }; - kubernetes = - { - owner = "terraform-providers"; - repo = "terraform-provider-kubernetes"; - rev = "v1.11.3"; - version = "1.11.3"; - sha256 = "13j4xwibjgiqpzwbwd0d3z1idv0lwz78ip38khhmhwa78mjjb4zz"; - }; - launchdarkly = - { - owner = "terraform-providers"; - repo = "terraform-provider-launchdarkly"; - rev = "v1.3.2"; - version = "1.3.2"; - sha256 = "0vgkivzbf6hcl9by6l0whpwidva7zmmgdabkshjjk0npl2cj8f9n"; - }; - librato = - { - owner = "terraform-providers"; - repo = "terraform-provider-librato"; - rev = "v0.1.0"; - version = "0.1.0"; - sha256 = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923"; - }; - linode = - { - owner = "terraform-providers"; - repo = "terraform-provider-linode"; - rev = "v1.12.3"; - version = "1.12.3"; - sha256 = "17hnm7wivd75psap2qdmlnmmlf964s7jf4jrfgsm6njx32wwwfpp"; - }; - local = - { - owner = "hashicorp"; - repo = "terraform-provider-local"; - rev = "v1.4.0"; - version = "1.4.0"; - sha256 = "1k1kbdn99ypn1pi6vqbs1l9a8vvf4vs32wl8waa16i26514sz1wk"; - }; - logentries = - { - owner = "terraform-providers"; - repo = "terraform-provider-logentries"; - rev = "v1.0.0"; - version = "1.0.0"; - sha256 = "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq"; - }; - logicmonitor = - { - owner = "terraform-providers"; - repo = "terraform-provider-logicmonitor"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1"; - }; - mailgun = - { - owner = "terraform-providers"; - repo = "terraform-provider-mailgun"; - rev = "v0.4.1"; - version = "0.4.1"; - sha256 = "1l76pg4hmww9zg2n4rkhm5dwjh42fxri6d41ih1bf670krkxwsmz"; - }; - matchbox = - { - owner = "poseidon"; - repo = "terraform-provider-matchbox"; - rev = "v0.3.0"; - version = "0.3.0"; - sha256 = "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3"; - }; - metalcloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-metalcloud"; - rev = "v2.2.0"; - version = "2.2.0"; - sha256 = "0xii9gk96srzi9y4pbvlx2cvwypll4igvk89f9qrg18qrw72ags3"; - }; - mongodbatlas = - { - owner = "terraform-providers"; - repo = "terraform-provider-mongodbatlas"; - rev = "v0.5.1"; - version = "0.5.1"; - sha256 = "0sl5yd1bqj79f7pj49aqh7l3fvdrbf8r7a4g7cv15qbc8g3lr1dh"; - }; - mysql = - { - owner = "terraform-providers"; - repo = "terraform-provider-mysql"; - rev = "v1.9.0"; - version = "1.9.0"; - sha256 = "14gxxki3jhncv3s2x828ns2vgmf2xxzigdyp9b54mbkw5rnv1k2g"; - }; - ncloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-ncloud"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "1h2fr0ss58dr3ypqj6kw90iyji6s83sz2i85vhs5z2adjbk7h8va"; - }; - netlify = - { - owner = "terraform-providers"; - repo = "terraform-provider-netlify"; - rev = "v0.4.0"; - version = "0.4.0"; - sha256 = "07xds84k2vgpvn2cy3id7hmzg57sz2603zs4msn3ysxmi28lmqyg"; - }; - newrelic = - { - owner = "terraform-providers"; - repo = "terraform-provider-newrelic"; - rev = "v1.19.0"; - version = "1.19.0"; - sha256 = "0nmbgw4qyzsw8kxi7p8dy4j1lkxcz7qfs56qsvwf2w07y4qm382p"; - }; - nixos = - { - owner = "tweag"; - repo = "terraform-provider-nixos"; - rev = "v0.0.1"; - version = "0.0.1"; - sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; - }; - nomad = - { - owner = "terraform-providers"; - repo = "terraform-provider-nomad"; - rev = "v1.4.5"; - version = "1.4.5"; - sha256 = "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i"; - }; - ns1 = - { - owner = "terraform-providers"; - repo = "terraform-provider-ns1"; - rev = "v1.8.3"; - version = "1.8.3"; - sha256 = "18mq6r8sw2jjvngay0zyvzlfiln8c0xb8hcrl2wcmnpqv2iinbkl"; - }; - nsxt = - { - owner = "terraform-providers"; - repo = "terraform-provider-nsxt"; - rev = "v2.0.0"; - version = "2.0.0"; - sha256 = "0fka793r0c06sz8vlxk0z7vbm6kab5xzk39r5pznkq34004r17sl"; - }; - null = - { - owner = "hashicorp"; - repo = "terraform-provider-null"; - rev = "v2.1.2"; - version = "2.1.2"; - sha256 = "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2"; - }; - nutanix = - { - owner = "terraform-providers"; - repo = "terraform-provider-nutanix"; - rev = "v1.0.2"; - version = "1.0.2"; - sha256 = "17sgsxsh8minirks08c6gz52cf7ndn220sx4xzi6bq64yi6qw2yc"; - }; - oci = - { - owner = "terraform-providers"; - repo = "terraform-provider-oci"; - rev = "v3.79.0"; - version = "3.79.0"; - sha256 = "11n2v537zniiv5xvhpypqrm09my8zybirvq4ly94hp69v73xj89c"; - }; - oktaasa = - { - owner = "terraform-providers"; - repo = "terraform-provider-oktaasa"; - rev = "v1.0.0"; - version = "1.0.0"; - sha256 = "093d5r8dz8gryk8qp5var2qrrgkvs1gwgw3zqpxry9xc5cpn30w0"; - }; - okta = - { - owner = "terraform-providers"; - repo = "terraform-provider-okta"; - rev = "v3.3.0"; - version = "3.3.0"; - sha256 = "1z557z1yagp2caf85hmcr6sddax9a5h47jja17082qmmr1qy0i07"; - }; - oneandone = - { - owner = "terraform-providers"; - repo = "terraform-provider-oneandone"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "0c412nqg3k17124i51nn3ffra6gcll904h37h7hyvz97cdblcncn"; - }; - opc = - { - owner = "terraform-providers"; - repo = "terraform-provider-opc"; - rev = "v1.4.0"; - version = "1.4.0"; - sha256 = "1yl8bbh4pf94wlmna294zcawylr9hiaix82wr321g9wb0vi3d5l8"; - }; - opennebula = - { - owner = "terraform-providers"; - repo = "terraform-provider-opennebula"; - rev = "v0.1.1"; - version = "0.1.1"; - sha256 = "048cqd89fz5xpji1w8ylg75nbzzcx1c5n89y1k0ra8d3g2208yb2"; - }; - openstack = - { - owner = "terraform-providers"; - repo = "terraform-provider-openstack"; - rev = "v1.28.0"; - version = "1.28.0"; - sha256 = "1g2nxv312ddvkgpph17m9sh4zmy5ddj8gqwnfb3frbfbbamrgar6"; - }; - opentelekomcloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-opentelekomcloud"; - rev = "v1.17.1"; - version = "1.17.1"; - sha256 = "1d4w35hpvxy5wkb6n9wrh2nfcsy0xgk6d4jbk4sy7dn44w3nkqbg"; - }; - opsgenie = - { - owner = "terraform-providers"; - repo = "terraform-provider-opsgenie"; - rev = "v0.3.4"; - version = "0.3.4"; - sha256 = "11pbkhn7yhz2mfa01ikn7rdajl28zwxfq9g9qdf9lvkdrv88gwh0"; - }; - oraclepaas = - { - owner = "terraform-providers"; - repo = "terraform-provider-oraclepaas"; - rev = "v1.5.3"; - version = "1.5.3"; - sha256 = "0xb03b5jgm06rgrllib6zj1nkh54zv2mqjnyfflgnazpf4c1ia15"; - }; - ovh = - { - owner = "terraform-providers"; - repo = "terraform-provider-ovh"; - rev = "v0.8.0"; - version = "0.8.0"; - sha256 = "1ww4ng8w5hm50rbxd83xzbkq8qsn04dqwpdjhs587v9d0x2vwrf1"; - }; - packet = - { - owner = "terraform-providers"; - repo = "terraform-provider-packet"; - rev = "v2.9.0"; - version = "2.9.0"; - sha256 = "0d9r272gidkwn4zr130ml047512qq5d5d599s63blzy6m38vilha"; - }; - pagerduty = - { - owner = "terraform-providers"; - repo = "terraform-provider-pagerduty"; - rev = "v1.7.2"; - version = "1.7.2"; - sha256 = "1a8g8rpn52wibrxhnvhlda7ja38vw9aadgdc8nbj7zs50x4aj3ic"; - }; - panos = - { - owner = "terraform-providers"; - repo = "terraform-provider-panos"; - rev = "v1.6.2"; - version = "1.6.2"; - sha256 = "1qy6jynv61zhvq16s8jkwjhxz7r65cmk9k37ahh07pbhdx707mz5"; - }; - pass = - { - owner = "camptocamp"; - repo = "terraform-provider-pass"; - rev = "1.2.1"; - version = "1.2.1"; - sha256 = "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk"; - }; - postgresql = - { - owner = "terraform-providers"; - repo = "terraform-provider-postgresql"; - rev = "v1.6.0"; - version = "1.6.0"; - sha256 = "0m9x60hrry0cqx4bhmql081wjcbay3750jwzqiph5vpj9717banf"; - }; - powerdns = - { - owner = "terraform-providers"; - repo = "terraform-provider-powerdns"; - rev = "v1.4.0"; - version = "1.4.0"; - sha256 = "1mfcj32v66w5gnzbrdkampydl3m9f1155vcdw8l1f2nba59irkgw"; - }; - profitbricks = - { - owner = "terraform-providers"; - repo = "terraform-provider-profitbricks"; - rev = "v1.5.2"; - version = "1.5.2"; - sha256 = "0gass4gzv8axlzn5rgg35nqvd61q82k041r0sr6x6pv6j8v1ixln"; - }; - pureport = - { - owner = "terraform-providers"; - repo = "terraform-provider-pureport"; - rev = "v1.1.8"; - version = "1.1.8"; - sha256 = "02vmqwjz5m5hj4zghwicjp27dxvc4qsiwj4gjsi66w6djdqnh4h1"; - }; - rabbitmq = - { - owner = "terraform-providers"; - repo = "terraform-provider-rabbitmq"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "1adkbfm0p7a9i1i53bdmb34g5871rklgqkx7kzmwmk4fvv89n6g8"; - }; - rancher2 = - { - owner = "terraform-providers"; - repo = "terraform-provider-rancher2"; - rev = "v1.8.3"; - version = "1.8.3"; - sha256 = "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna"; - }; - rancher = - { - owner = "terraform-providers"; - repo = "terraform-provider-rancher"; - rev = "v1.5.0"; - version = "1.5.0"; - sha256 = "0yhv9ahj6ajspgnl2f77gpyd6klq44dyl74lvl10bx6yy56abi2m"; - }; - random = - { - owner = "hashicorp"; - repo = "terraform-provider-random"; - rev = "v2.2.1"; - version = "2.2.1"; - sha256 = "1qklsxj443vsj61lwl7qf7xwgnllwcvb2yk6s0kn9g3iq63pcv30"; - }; - rightscale = - { - owner = "terraform-providers"; - repo = "terraform-provider-rightscale"; - rev = "v1.3.1"; - version = "1.3.1"; - sha256 = "0abwxaghrxpahpsk6kd02fjh0rhck4xsdrzcpv629yh8ip9rzcaj"; - }; - rundeck = - { - owner = "terraform-providers"; - repo = "terraform-provider-rundeck"; - rev = "v0.4.0"; - version = "0.4.0"; - sha256 = "1x131djsny8w84yf7w2il33wlc3ysy3k399dziii2lmq4h8sgrpr"; - }; - runscope = - { - owner = "terraform-providers"; - repo = "terraform-provider-runscope"; - rev = "v0.6.0"; - version = "0.6.0"; - sha256 = "1fsph2cnyvzdwa5hwdjabfk4azmc3x8a7afpwpawxfdvqhgpr595"; - }; - scaleway = - { - owner = "terraform-providers"; - repo = "terraform-provider-scaleway"; - rev = "v1.15.0"; - version = "1.15.0"; - sha256 = "0bdhjrml14f5z4spkl7l305g0vdzpgama7ahngws8jhvl8yfa208"; - }; - secret = - { - owner = "tweag"; - repo = "terraform-provider-secret"; - rev = "v1.1.1"; - version = "1.1.1"; - sha256 = "1pr0amzgv1i1lxniqlx8spdb73q522l7pm8a4m25hwy1kwby37sd"; - }; - segment = - { - owner = "ajbosco"; - repo = "terraform-provider-segment"; - rev = "v0.2.0"; - version = "0.2.0"; - sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; - }; - selectel = - { - owner = "terraform-providers"; - repo = "terraform-provider-selectel"; - rev = "v3.3.0"; - version = "3.3.0"; - sha256 = "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl"; - }; - signalfx = - { - owner = "terraform-providers"; - repo = "terraform-provider-signalfx"; - rev = "v4.23.0"; - version = "4.23.0"; - sha256 = "1v3whvqb6nilfvw4c0xziq6yrlkl96d2cya094c7bd7wp9hzif1l"; - }; - skytap = - { - owner = "terraform-providers"; - repo = "terraform-provider-skytap"; - rev = "v0.14.1"; - version = "0.14.1"; - sha256 = "0ygsdkv7czyhsjsx1q57rmmcl8x66d65yarhg40hlng5c7xpi52g"; - }; - softlayer = - { - owner = "terraform-providers"; - repo = "terraform-provider-softlayer"; - rev = "v0.0.1"; - version = "0.0.1"; - sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq"; - }; - sops = - { - owner = "carlpett"; - repo = "terraform-provider-sops"; - rev = "v0.5.1"; - version = "0.5.1"; - sha256 = "1x32w1qw46rwa8bjhkfn6ybr1dkbdqk0prlm0bnwn3gvvj0hc7kh"; - }; - spotinst = - { - owner = "terraform-providers"; - repo = "terraform-provider-spotinst"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "0pmbr2xdqrzkd66zv4gpyxzahs7p2m2xl5qyvqpg0apxn91z3ra7"; - }; - stackpath = - { - owner = "terraform-providers"; - repo = "terraform-provider-stackpath"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "0gsr903v6fngaxm2r5h53g9yc3jpx2zccqq07rhzm9jbsfb6rlzn"; - }; - statuscake = - { - owner = "terraform-providers"; - repo = "terraform-provider-statuscake"; - rev = "v1.0.0"; - version = "1.0.0"; - sha256 = "1x295va6c72465cxps0kx3rrb7s9aip2cniy6icsg1b2yrsb9b26"; - }; - sumologic = - { - owner = "terraform-providers"; - repo = "terraform-provider-sumologic"; - rev = "v2.0.3"; - version = "2.0.3"; - sha256 = "0d7xsfdfs6dj02bh90bhwsa2jgxf84df3pqmsjlmxvpv65dv4vs8"; - }; - telefonicaopencloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-telefonicaopencloud"; - rev = "v1.0.0"; - version = "1.0.0"; - sha256 = "1761wkjz3d2458xl7855lxklyxgyk05fddh92rp6975y0ca6xa5m"; - }; - template = - { - owner = "hashicorp"; - repo = "terraform-provider-template"; - rev = "v2.1.2"; - version = "2.1.2"; - sha256 = "18w1mmma81m9j7yf6q500w8v9ss28w6sw2ynssl99pyw2gwmd04q"; - }; - tencentcloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-tencentcloud"; - rev = "v1.36.0"; - version = "1.36.0"; - sha256 = "1sqynm0g1al5hnxzccv8iiqcgd07ys0g828f3xfw53b6f5vzbhfr"; - }; - terraform = - { - owner = "terraform-providers"; - repo = "terraform-provider-terraform"; - rev = "v1.0.2"; - version = "1.0.2"; - sha256 = "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v"; - }; - tfe = - { - owner = "terraform-providers"; - repo = "terraform-provider-tfe"; - rev = "v0.18.0"; - version = "0.18.0"; - sha256 = "1cl83afm00fflsd3skynjvncid3r74fkxfznrs1v8qypcg1j79g1"; - }; - tls = - { - owner = "hashicorp"; - repo = "terraform-provider-tls"; - rev = "v2.1.1"; - version = "2.1.1"; - sha256 = "1qsx540pjcq4ra034q2dwnw5nmzab5h1c3vm20ppg5dkhhyiizq8"; - }; - triton = - { - owner = "terraform-providers"; - repo = "terraform-provider-triton"; - rev = "v0.7.0"; - version = "0.7.0"; - sha256 = "14wbdm2rlmjld9y7iizdinhk1fnx5s8fgjgd3jcs1b4g126s0pl0"; - }; - turbot = - { - owner = "terraform-providers"; - repo = "terraform-provider-turbot"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "0z56s3kmx84raiwiny9jing8ac9msfd5vk8va24k8czwj2v5gb0f"; - }; - ucloud = - { - owner = "terraform-providers"; - repo = "terraform-provider-ucloud"; - rev = "v1.20.0"; - version = "1.20.0"; - sha256 = "1s3xgdrngiy7slxwk5cmhij681yyfvc8185yig7jmrm21q2981f6"; - }; - ultradns = - { - owner = "terraform-providers"; - repo = "terraform-provider-ultradns"; - rev = "v0.1.0"; - version = "0.1.0"; - sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj"; - }; - vault = - { - owner = "terraform-providers"; - repo = "terraform-provider-vault"; - rev = "v2.11.0"; - version = "2.11.0"; - sha256 = "1yzakc7jp0rs9axnfdqw409asrbjhq0qa7xn4xzpi7m94g1ii12d"; - }; - vcd = - { - owner = "terraform-providers"; - repo = "terraform-provider-vcd"; - rev = "v2.8.0"; - version = "2.8.0"; - sha256 = "0myj5a9mrh7vg6h3gk5f0wsdp6832nz0z10h184107sdchpv253n"; - }; - venafi = - { - owner = "terraform-providers"; - repo = "terraform-provider-venafi"; - rev = "v0.9.2"; - version = "0.9.2"; - sha256 = "06nk5c7lxs8fc04sz97lc3yk1zk1b9phkzw6fj9fnmpgaak87bj9"; - }; - vra7 = - { - owner = "terraform-providers"; - repo = "terraform-provider-vra7"; - rev = "v1.0.1"; - version = "1.0.1"; - sha256 = "0qmldgxmrv840c5rbmskdf4f9g4v52gg9v7magm6j2w2g0dp1022"; - }; - vsphere = - { - owner = "terraform-providers"; - repo = "terraform-provider-vsphere"; - rev = "v1.18.3"; - version = "1.18.3"; - sha256 = "1cvfmkckigi80cvv826m0d8wzd98qny0r5nqpl7nkzz5kybkb5qp"; - }; - vthunder = - { - owner = "terraform-providers"; - repo = "terraform-provider-vthunder"; - rev = "v0.1.0"; - version = "0.1.0"; - sha256 = "1mw55g0kjgp300p6y4s8wc91fgfxjm0cbszfzgbc8ca4b00j8cc2"; - }; - vultr = - { - owner = "terraform-providers"; - repo = "terraform-provider-vultr"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "0swc2fvp83d6w0cqvyxs346c756wr48xbn8m8jqkmma5s4ab2y4k"; - }; - wavefront = - { - owner = "terraform-providers"; - repo = "terraform-provider-wavefront"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "0aci96852bd4y8bi9y68p550jiji0c69kiw4zhf9qfld0sjz44j2"; - }; - yandex = - { - owner = "terraform-providers"; - repo = "terraform-provider-yandex"; - rev = "v0.40.0"; - version = "0.40.0"; - sha256 = "0dymhdrdm00m9xn4xka3zbvjqnckhl06vz5zm6rqivkmw8m2q0mz"; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 8b28f8bab543..91264da6a3df 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -4,7 +4,7 @@ , callPackage }: let - list = import ./data.nix; + list = lib.importJSON ./providers.json; toDrv = data: buildGoPackage rec { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json new file mode 100644 index 000000000000..b75f54afc996 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -0,0 +1,1017 @@ +{ + "aci": { + "owner": "terraform-providers", + "repo": "terraform-provider-aci", + "rev": "v0.2.3", + "sha256": "0sk0pp178w03fhsb65b9mpim1l4wqfnv9r9x64kiapjnvfb1rz3j", + "version": "0.2.3" + }, + "acme": { + "owner": "terraform-providers", + "repo": "terraform-provider-acme", + "rev": "v1.5.0", + "sha256": "1h53bgflchavnn4laf801d920bsgqqg0ph4slnf7y1fpb0mz5vdv", + "version": "1.5.0" + }, + "akamai": { + "owner": "terraform-providers", + "repo": "terraform-provider-akamai", + "rev": "v0.7.1", + "sha256": "0mg81147yz0m24xqljpw6v0ayhvb4fwf6qwaj7ii34hy2gjwv405", + "version": "0.7.1" + }, + "alicloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-alicloud", + "rev": "v1.86.0", + "sha256": "1hbv9ah7fd173sapwgsbg7790piwxw9zx90wfj5vz5b96ggbg28d", + "version": "1.86.0" + }, + "archive": { + "owner": "hashicorp", + "repo": "terraform-provider-archive", + "rev": "v1.3.0", + "sha256": "1hwg8ai4bvsmgnl669608lr4v940xnyig1xshps490f47c8hqy6y", + "version": "1.3.0" + }, + "arukas": { + "owner": "terraform-providers", + "repo": "terraform-provider-arukas", + "rev": "v1.1.0", + "sha256": "1akl9fzgm5qv01vz18xjzyqjnlxw699qq4x8vr96j16l1zf10h99", + "version": "1.1.0" + }, + "auth0": { + "owner": "terraform-providers", + "repo": "terraform-provider-auth0", + "rev": "v0.11.0", + "sha256": "1dkcgzvvwmw5z5q4146jk0gj5b1zrv51vvkhhjd8qh9ipinipn97", + "version": "0.11.0" + }, + "avi": { + "owner": "terraform-providers", + "repo": "terraform-provider-avi", + "rev": "v0.2.2", + "sha256": "0dgpjg6iw21vfcn4i0x6x1l329a09wrd2jwghrjigwlq68wd835d", + "version": "0.2.2" + }, + "aviatrix": { + "owner": "terraform-providers", + "repo": "terraform-provider-aviatrix", + "rev": "v2.14.1", + "sha256": "137z7fgy5gp9n9fdvllyjh3nkbalrs2giqljfldbllymhvrv7xgr", + "version": "2.14.1" + }, + "aws": { + "owner": "terraform-providers", + "repo": "terraform-provider-aws", + "rev": "v2.65.0", + "sha256": "005vs1qd6payicxldc9lr4w6kzr58xw9b930j52g1q7hlddl5mbb", + "version": "2.65.0" + }, + "azuread": { + "owner": "terraform-providers", + "repo": "terraform-provider-azuread", + "rev": "v0.10.0", + "sha256": "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3", + "version": "0.10.0" + }, + "azurerm": { + "owner": "terraform-providers", + "repo": "terraform-provider-azurerm", + "rev": "v2.13.0", + "sha256": "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7", + "version": "2.13.0" + }, + "azurestack": { + "owner": "terraform-providers", + "repo": "terraform-provider-azurestack", + "rev": "v0.9.0", + "sha256": "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324", + "version": "0.9.0" + }, + "baiducloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-baiducloud", + "rev": "v1.2.0", + "sha256": "1s2vk4vjni5nc50pdw60pm0grrf835xy551i6d4cmfxkkpqx3f6f", + "version": "1.2.0" + }, + "bigip": { + "owner": "terraform-providers", + "repo": "terraform-provider-bigip", + "rev": "v1.2.0", + "sha256": "0z0l4j8sn8yf6kw5sbyhp6s0046f738lsm650skcspqa5f63mbd9", + "version": "1.2.0" + }, + "bitbucket": { + "owner": "terraform-providers", + "repo": "terraform-provider-bitbucket", + "rev": "v1.2.0", + "sha256": "11n4wpvmaab164g6k077n9dbdbhd5lwl7pxpha5492ks468nd95b", + "version": "1.2.0" + }, + "brightbox": { + "owner": "terraform-providers", + "repo": "terraform-provider-brightbox", + "rev": "v1.3.0", + "sha256": "127l1ic70fkcqr0h23qhbpl1j2mzp44p9593x8jl936xz4ll8l70", + "version": "1.3.0" + }, + "checkpoint": { + "owner": "terraform-providers", + "repo": "terraform-provider-checkpoint", + "rev": "v1.0.2", + "sha256": "0zypjcg1z8fkz31lfhysxx42lpw8ak4aqgdis6rxzqbnkk491fjp", + "version": "1.0.2" + }, + "chef": { + "owner": "terraform-providers", + "repo": "terraform-provider-chef", + "rev": "v0.2.0", + "sha256": "0ihn4706fflmf0585w22l7arzxsa9biq4cgh8nlhlp5y0zy934ns", + "version": "0.2.0" + }, + "cherryservers": { + "owner": "terraform-providers", + "repo": "terraform-provider-cherryservers", + "rev": "v1.0.0", + "sha256": "1z6ai6q8aw38kiy8x13rp0dsvb4jk40cv8pk5c069q15m4jab8lh", + "version": "1.0.0" + }, + "ciscoasa": { + "owner": "terraform-providers", + "repo": "terraform-provider-ciscoasa", + "rev": "v1.2.0", + "sha256": "033pgy42qwjpmjyzylpml7sfzd6dvvybs56cid1f6sm4ykmxbal7", + "version": "1.2.0" + }, + "clc": { + "owner": "terraform-providers", + "repo": "terraform-provider-clc", + "rev": "v0.1.0", + "sha256": "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf", + "version": "0.1.0" + }, + "cloudflare": { + "owner": "terraform-providers", + "repo": "terraform-provider-cloudflare", + "rev": "v2.7.0", + "sha256": "1r18lxhfi2sd42ja4bzxbkf5bli8iljrpqbgdcn1a7rcf44vnxa2", + "version": "2.7.0" + }, + "cloudinit": { + "owner": "hashicorp", + "repo": "terraform-provider-cloudinit", + "rev": "v1.0.0", + "sha256": "0i926f4xkfydd2bxmim69xrvi9ymn1vrc66zl117axzsmy9200zx", + "version": "1.0.0" + }, + "cloudscale": { + "owner": "terraform-providers", + "repo": "terraform-provider-cloudscale", + "rev": "v2.1.2", + "sha256": "052pa17a77fkmhvygfgmpz87xlc08qvz1apzc2scg2449xfdv7zb", + "version": "2.1.2" + }, + "cloudstack": { + "owner": "terraform-providers", + "repo": "terraform-provider-cloudstack", + "rev": "v0.3.0", + "sha256": "0zmyww6z3j839ydlmv254hr8gcsixng4lcvmiwkhxb3hj1nw8hcw", + "version": "0.3.0" + }, + "cobbler": { + "owner": "terraform-providers", + "repo": "terraform-provider-cobbler", + "rev": "v1.1.0", + "sha256": "08ljqibfi6alpvv8f7pzvjl2k4w6br6g6ac755x4xw4ycrr24xw9", + "version": "1.1.0" + }, + "cohesity": { + "owner": "terraform-providers", + "repo": "terraform-provider-cohesity", + "rev": "v0.1.0", + "sha256": "1yifipjf51n8q9xyqcmc4zjpszmpyzb330f4zas81hahjml78hgx", + "version": "0.1.0" + }, + "constellix": { + "owner": "terraform-providers", + "repo": "terraform-provider-constellix", + "rev": "v0.1.0", + "sha256": "14y0v8ilbrjj0aymrw50fkz2mihnwyv83z8a9f8dh399s8l624w1", + "version": "0.1.0" + }, + "consul": { + "owner": "terraform-providers", + "repo": "terraform-provider-consul", + "rev": "v2.8.0", + "sha256": "1brd0fp9ksc3x8cygxm0k2q1sh4v5x89298pnidg6xirn41lvcr4", + "version": "2.8.0" + }, + "ct": { + "owner": "poseidon", + "repo": "terraform-provider-ct", + "rev": "v0.6.1", + "sha256": "0hh3hvi8lwb0h8x9viz5p991w94gn7354nw95b51rdmir9qi2x89", + "version": "0.6.1" + }, + "datadog": { + "owner": "terraform-providers", + "repo": "terraform-provider-datadog", + "rev": "v2.7.0", + "sha256": "0cq11cjcm2nlszqhsrj425mk8dp0h5ljrrn7jplrbffp8g6wvadd", + "version": "2.7.0" + }, + "digitalocean": { + "owner": "terraform-providers", + "repo": "terraform-provider-digitalocean", + "rev": "v1.19.0", + "sha256": "0plfkwkfb19f7bzky4jfa2kmkqvbah02c6j6applsd3jyiawpbgy", + "version": "1.19.0" + }, + "dme": { + "owner": "terraform-providers", + "repo": "terraform-provider-dme", + "rev": "v0.1.0", + "sha256": "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv", + "version": "0.1.0" + }, + "dns": { + "owner": "hashicorp", + "repo": "terraform-provider-dns", + "rev": "v2.2.0", + "sha256": "11xdxj6hfclaq9glbh14nihmrsk220crm9ld8bdv77w0bppmrrch", + "version": "2.2.0" + }, + "dnsimple": { + "owner": "terraform-providers", + "repo": "terraform-provider-dnsimple", + "rev": "v0.4.0", + "sha256": "1f1cpfa30frghp4yxp9n313yaf2mm1hnjq4kzmn6n9210prab9h1", + "version": "0.4.0" + }, + "docker": { + "owner": "terraform-providers", + "repo": "terraform-provider-docker", + "rev": "v2.7.1", + "sha256": "1jqnlc3dfy354yjdkj8iyxv0vamyxgmwxmhjim11alwzwjafbv9s", + "version": "2.7.1" + }, + "dome9": { + "owner": "terraform-providers", + "repo": "terraform-provider-dome9", + "rev": "v1.19.0", + "sha256": "190q74aaa1v7n7pqcri8kib0g0d4njf9dzm3cygyzmsjs3pxj1lc", + "version": "1.19.0" + }, + "dyn": { + "owner": "terraform-providers", + "repo": "terraform-provider-dyn", + "rev": "v1.2.0", + "sha256": "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48", + "version": "1.2.0" + }, + "exoscale": { + "owner": "terraform-providers", + "repo": "terraform-provider-exoscale", + "rev": "v0.16.2", + "sha256": "102z4v3shk0as76v90151j4c6p93wy16m1hzzk1yp50dlc8ffsks", + "version": "0.16.2" + }, + "external": { + "owner": "hashicorp", + "repo": "terraform-provider-external", + "rev": "v1.2.0", + "sha256": "1kx28bffhd1pg3m0cbldclc8l9zic16mqrk7gybcls9vyds5gbvc", + "version": "1.2.0" + }, + "fastly": { + "owner": "terraform-providers", + "repo": "terraform-provider-fastly", + "rev": "v0.16.1", + "sha256": "1pjrcw03a86xgkzcx778f7kk79svv8csy05b7qi0m5x77zy4pws7", + "version": "0.16.1" + }, + "flexibleengine": { + "owner": "terraform-providers", + "repo": "terraform-provider-flexibleengine", + "rev": "v1.12.1", + "sha256": "0klxi40dd3a4dp7gjsjjwh6zv2m94hh6mk5m9g0dyhvn0r28w5j2", + "version": "1.12.1" + }, + "fortios": { + "owner": "terraform-providers", + "repo": "terraform-provider-fortios", + "rev": "v1.2.0", + "sha256": "0sqp23pyldxjkfw33xn5l5fqs4vn00kkfhy9wnl690wn0cwmldbx", + "version": "1.2.0" + }, + "genymotion": { + "owner": "terraform-providers", + "repo": "terraform-provider-genymotion", + "rev": "v1.1.0", + "sha256": "02jpr3cm7rrf810c69sr6lcxzvxpnf7icc5z80gnvg67wwfg4ph4", + "version": "1.1.0" + }, + "github": { + "owner": "terraform-providers", + "repo": "terraform-provider-github", + "rev": "v2.8.0", + "sha256": "11aw9wqnayl786hvbgnb9ijijaipaggj18vkn5y0kcj2v4dwq4wg", + "version": "2.8.0" + }, + "gitlab": { + "owner": "terraform-providers", + "repo": "terraform-provider-gitlab", + "rev": "v2.9.0", + "sha256": "0l0b69nxxskpsylcgli2sm9qq7p4hw96dsri24w38shhnxmpysbb", + "version": "2.9.0" + }, + "google": { + "owner": "terraform-providers", + "repo": "terraform-provider-google", + "rev": "v3.18.0", + "sha256": "18cxl1qw1wyvzvhgjm1s3c19hbi5z9s6mipgazhrac70myw8dmy7", + "version": "3.18.0" + }, + "google-beta": { + "owner": "terraform-providers", + "repo": "terraform-provider-google-beta", + "rev": "v3.18.0", + "sha256": "1rsaqrgr6ddgx1pala83y70dk32s0mvf6vi877awmimxjzsa1l4r", + "version": "3.18.0" + }, + "grafana": { + "owner": "terraform-providers", + "repo": "terraform-provider-grafana", + "rev": "v1.5.0", + "sha256": "0zy3bqgpxymp2zygaxzllk1ysdankwxa1sy1djfgr4fs2nlggkwi", + "version": "1.5.0" + }, + "gridscale": { + "owner": "terraform-providers", + "repo": "terraform-provider-gridscale", + "rev": "v1.6.0", + "sha256": "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq", + "version": "1.6.0" + }, + "hcloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-hcloud", + "rev": "v1.16.0", + "sha256": "09v2bg4ffyh4ibz449dygxgd7mvjgh4b2r242l3cwi7pzn66imrz", + "version": "1.16.0" + }, + "hedvig": { + "owner": "terraform-providers", + "repo": "terraform-provider-hedvig", + "rev": "v1.1.1", + "sha256": "1gd26jm9frn52hy2vm5sv003lbai5sjgdign6akhjmw5sdsmfr05", + "version": "1.1.1" + }, + "helm": { + "owner": "hashicorp", + "repo": "terraform-provider-helm", + "rev": "v1.2.2", + "sha256": "1hjlf0pzc9jkcvqi52kvqwmd8v0cvnhhcbahzxmv0zkdwh310c12", + "version": "1.2.2" + }, + "heroku": { + "owner": "terraform-providers", + "repo": "terraform-provider-heroku", + "rev": "v2.4.1", + "sha256": "10dacnd0y8q952s53n5myy08slw349pbfddjz63wcblcjyhvq0df", + "version": "2.4.1" + }, + "http": { + "owner": "hashicorp", + "repo": "terraform-provider-http", + "rev": "v1.2.0", + "sha256": "0q8ichbqrq62q1j0rc7sdz1jzfwg2l9v4ac9jqf6y485dblhmwqd", + "version": "1.2.0" + }, + "huaweicloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-huaweicloud", + "rev": "v1.14.0", + "sha256": "10g5xl3pspzmj0bjzqbw3br4k7kh2jplph06f7sz2zg9dncl4h5z", + "version": "1.14.0" + }, + "huaweicloudstack": { + "owner": "terraform-providers", + "repo": "terraform-provider-huaweicloudstack", + "rev": "v1.2.0", + "sha256": "0jhx9rap4128j8sfkvpp8lbdmvdba0rkd3nxvy38wr3n18m7v1xg", + "version": "1.2.0" + }, + "ibm": { + "owner": "IBM-Cloud", + "repo": "terraform-provider-ibm", + "rev": "v1.7.0", + "sha256": "1kb2dxdygvph65hh7qiba9kl9k5aygxxvx3x1qi28jwny594j82a", + "version": "1.7.0" + }, + "icinga2": { + "owner": "terraform-providers", + "repo": "terraform-provider-icinga2", + "rev": "v0.3.0", + "sha256": "0xwjxb84glhp9viqykziwanj696w2prq4r7k0565k0w3qiaz440v", + "version": "0.3.0" + }, + "ignition": { + "owner": "terraform-providers", + "repo": "terraform-provider-ignition", + "rev": "v1.2.1", + "sha256": "0wd29iw0a5w7ykgs9m1mmi0bw5z9dl4z640qyz64x8rlh5hl1wql", + "version": "1.2.1" + }, + "incapsula": { + "owner": "terraform-providers", + "repo": "terraform-provider-incapsula", + "rev": "v2.1.0", + "sha256": "12zw2m7j52rszfawywbiv9rgv976h1w6bp98012qn45d4ap2kvzy", + "version": "2.1.0" + }, + "influxdb": { + "owner": "terraform-providers", + "repo": "terraform-provider-influxdb", + "rev": "v1.3.0", + "sha256": "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9", + "version": "1.3.0" + }, + "infoblox": { + "owner": "terraform-providers", + "repo": "terraform-provider-infoblox", + "rev": "v1.0.0", + "sha256": "0p95y5w3fzddygmsjc0j60z0f4aazvy5iwbwszj0i8gs42qhda2f", + "version": "1.0.0" + }, + "jdcloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-jdcloud", + "rev": "v1.1.0", + "sha256": "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf", + "version": "1.1.0" + }, + "ksyun": { + "owner": "terraform-providers", + "repo": "terraform-provider-ksyun", + "rev": "v1.0.0", + "sha256": "1vcx612bz2p0rjsrx11j6fdc0f0q2jm5m3xl94wrpx9jjb7aczvc", + "version": "1.0.0" + }, + "kubernetes": { + "owner": "terraform-providers", + "repo": "terraform-provider-kubernetes", + "rev": "v1.11.3", + "sha256": "13j4xwibjgiqpzwbwd0d3z1idv0lwz78ip38khhmhwa78mjjb4zz", + "version": "1.11.3" + }, + "kubernetes-alpha": { + "owner": "hashicorp", + "repo": "terraform-provider-kubernetes-alpha", + "rev": "nightly20200608", + "sha256": "1g171sppf3kq5qlp6g0qqdm0x8lnpizgw8bxjlhp9b6cl4kym70m", + "version": "nightly20200608" + }, + "launchdarkly": { + "owner": "terraform-providers", + "repo": "terraform-provider-launchdarkly", + "rev": "v1.3.2", + "sha256": "0vgkivzbf6hcl9by6l0whpwidva7zmmgdabkshjjk0npl2cj8f9n", + "version": "1.3.2" + }, + "librato": { + "owner": "terraform-providers", + "repo": "terraform-provider-librato", + "rev": "v0.1.0", + "sha256": "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923", + "version": "0.1.0" + }, + "linode": { + "owner": "terraform-providers", + "repo": "terraform-provider-linode", + "rev": "v1.12.3", + "sha256": "17hnm7wivd75psap2qdmlnmmlf964s7jf4jrfgsm6njx32wwwfpp", + "version": "1.12.3" + }, + "local": { + "owner": "hashicorp", + "repo": "terraform-provider-local", + "rev": "v1.4.0", + "sha256": "1k1kbdn99ypn1pi6vqbs1l9a8vvf4vs32wl8waa16i26514sz1wk", + "version": "1.4.0" + }, + "logentries": { + "owner": "terraform-providers", + "repo": "terraform-provider-logentries", + "rev": "v1.0.0", + "sha256": "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq", + "version": "1.0.0" + }, + "logicmonitor": { + "owner": "terraform-providers", + "repo": "terraform-provider-logicmonitor", + "rev": "v1.3.0", + "sha256": "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1", + "version": "1.3.0" + }, + "mailgun": { + "owner": "terraform-providers", + "repo": "terraform-provider-mailgun", + "rev": "v0.4.1", + "sha256": "1l76pg4hmww9zg2n4rkhm5dwjh42fxri6d41ih1bf670krkxwsmz", + "version": "0.4.1" + }, + "matchbox": { + "owner": "poseidon", + "repo": "terraform-provider-matchbox", + "rev": "v0.3.0", + "sha256": "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3", + "version": "0.3.0" + }, + "metalcloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-metalcloud", + "rev": "v2.2.0", + "sha256": "0xii9gk96srzi9y4pbvlx2cvwypll4igvk89f9qrg18qrw72ags3", + "version": "2.2.0" + }, + "mongodbatlas": { + "owner": "terraform-providers", + "repo": "terraform-provider-mongodbatlas", + "rev": "v0.5.1", + "sha256": "0sl5yd1bqj79f7pj49aqh7l3fvdrbf8r7a4g7cv15qbc8g3lr1dh", + "version": "0.5.1" + }, + "mysql": { + "owner": "terraform-providers", + "repo": "terraform-provider-mysql", + "rev": "v1.9.0", + "sha256": "14gxxki3jhncv3s2x828ns2vgmf2xxzigdyp9b54mbkw5rnv1k2g", + "version": "1.9.0" + }, + "ncloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-ncloud", + "rev": "v1.2.0", + "sha256": "1h2fr0ss58dr3ypqj6kw90iyji6s83sz2i85vhs5z2adjbk7h8va", + "version": "1.2.0" + }, + "netlify": { + "owner": "terraform-providers", + "repo": "terraform-provider-netlify", + "rev": "v0.4.0", + "sha256": "07xds84k2vgpvn2cy3id7hmzg57sz2603zs4msn3ysxmi28lmqyg", + "version": "0.4.0" + }, + "newrelic": { + "owner": "terraform-providers", + "repo": "terraform-provider-newrelic", + "rev": "v1.19.0", + "sha256": "0nmbgw4qyzsw8kxi7p8dy4j1lkxcz7qfs56qsvwf2w07y4qm382p", + "version": "1.19.0" + }, + "nixos": { + "owner": "tweag", + "repo": "terraform-provider-nixos", + "rev": "v0.0.1", + "sha256": "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf", + "version": "0.0.1" + }, + "nomad": { + "owner": "terraform-providers", + "repo": "terraform-provider-nomad", + "rev": "v1.4.5", + "sha256": "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i", + "version": "1.4.5" + }, + "ns1": { + "owner": "terraform-providers", + "repo": "terraform-provider-ns1", + "rev": "v1.8.3", + "sha256": "18mq6r8sw2jjvngay0zyvzlfiln8c0xb8hcrl2wcmnpqv2iinbkl", + "version": "1.8.3" + }, + "nsxt": { + "owner": "terraform-providers", + "repo": "terraform-provider-nsxt", + "rev": "v2.0.0", + "sha256": "0fka793r0c06sz8vlxk0z7vbm6kab5xzk39r5pznkq34004r17sl", + "version": "2.0.0" + }, + "null": { + "owner": "hashicorp", + "repo": "terraform-provider-null", + "rev": "v2.1.2", + "sha256": "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2", + "version": "2.1.2" + }, + "nutanix": { + "owner": "terraform-providers", + "repo": "terraform-provider-nutanix", + "rev": "v1.0.2", + "sha256": "17sgsxsh8minirks08c6gz52cf7ndn220sx4xzi6bq64yi6qw2yc", + "version": "1.0.2" + }, + "oci": { + "owner": "terraform-providers", + "repo": "terraform-provider-oci", + "rev": "v3.79.0", + "sha256": "11n2v537zniiv5xvhpypqrm09my8zybirvq4ly94hp69v73xj89c", + "version": "3.79.0" + }, + "okta": { + "owner": "terraform-providers", + "repo": "terraform-provider-okta", + "rev": "v3.3.0", + "sha256": "1z557z1yagp2caf85hmcr6sddax9a5h47jja17082qmmr1qy0i07", + "version": "3.3.0" + }, + "oktaasa": { + "owner": "terraform-providers", + "repo": "terraform-provider-oktaasa", + "rev": "v1.0.0", + "sha256": "093d5r8dz8gryk8qp5var2qrrgkvs1gwgw3zqpxry9xc5cpn30w0", + "version": "1.0.0" + }, + "oneandone": { + "owner": "terraform-providers", + "repo": "terraform-provider-oneandone", + "rev": "v1.3.0", + "sha256": "0c412nqg3k17124i51nn3ffra6gcll904h37h7hyvz97cdblcncn", + "version": "1.3.0" + }, + "opc": { + "owner": "terraform-providers", + "repo": "terraform-provider-opc", + "rev": "v1.4.0", + "sha256": "1yl8bbh4pf94wlmna294zcawylr9hiaix82wr321g9wb0vi3d5l8", + "version": "1.4.0" + }, + "opennebula": { + "owner": "terraform-providers", + "repo": "terraform-provider-opennebula", + "rev": "v0.1.1", + "sha256": "048cqd89fz5xpji1w8ylg75nbzzcx1c5n89y1k0ra8d3g2208yb2", + "version": "0.1.1" + }, + "openstack": { + "owner": "terraform-providers", + "repo": "terraform-provider-openstack", + "rev": "v1.28.0", + "sha256": "1g2nxv312ddvkgpph17m9sh4zmy5ddj8gqwnfb3frbfbbamrgar6", + "version": "1.28.0" + }, + "opentelekomcloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-opentelekomcloud", + "rev": "v1.17.1", + "sha256": "1d4w35hpvxy5wkb6n9wrh2nfcsy0xgk6d4jbk4sy7dn44w3nkqbg", + "version": "1.17.1" + }, + "opsgenie": { + "owner": "terraform-providers", + "repo": "terraform-provider-opsgenie", + "rev": "v0.3.4", + "sha256": "11pbkhn7yhz2mfa01ikn7rdajl28zwxfq9g9qdf9lvkdrv88gwh0", + "version": "0.3.4" + }, + "oraclepaas": { + "owner": "terraform-providers", + "repo": "terraform-provider-oraclepaas", + "rev": "v1.5.3", + "sha256": "0xb03b5jgm06rgrllib6zj1nkh54zv2mqjnyfflgnazpf4c1ia15", + "version": "1.5.3" + }, + "ovh": { + "owner": "terraform-providers", + "repo": "terraform-provider-ovh", + "rev": "v0.8.0", + "sha256": "1ww4ng8w5hm50rbxd83xzbkq8qsn04dqwpdjhs587v9d0x2vwrf1", + "version": "0.8.0" + }, + "packet": { + "owner": "terraform-providers", + "repo": "terraform-provider-packet", + "rev": "v2.9.0", + "sha256": "0d9r272gidkwn4zr130ml047512qq5d5d599s63blzy6m38vilha", + "version": "2.9.0" + }, + "pagerduty": { + "owner": "terraform-providers", + "repo": "terraform-provider-pagerduty", + "rev": "v1.7.2", + "sha256": "1a8g8rpn52wibrxhnvhlda7ja38vw9aadgdc8nbj7zs50x4aj3ic", + "version": "1.7.2" + }, + "panos": { + "owner": "terraform-providers", + "repo": "terraform-provider-panos", + "rev": "v1.6.2", + "sha256": "1qy6jynv61zhvq16s8jkwjhxz7r65cmk9k37ahh07pbhdx707mz5", + "version": "1.6.2" + }, + "pass": { + "owner": "camptocamp", + "repo": "terraform-provider-pass", + "rev": "1.2.1", + "sha256": "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk", + "version": "1.2.1" + }, + "postgresql": { + "owner": "terraform-providers", + "repo": "terraform-provider-postgresql", + "rev": "v1.6.0", + "sha256": "0m9x60hrry0cqx4bhmql081wjcbay3750jwzqiph5vpj9717banf", + "version": "1.6.0" + }, + "powerdns": { + "owner": "terraform-providers", + "repo": "terraform-provider-powerdns", + "rev": "v1.4.0", + "sha256": "1mfcj32v66w5gnzbrdkampydl3m9f1155vcdw8l1f2nba59irkgw", + "version": "1.4.0" + }, + "profitbricks": { + "owner": "terraform-providers", + "repo": "terraform-provider-profitbricks", + "rev": "v1.5.2", + "sha256": "0gass4gzv8axlzn5rgg35nqvd61q82k041r0sr6x6pv6j8v1ixln", + "version": "1.5.2" + }, + "pureport": { + "owner": "terraform-providers", + "repo": "terraform-provider-pureport", + "rev": "v1.1.8", + "sha256": "02vmqwjz5m5hj4zghwicjp27dxvc4qsiwj4gjsi66w6djdqnh4h1", + "version": "1.1.8" + }, + "rabbitmq": { + "owner": "terraform-providers", + "repo": "terraform-provider-rabbitmq", + "rev": "v1.3.0", + "sha256": "1adkbfm0p7a9i1i53bdmb34g5871rklgqkx7kzmwmk4fvv89n6g8", + "version": "1.3.0" + }, + "rancher": { + "owner": "terraform-providers", + "repo": "terraform-provider-rancher", + "rev": "v1.5.0", + "sha256": "0yhv9ahj6ajspgnl2f77gpyd6klq44dyl74lvl10bx6yy56abi2m", + "version": "1.5.0" + }, + "rancher2": { + "owner": "terraform-providers", + "repo": "terraform-provider-rancher2", + "rev": "v1.8.3", + "sha256": "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna", + "version": "1.8.3" + }, + "random": { + "owner": "hashicorp", + "repo": "terraform-provider-random", + "rev": "v2.2.1", + "sha256": "1qklsxj443vsj61lwl7qf7xwgnllwcvb2yk6s0kn9g3iq63pcv30", + "version": "2.2.1" + }, + "rightscale": { + "owner": "terraform-providers", + "repo": "terraform-provider-rightscale", + "rev": "v1.3.1", + "sha256": "0abwxaghrxpahpsk6kd02fjh0rhck4xsdrzcpv629yh8ip9rzcaj", + "version": "1.3.1" + }, + "rundeck": { + "owner": "terraform-providers", + "repo": "terraform-provider-rundeck", + "rev": "v0.4.0", + "sha256": "1x131djsny8w84yf7w2il33wlc3ysy3k399dziii2lmq4h8sgrpr", + "version": "0.4.0" + }, + "runscope": { + "owner": "terraform-providers", + "repo": "terraform-provider-runscope", + "rev": "v0.6.0", + "sha256": "1fsph2cnyvzdwa5hwdjabfk4azmc3x8a7afpwpawxfdvqhgpr595", + "version": "0.6.0" + }, + "scaleway": { + "owner": "terraform-providers", + "repo": "terraform-provider-scaleway", + "rev": "v1.15.0", + "sha256": "0bdhjrml14f5z4spkl7l305g0vdzpgama7ahngws8jhvl8yfa208", + "version": "1.15.0" + }, + "secret": { + "owner": "tweag", + "repo": "terraform-provider-secret", + "rev": "v1.1.1", + "sha256": "1pr0amzgv1i1lxniqlx8spdb73q522l7pm8a4m25hwy1kwby37sd", + "version": "1.1.1" + }, + "segment": { + "owner": "ajbosco", + "repo": "terraform-provider-segment", + "rev": "v0.2.0", + "sha256": "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz", + "version": "0.2.0" + }, + "selectel": { + "owner": "terraform-providers", + "repo": "terraform-provider-selectel", + "rev": "v3.3.0", + "sha256": "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl", + "version": "3.3.0" + }, + "signalfx": { + "owner": "terraform-providers", + "repo": "terraform-provider-signalfx", + "rev": "v4.23.0", + "sha256": "1v3whvqb6nilfvw4c0xziq6yrlkl96d2cya094c7bd7wp9hzif1l", + "version": "4.23.0" + }, + "skytap": { + "owner": "terraform-providers", + "repo": "terraform-provider-skytap", + "rev": "v0.14.1", + "sha256": "0ygsdkv7czyhsjsx1q57rmmcl8x66d65yarhg40hlng5c7xpi52g", + "version": "0.14.1" + }, + "softlayer": { + "owner": "terraform-providers", + "repo": "terraform-provider-softlayer", + "rev": "v0.0.1", + "sha256": "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq", + "version": "0.0.1" + }, + "sops": { + "owner": "carlpett", + "repo": "terraform-provider-sops", + "rev": "v0.5.1", + "sha256": "1x32w1qw46rwa8bjhkfn6ybr1dkbdqk0prlm0bnwn3gvvj0hc7kh", + "version": "0.5.1" + }, + "spotinst": { + "owner": "terraform-providers", + "repo": "terraform-provider-spotinst", + "rev": "v1.17.0", + "sha256": "0pmbr2xdqrzkd66zv4gpyxzahs7p2m2xl5qyvqpg0apxn91z3ra7", + "version": "1.17.0" + }, + "stackpath": { + "owner": "terraform-providers", + "repo": "terraform-provider-stackpath", + "rev": "v1.3.0", + "sha256": "0gsr903v6fngaxm2r5h53g9yc3jpx2zccqq07rhzm9jbsfb6rlzn", + "version": "1.3.0" + }, + "statuscake": { + "owner": "terraform-providers", + "repo": "terraform-provider-statuscake", + "rev": "v1.0.0", + "sha256": "1x295va6c72465cxps0kx3rrb7s9aip2cniy6icsg1b2yrsb9b26", + "version": "1.0.0" + }, + "sumologic": { + "owner": "terraform-providers", + "repo": "terraform-provider-sumologic", + "rev": "v2.0.3", + "sha256": "0d7xsfdfs6dj02bh90bhwsa2jgxf84df3pqmsjlmxvpv65dv4vs8", + "version": "2.0.3" + }, + "telefonicaopencloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-telefonicaopencloud", + "rev": "v1.0.0", + "sha256": "1761wkjz3d2458xl7855lxklyxgyk05fddh92rp6975y0ca6xa5m", + "version": "1.0.0" + }, + "template": { + "owner": "hashicorp", + "repo": "terraform-provider-template", + "rev": "v2.1.2", + "sha256": "18w1mmma81m9j7yf6q500w8v9ss28w6sw2ynssl99pyw2gwmd04q", + "version": "2.1.2" + }, + "tencentcloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-tencentcloud", + "rev": "v1.36.0", + "sha256": "1sqynm0g1al5hnxzccv8iiqcgd07ys0g828f3xfw53b6f5vzbhfr", + "version": "1.36.0" + }, + "terraform": { + "owner": "terraform-providers", + "repo": "terraform-provider-terraform", + "rev": "v1.0.2", + "sha256": "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v", + "version": "1.0.2" + }, + "tfe": { + "owner": "terraform-providers", + "repo": "terraform-provider-tfe", + "rev": "v0.18.0", + "sha256": "1cl83afm00fflsd3skynjvncid3r74fkxfznrs1v8qypcg1j79g1", + "version": "0.18.0" + }, + "tls": { + "owner": "hashicorp", + "repo": "terraform-provider-tls", + "rev": "v2.1.1", + "sha256": "1qsx540pjcq4ra034q2dwnw5nmzab5h1c3vm20ppg5dkhhyiizq8", + "version": "2.1.1" + }, + "triton": { + "owner": "terraform-providers", + "repo": "terraform-provider-triton", + "rev": "v0.7.0", + "sha256": "14wbdm2rlmjld9y7iizdinhk1fnx5s8fgjgd3jcs1b4g126s0pl0", + "version": "0.7.0" + }, + "turbot": { + "owner": "terraform-providers", + "repo": "terraform-provider-turbot", + "rev": "v1.3.0", + "sha256": "0z56s3kmx84raiwiny9jing8ac9msfd5vk8va24k8czwj2v5gb0f", + "version": "1.3.0" + }, + "ucloud": { + "owner": "terraform-providers", + "repo": "terraform-provider-ucloud", + "rev": "v1.20.0", + "sha256": "1s3xgdrngiy7slxwk5cmhij681yyfvc8185yig7jmrm21q2981f6", + "version": "1.20.0" + }, + "ultradns": { + "owner": "terraform-providers", + "repo": "terraform-provider-ultradns", + "rev": "v0.1.0", + "sha256": "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj", + "version": "0.1.0" + }, + "vault": { + "owner": "terraform-providers", + "repo": "terraform-provider-vault", + "rev": "v2.11.0", + "sha256": "1yzakc7jp0rs9axnfdqw409asrbjhq0qa7xn4xzpi7m94g1ii12d", + "version": "2.11.0" + }, + "vcd": { + "owner": "terraform-providers", + "repo": "terraform-provider-vcd", + "rev": "v2.8.0", + "sha256": "0myj5a9mrh7vg6h3gk5f0wsdp6832nz0z10h184107sdchpv253n", + "version": "2.8.0" + }, + "venafi": { + "owner": "terraform-providers", + "repo": "terraform-provider-venafi", + "rev": "v0.9.2", + "sha256": "06nk5c7lxs8fc04sz97lc3yk1zk1b9phkzw6fj9fnmpgaak87bj9", + "version": "0.9.2" + }, + "vra7": { + "owner": "terraform-providers", + "repo": "terraform-provider-vra7", + "rev": "v1.0.1", + "sha256": "0qmldgxmrv840c5rbmskdf4f9g4v52gg9v7magm6j2w2g0dp1022", + "version": "1.0.1" + }, + "vsphere": { + "owner": "terraform-providers", + "repo": "terraform-provider-vsphere", + "rev": "v1.18.3", + "sha256": "1cvfmkckigi80cvv826m0d8wzd98qny0r5nqpl7nkzz5kybkb5qp", + "version": "1.18.3" + }, + "vthunder": { + "owner": "terraform-providers", + "repo": "terraform-provider-vthunder", + "rev": "v0.1.0", + "sha256": "1mw55g0kjgp300p6y4s8wc91fgfxjm0cbszfzgbc8ca4b00j8cc2", + "version": "0.1.0" + }, + "vultr": { + "owner": "terraform-providers", + "repo": "terraform-provider-vultr", + "rev": "v1.3.0", + "sha256": "0swc2fvp83d6w0cqvyxs346c756wr48xbn8m8jqkmma5s4ab2y4k", + "version": "1.3.0" + }, + "wavefront": { + "owner": "terraform-providers", + "repo": "terraform-provider-wavefront", + "rev": "v2.3.0", + "sha256": "0aci96852bd4y8bi9y68p550jiji0c69kiw4zhf9qfld0sjz44j2", + "version": "2.3.0" + }, + "yandex": { + "owner": "terraform-providers", + "repo": "terraform-provider-yandex", + "rev": "v0.40.0", + "sha256": "0dymhdrdm00m9xn4xka3zbvjqnckhl06vz5zm6rqivkmw8m2q0mz", + "version": "0.40.0" + } +} From 107707ad82ac513eb49c9c0a5dbf46013b72fefb Mon Sep 17 00:00:00 2001 From: Timothy Stott Date: Wed, 30 Sep 2020 21:21:16 +0100 Subject: [PATCH 084/193] terraform-providers: update providers via terraform registry --- .../cluster/terraform-providers/update-all | 177 ------------------ .../terraform-providers/update-provider | 77 ++++++++ 2 files changed, 77 insertions(+), 177 deletions(-) delete mode 100755 pkgs/applications/networking/cluster/terraform-providers/update-all create mode 100755 pkgs/applications/networking/cluster/terraform-providers/update-provider diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all deleted file mode 100755 index e6e93b454034..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all +++ /dev/null @@ -1,177 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p bash coreutils jq nix gitAndTools.hub -# vim: ft=sh sw=2 et -# shellcheck shell=bash -# -# This scripts scans the github terraform-providers repo for new releases, -# generates the corresponding nix code and finally generates an index of -# all the providers given in ./providers.txt. -set -euo pipefail - -# the maximum number of attempts before giving up inside of GET and prefetch_github -readonly maxAttempts=30 - -get_tf_providers_org() { - # returns all terraform providers in a given organization, and their the - # latest tags, in the format - # $org/$repo $rev - local org=$1 - hub api --paginate graphql -f query=" - query(\$endCursor: String) { - repositoryOwner(login: \"${org}\") { - repositories(first: 100, after: \$endCursor) { - nodes { - nameWithOwner - name - refs(first: 1, refPrefix: \"refs/tags/\", orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { - nodes { - name - } - } - } - pageInfo { - hasNextPage - endCursor - } - } - } - }" | \ - jq -r '.data.repositoryOwner.repositories.nodes[] | select(.name | startswith("terraform-provider-")) | select((.refs.nodes | length) > 0) | .nameWithOwner + " " + .refs.nodes[0].name' - # filter the result with jq: - # - repos need to start with `teraform-provider-` - # - they need to have at least one tag - # for each of the remaining repos, assemble a string $org/$repo $rev -} - -get_latest_repo_tag() { - # of a given repo and owner, retrieve the latest tag - local owner=$1 - local repo=$2 - hub api --paginate "https://api.github.com/repos/$owner/$repo/git/refs/tags" | \ - jq -r '.[].ref' | \ - grep -v 'v\.' | \ - cut -d '/' -f 3- | \ - sort --version-sort | \ - tail -1 -} - -prefetch_github() { - # of a given owner, repo and rev, fetch the tarball and return the output of - # `nix-prefetch-url` - local owner=$1 - local repo=$2 - local rev=$3 - local retry=1 - while ! nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz"; do - echo "The nix-prefetch-url command has failed. Attempt $retry/${maxAttempts}" >&2 - if [[ "${retry}" -eq "${maxAttempts}" ]]; then - exit 1 - fi - retry=$(( retry + 1 )) - sleep 5 - done -} - -echo_entry() { - local owner=$1 - local repo=$2 - local rev=$3 - local version=${rev#v} - local sha256=$4 - cat <> data.nix -} - -## Main ## - -cd "$(dirname "$0")" - -# individual repos to fetch -slugs=( - IBM-Cloud/terraform-provider-ibm - ajbosco/terraform-provider-segment - camptocamp/terraform-provider-pass - carlpett/terraform-provider-sops - poseidon/terraform-provider-matchbox - poseidon/terraform-provider-ct - tweag/terraform-provider-nixos - tweag/terraform-provider-secret -) - -# a list of providers to ignore -blacklist=( - terraform-providers/terraform-provider-azure-classic - terraform-providers/terraform-provider-cidr - terraform-providers/terraform-provider-circonus - terraform-providers/terraform-provider-cloudinit - terraform-providers/terraform-provider-quorum - hashicorp/terraform-provider-time - terraform-providers/terraform-provider-vmc -) - -cat <
data.nix -# Generated with ./update-all -{ -HEADER - -# assemble list of terraform providers -providers=$(get_tf_providers_org "terraform-providers") -providers=$(echo "$providers";get_tf_providers_org "hashicorp") - -# add terraform-providers from slugs -for slug in "${slugs[@]}"; do - # retrieve latest tag - org=${slug%/*} - repo=${slug#*/} - rev=$(get_latest_repo_tag "$org" "$repo") - - # add to list - providers=$(echo "$providers";echo "$org/$repo $rev") -done - -# filter out all providers on the blacklist -for repo in "${blacklist[@]}"; do - providers=$(echo "$providers" | grep -v "^${repo} ") -done - -# sort results alphabetically by repo name -providers=$(echo "$providers" | sort -t "/" --key=2) - -# render list -IFS=$'\n' -for provider in $providers; do - org=$(echo "$provider" | cut -d " " -f 1 | cut -d "/" -f1) - repo=$(echo "$provider" | cut -d " " -f 1 | cut -d "/" -f2) - rev=$(echo "$provider" | cut -d " " -f 2) - add_provider "${org}" "${repo}" "${rev}" -done - -cat <