public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-30 00:44:02 +00:00 committed by GitHub
commit a8fff273ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 1218 additions and 862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
doc/functions/library/attrsets.xml
View File

@ -1711,4 +1711,43 @@ recursiveUpdate
</example> </example>
</section> </section>
<section xml:id="function-library-lib.attrsets.cartesianProductOfSets">
<title><function>lib.attrsets.cartesianProductOfSets</function></title>
<subtitle><literal>cartesianProductOfSets :: AttrSet -> [ AttrSet ]</literal>
</subtitle>
<xi:include href="./locations.xml" xpointer="lib.attrsets.cartesianProductOfSets" />
<para>
Return the cartesian product of attribute set value combinations.
</para>
<variablelist>
<varlistentry>
<term>
<varname>set</varname>
</term>
<listitem>
<para>
An attribute set with attributes that carry lists of values.
</para>
</listitem>
</varlistentry>
</variablelist>
<example xml:id="function-library-lib.attrsets.cartesianProductOfSets-example">
<title>Creating the cartesian product of a list of attribute values</title>
<programlisting><![CDATA[
cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; }
=> [
{ a = 1; b = 10; }
{ a = 1; b = 20; }
{ a = 2; b = 10; }
{ a = 2; b = 20; }
]
]]></programlisting>
</example>
</section>
</section> </section>

19
lib/attrsets.nix
View File

@ -183,6 +183,24 @@ rec {
else else
[]; [];
/* Return the cartesian product of attribute set value combinations.
Example:
cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; }
=> [
{ a = 1; b = 10; }
{ a = 1; b = 20; }
{ a = 2; b = 10; }
{ a = 2; b = 20; }
]
*/
cartesianProductOfSets = attrsOfLists:
lib.foldl' (listOfAttrs: attrName:
concatMap (attrs:
map (listValue: attrs // { ${attrName} = listValue; }) attrsOfLists.${attrName}
) listOfAttrs
) [{}] (attrNames attrsOfLists);
/* Utility function that creates a {name, value} pair as expected by /* Utility function that creates a {name, value} pair as expected by
builtins.listToAttrs. builtins.listToAttrs.
@ -493,5 +511,4 @@ rec {
zipWithNames = zipAttrsWithNames; zipWithNames = zipAttrsWithNames;
zip = builtins.trace zip = builtins.trace
"lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith; "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith;
} }

2
lib/default.nix
View File

@ -78,7 +78,7 @@ let
zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
recursiveUpdate matchAttrs overrideExisting getOutput getBin recursiveUpdate matchAttrs overrideExisting getOutput getBin
getLib getDev getMan chooseDevOutputs zipWithNames zip getLib getDev getMan chooseDevOutputs zipWithNames zip
recurseIntoAttrs dontRecurseIntoAttrs; recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets;
inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1
concatMap flatten remove findSingle findFirst any all count concatMap flatten remove findSingle findFirst any all count
optional optionals toList range partition zipListsWith zipLists optional optionals toList range partition zipListsWith zipLists

4
lib/lists.nix
View File

@ -629,7 +629,9 @@ rec {
crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]] crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]]
=> [ "13" "14" "23" "24" ] => [ "13" "14" "23" "24" ]
*/ */
crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; crossLists = builtins.trace
"lib.crossLists is deprecated, use lib.cartesianProductOfSets instead"
(f: foldl (fs: args: concatMap (f: map f args) fs) [f]);
/* Remove duplicate elements from the list. O(n^2) complexity. /* Remove duplicate elements from the list. O(n^2) complexity.

67
lib/tests/misc.nix
View File

@ -660,4 +660,71 @@ runTests {
expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ]; expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
}; };
testCartesianProductOfEmptySet = {
expr = cartesianProductOfSets {};
expected = [ {} ];
};
testCartesianProductOfOneSet = {
expr = cartesianProductOfSets { a = [ 1 2 3 ]; };
expected = [ { a = 1; } { a = 2; } { a = 3; } ];
};
testCartesianProductOfTwoSets = {
expr = cartesianProductOfSets { a = [ 1 ]; b = [ 10 20 ]; };
expected = [
{ a = 1; b = 10; }
{ a = 1; b = 20; }
];
};
testCartesianProductOfTwoSetsWithOneEmpty = {
expr = cartesianProductOfSets { a = [ ]; b = [ 10 20 ]; };
expected = [ ];
};
testCartesianProductOfThreeSets = {
expr = cartesianProductOfSets {
a = [ 1 2 3 ];
b = [ 10 20 30 ];
c = [ 100 200 300 ];
};
expected = [
{ a = 1; b = 10; c = 100; }
{ a = 1; b = 10; c = 200; }
{ a = 1; b = 10; c = 300; }
{ a = 1; b = 20; c = 100; }
{ a = 1; b = 20; c = 200; }
{ a = 1; b = 20; c = 300; }
{ a = 1; b = 30; c = 100; }
{ a = 1; b = 30; c = 200; }
{ a = 1; b = 30; c = 300; }
{ a = 2; b = 10; c = 100; }
{ a = 2; b = 10; c = 200; }
{ a = 2; b = 10; c = 300; }
{ a = 2; b = 20; c = 100; }
{ a = 2; b = 20; c = 200; }
{ a = 2; b = 20; c = 300; }
{ a = 2; b = 30; c = 100; }
{ a = 2; b = 30; c = 200; }
{ a = 2; b = 30; c = 300; }
{ a = 3; b = 10; c = 100; }
{ a = 3; b = 10; c = 200; }
{ a = 3; b = 10; c = 300; }
{ a = 3; b = 20; c = 100; }
{ a = 3; b = 20; c = 200; }
{ a = 3; b = 20; c = 300; }
{ a = 3; b = 30; c = 100; }
{ a = 3; b = 30; c = 200; }
{ a = 3; b = 30; c = 300; }
];
};
} }

6
nixos/modules/services/x11/display-managers/default.nix
View File

@ -444,8 +444,8 @@ in
in in
# We will generate every possible pair of WM and DM. # We will generate every possible pair of WM and DM.
concatLists ( concatLists (
crossLists builtins.map
(dm: wm: let ({dm, wm}: let
sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}"; sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
script = xsession dm wm; script = xsession dm wm;
desktopNames = if dm ? desktopNames desktopNames = if dm ? desktopNames
@ -472,7 +472,7 @@ in
providedSessions = [ sessionName ]; providedSessions = [ sessionName ];
}) })
) )
[dms wms] (cartesianProductOfSets { dm = dms; wm = wms; })
); );
# Make xsessions and wayland sessions available in XDG_DATA_DIRS # Make xsessions and wayland sessions available in XDG_DATA_DIRS

1
nixos/tests/dnscrypt-wrapper/default.nix
View File

@ -31,6 +31,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
client = { lib, ... }: client = { lib, ... }:
{ services.dnscrypt-proxy2.enable = true; { services.dnscrypt-proxy2.enable = true;
services.dnscrypt-proxy2.upstreamDefaults = false;
services.dnscrypt-proxy2.settings = { services.dnscrypt-proxy2.settings = {
server_names = [ "server" ]; server_names = [ "server" ];
static.server.stamp = "sdns://AQAAAAAAAAAAEDE5Mi4xNjguMS4xOjUzNTMgFEHYOv0SCKSuqR5CDYa7-58cCBuXO2_5uTSVU9wNQF0WMi5kbnNjcnlwdC1jZXJ0LnNlcnZlcg"; static.server.stamp = "sdns://AQAAAAAAAAAAEDE5Mi4xNjguMS4xOjUzNTMgFEHYOv0SCKSuqR5CDYa7-58cCBuXO2_5uTSVU9wNQF0WMi5kbnNjcnlwdC1jZXJ0LnNlcnZlcg";

8
nixos/tests/predictable-interface-names.nix
View File

@ -5,7 +5,11 @@
let let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { testCombinations = pkgs.lib.cartesianProductOfSets {
predictable = [true false];
withNetworkd = [true false];
};
in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: {
name = pkgs.lib.optionalString (!predictable) "un" + "predictable" name = pkgs.lib.optionalString (!predictable) "un" + "predictable"
+ pkgs.lib.optionalString withNetworkd "Networkd"; + pkgs.lib.optionalString withNetworkd "Networkd";
value = makeTest { value = makeTest {
@ -30,4 +34,4 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
machine.${if predictable then "fail" else "succeed"}("ip link show eth0") machine.${if predictable then "fail" else "succeed"}("ip link show eth0")
''; '';
}; };
}) [[true false] [true false]]) }) testCombinations)

4
pkgs/applications/graphics/feh/default.nix
View File

@ -7,11 +7,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "feh"; pname = "feh";
version = "3.6.2"; version = "3.6.3";
src = fetchurl { src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
sha256 = "0d66qz9h37pk8h10bc918hbv3j364vyni934rlw2j951s5wznj8n"; sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q=";
}; };
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];

10
pkgs/applications/graphics/processing/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: { lib, stdenv, fetchFromGitHub, fetchpatch, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "processing"; pname = "processing";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58"; sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58";
}; };
patches = [
(fetchpatch {
name = "oraclejdk-8u281-compat.patch";
url = "https://github.com/processing/processing/commit/7e176876173c93e3a00a922e7ae37951366d1761.patch";
sha256 = "g+zwpoIVgw7Sp6QWW3vyPZ/fKHk+o/YCY6xnrX8IGKo=";
})
];
nativeBuildInputs = [ ant rsync makeWrapper ]; nativeBuildInputs = [ ant rsync makeWrapper ];
buildInputs = [ jdk ]; buildInputs = [ jdk ];

11
pkgs/applications/misc/fuzzel/default.nix
View File

@ -1,13 +1,12 @@
{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}: { stdenv, lib, fetchzip, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fuzzel"; pname = "fuzzel";
version = "1.4.2"; version = "1.5.0";
src = fetchgit { src = fetchzip {
url = "https://codeberg.org/dnkl/fuzzel"; url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz";
rev = version; sha256 = "091vlhj1kirdy5p3qza9hwhj7js3ci5xxvlp9d7as9bwlh58w2lw";
sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2";
}; };
nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; nativeBuildInputs = [ pkg-config meson ninja scdoc git ];

6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -22,12 +22,12 @@ let
in mkDerivation rec { in mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "2.5.1"; version = "2.5.8";
# Telegram-Desktop with submodules # Telegram-Desktop with submodules
src = fetchurl { src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i"; sha256 = "0zj1g24fi4m84p6zj9yk55v8sbhn0jdpdhp33y12d2msz0qwp2cw";
}; };
postPatch = '' postPatch = ''
@ -44,7 +44,7 @@ in mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ];
buildInputs = [ buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected hunspell tl-expected hunspell
tg_owt tg_owt

9
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View File

@ -3,8 +3,8 @@
}: }:
let let
rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39"; rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de";
sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64"; sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "tg_owt"; pname = "tg_owt";
@ -25,5 +25,10 @@ in stdenv.mkDerivation {
libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
]; ];
cmakeFlags = [
# Building as a shared library isn't officially supported and currently broken:
"-DBUILD_SHARED_LIBS=OFF"
];
meta.license = lib.licenses.bsd3; meta.license = lib.licenses.bsd3;
} }

4
pkgs/applications/terminal-emulators/foot/default.nix
View File

@ -21,7 +21,7 @@
}: }:
let let
version = "1.6.2"; version = "1.6.3";
# build stimuli file for PGO build and the script to generate it # build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result # independently of the foot's build, so we can cache the result
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
src = fetchzip { src = fetchzip {
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
sha256 = "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812"; sha256 = "0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

12
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,13 +1,13 @@
{ {
"version": "13.7.1", "version": "13.7.4",
"repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km", "repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v13.7.1-ee", "rev": "v13.7.4-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "13.7.1", "GITALY_SERVER_VERSION": "13.7.4",
"GITLAB_PAGES_VERSION": "1.32.0", "GITLAB_PAGES_VERSION": "1.34.0",
"GITLAB_SHELL_VERSION": "13.14.0", "GITLAB_SHELL_VERSION": "13.14.0",
"GITLAB_WORKHORSE_VERSION": "8.58.0" "GITLAB_WORKHORSE_VERSION": "8.58.2"
} }
} }

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -33,14 +33,14 @@ let
}; };
}; };
in buildGoModule rec { in buildGoModule rec {
version = "13.7.1"; version = "13.7.4";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb"; sha256 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg";
}; };
vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187";

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -3,13 +3,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "8.58.0"; version = "8.58.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-workhorse"; repo = "gitlab-workhorse";
rev = "v${version}"; rev = "v${version}";
sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80"; sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp";
}; };
vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }: { fetchurl }:
fetchurl { fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/214ceb3bed92d49a0dffc6c2d8d21b1d0bcc7c25.tar.gz"; url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f8773aba1736a7929a7262fdd6217be67f679c98.tar.gz";
sha256 = "1m8rm46w9xc8z8dvjg3i0bqpx9630i6ff681dp445q8wv7ji9y2v"; sha256 = "1flmp0r1isgp8mf85iwiwps6sa3wczb6k0zphprhnvbi2dzg9x87";
} }

4
pkgs/desktops/gnome-3/core/evince/default.nix
View File

@ -43,13 +43,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evince"; pname = "evince";
version = "3.38.0"; version = "3.38.1";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0j0ry0y9qi1mlm7dcjwrmrw45s1225ri8sv0s9vb8ibm85x8kpr6"; sha256 = "APbWaJzCLePABb2H1MLr9yAGTLjcahiHgW+LfggrLmM=";
}; };
postPatch = '' postPatch = ''

10
pkgs/development/compilers/oraclejdk/jdk8-linux.nix
View File

@ -1,10 +1,10 @@
import ./jdk-linux-base.nix { import ./jdk-linux-base.nix {
productVersion = "8"; productVersion = "8";
patchVersion = "271"; patchVersion = "281";
sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0="; sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0=";
sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg="; sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY=";
sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM="; sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM=";
sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I="; sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM=";
jceName = "jce_policy-8.zip"; jceName = "jce_policy-8.zip";
sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w";
} }

20
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -64,7 +64,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "0w71kbz127fcli24sxsvd48l5xamwamjwhr18x9alam5cldqkkz1"; sha256 = "1m9jfr5b0qwajwwmvcq02263bmnqgcqvpdr06sdwlfz3sxsjfp8r";
}; };
}).override { }).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -815,8 +815,9 @@ self: super: {
# https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913 # https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913
cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512); cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512);
# Depends on tasty < 1.x, which we don't have. # https://github.com/haskell-hvr/cryptohash-sha256/issues/11
cryptohash-sha256 = doJailbreak super.cryptohash-sha256; # Jailbreak is necessary to break out of tasty < 1.x dependency.
cryptohash-sha256 = markUnbroken (doJailbreak super.cryptohash-sha256);
# Needs tasty-quickcheck ==0.8.*, which we don't have. # Needs tasty-quickcheck ==0.8.*, which we don't have.
cryptohash-sha1 = doJailbreak super.cryptohash-sha1; cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
@ -1377,11 +1378,6 @@ self: super: {
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
pandoc-citeproc = doJailbreak super.pandoc-citeproc; pandoc-citeproc = doJailbreak super.pandoc-citeproc;
# 2021-01-17: Tests are broken because of a version mismatch.
# See here: https://github.com/jgm/pandoc/issues/7035
# This problem is fixed on master. Remove override when this assert fails.
pandoc = assert super.pandoc.version == "2.11.3.2"; dontCheck super.pandoc;
# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
domain-auth = dontCheck super.domain-auth; domain-auth = dontCheck super.domain-auth;
@ -1417,7 +1413,7 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/610 # https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611 # https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck (super.haskell-language-server.override { haskell-language-server = dontCheck (super.haskell-language-server.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7; lsp-test = dontCheck self.lsp-test;
fourmolu = self.fourmolu_0_3_0_0; fourmolu = self.fourmolu_0_3_0_0;
}); });
# 2021-01-20 # 2021-01-20
@ -1426,12 +1422,10 @@ self: super: {
apply-refact = super.apply-refact_0_8_2_1; apply-refact = super.apply-refact_0_8_2_1;
fourmolu = dontCheck super.fourmolu; fourmolu = dontCheck super.fourmolu;
# 1. test requires internet # 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
ghcide = doDistribute (unmarkBroken (dontCheck ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; })));
(super.ghcide_0_7_0_0.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7;
})));
refinery = doDistribute super.refinery_0_3_0_0; refinery = doDistribute super.refinery_0_3_0_0;
data-tree-print = doJailbreak super.data-tree-print; data-tree-print = doJailbreak super.data-tree-print;

396
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

File diff suppressed because it is too large Load Diff

1302
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/python-modules/hwi/default.nix
View File

@ -2,11 +2,14 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, bitbox02 , bitbox02
, btchip
, ckcc-protocol
, ecdsa , ecdsa
, hidapi , hidapi
, libusb1 , libusb1
, mnemonic , mnemonic
, pyaes , pyaes
, trezor
, pythonAtLeast , pythonAtLeast
}: }:
@ -31,11 +34,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
bitbox02 bitbox02
btchip
ckcc-protocol
ecdsa ecdsa
hidapi hidapi
libusb1 libusb1
mnemonic mnemonic
pyaes pyaes
trezor
]; ];
# tests require to clone quite a few firmwares # tests require to clone quite a few firmwares

12
pkgs/misc/vim-plugins/generated.nix
View File

@ -2302,6 +2302,18 @@ let
meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; meta.homepage = "https://github.com/vim-scripts/mayansmoke/";
}; };
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
version = "2021-01-04";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
rev = "3e9ba8aae59441ed82b50b186f608e03aecb4f0e";
sha256 = "1z264hr0vbsdc0ffaiflzq952xv4h1g55i08dnlifvpizhqbalv6";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
mkdx = buildVimPluginFrom2Nix { mkdx = buildVimPluginFrom2Nix {
pname = "mkdx"; pname = "mkdx";
version = "2021-01-28"; version = "2021-01-28";

10
pkgs/misc/vim-plugins/overrides.nix
View File

@ -15,6 +15,7 @@
, nodePackages , nodePackages
, dasht , dasht
, sqlite , sqlite
, code-minimap
# deoplete-khard dependency # deoplete-khard dependency
, khard , khard
@ -243,6 +244,15 @@ self: super: {
dependencies = with super; [ webapi-vim ]; dependencies = with super; [ webapi-vim ];
}); });
minimap-vim = super.minimap-vim.overrideAttrs(old: {
preFixup = ''
substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \
--replace "code-minimap" "${code-minimap}/bin/code-minimap"
substituteInPlace $out/share/vim-plugins/minimap-vim/bin/minimap_generator.sh \
--replace "code-minimap" "${code-minimap}/bin/code-minimap"
'';
});
meson = buildVimPluginFrom2Nix { meson = buildVimPluginFrom2Nix {
inherit (meson) pname version src; inherit (meson) pname version src;
preInstall = "cd data/syntax-highlighting/vim"; preInstall = "cd data/syntax-highlighting/vim";

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -677,6 +677,7 @@ wbthomason/packer.nvim
weirongxu/coc-explorer weirongxu/coc-explorer
wellle/targets.vim wellle/targets.vim
wellle/tmux-complete.vim wellle/tmux-complete.vim
wfxr/minimap.vim
whonore/Coqtail whonore/Coqtail
will133/vim-dirdiff will133/vim-dirdiff
wincent/command-t wincent/command-t

4
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.11-rc3"; version = "5.11-rc5";
extraMeta.branch = "5.11"; extraMeta.branch = "5.11";
# modDirVersion needs to be x.y.z, will always add .0 # modDirVersion needs to be x.y.z, will always add .0
@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "15dfgvicp7s9xqaa3w8lmfffzyjsqrq1fa2gs1a8awzs5rxgsn61"; sha256 = "029nps41nrym5qz9lq832cys4rai04ig5xp9ddvrpazzh0lfnr4q";
}; };
# Should the testing kernels ever be built on Hydra? # Should the testing kernels ever be built on Hydra?

6
pkgs/os-specific/linux/rdma-core/default.nix
View File

@ -4,7 +4,7 @@
} : } :
let let
version = "33.0"; version = "33.1";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "rdma-core"; pname = "rdma-core";
@ -14,7 +14,7 @@ in stdenv.mkDerivation {
owner = "linux-rdma"; owner = "linux-rdma";
repo = "rdma-core"; repo = "rdma-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4"; sha256 = "1p97r8ngfx1d9aq8p3f027323m7kgmk30kfrikf3jlkpr30rksbv";
}; };
nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
@ -46,7 +46,7 @@ in stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "RDMA Core Userspace Libraries and Daemons"; description = "RDMA Core Userspace Libraries and Daemons";
homepage = "https://github.com/linux-rdma/rdma-core"; homepage = "https://github.com/linux-rdma/rdma-core";
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
}; };

9
pkgs/os-specific/solo5/default.nix
View File

@ -50,10 +50,11 @@ in stdenv.mkDerivation {
homepage = "https://github.com/solo5/solo5"; homepage = "https://github.com/solo5/solo5";
license = licenses.isc; license = licenses.isc;
maintainers = [ maintainers.ehmry ]; maintainers = [ maintainers.ehmry ];
platforms = lib.crossLists (arch: os: "${arch}-${os}") [ platforms = builtins.map ({arch, os}: "${arch}-${os}")
[ "aarch64" "x86_64" ] (cartesianProductOfSets {
[ "freebsd" "genode" "linux" "openbsd" ] arch = [ "aarch64" "x86_64" ];
]; os = [ "freebsd" "genode" "linux" "openbsd" ];
});
}; };
} }

7
pkgs/servers/osrm-backend/default.nix
View File

@ -2,18 +2,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "osrm-backend"; pname = "osrm-backend";
version = "5.23.0"; version = "5.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Project-OSRM"; owner = "Project-OSRM";
repo = "osrm-backend"; repo = "osrm-backend";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-FWfrdnpdx4YPa9l7bPc6QNyqyNvrikdeADSZIixX5vE="; sha256 = "sha256-Srqe6XIF9Fs869Dp25+63ikgO7YlyT0IUJr0qMxunao=";
}; };
NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ];
postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";

4
pkgs/servers/sql/monetdb/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monetdb"; pname = "monetdb";
version = "11.39.7"; version = "11.39.11";
src = fetchurl { src = fetchurl {
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
sha256 = "0qb2hlz42400diahmsbflfjmfnzd5slm6761xhgvh8s4rjfqm21w"; sha256 = "1b70r4b5m0r0xpy7i76xx0xsmwagsjdcp5j6nqfjcyn1m65ydzvs";
}; };
postPatch = '' postPatch = ''

58
pkgs/tools/admin/pulumi/data.nix
View File

@ -1,20 +1,20 @@
# DO NOT EDIT! This file is generated automatically by update.sh # DO NOT EDIT! This file is generated automatically by update.sh
{ }: { }:
{ {
version = "2.18.2"; version = "2.19.0";
pulumiPkgs = { pulumiPkgs = {
x86_64-linux = [ x86_64-linux = [
{ {
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.18.2-linux-x64.tar.gz"; url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-linux-x64.tar.gz";
sha256 = "0ya8b77qjda5z6bkik2yxq30wi1753mgkbcshd3x8f4wkb7kvj3w"; sha256 = "0641inzkbgrjarc7jdmi0iryx4swjh1ayf0j15ais3yij7jq4da2";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz";
sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy"; sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-linux-amd64.tar.gz";
sha256 = "1q9jz3p784x8k56an6hg9nazz44hlhdg9fawx6n0zrp6mh34kpsp"; sha256 = "0yfrpih5q2hfj2555y26l1pqs22idh4hqn20gy310kg12r303hwk";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz";
@ -33,16 +33,16 @@
sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2"; sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-linux-amd64.tar.gz";
sha256 = "1582h37z0971pd7xp6ss7r7742068pkbh2k5q8jj6ii3d7rwbbp1"; sha256 = "0mb6ddidyk3g1ayk8y0ypb262fyv584w5cicvjc5r9670a1d2rcv";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.8.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-linux-amd64.tar.gz";
sha256 = "1an0i997bpnkf19zbgfjyl2h7sm21xsc564x6zwcg67sxcjaal0w"; sha256 = "1b5m2620s4bqq6zlagki3w4fzph3lc5192falv8ick4rgbv714nb";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-linux-amd64.tar.gz";
sha256 = "0sglafpi7fjcrgky0a7xfra28ps55bb88mdi695i905ic8y071wa"; sha256 = "10cmnsxpiy7bfxyrpwfqn5kgpijlkxrhfah40wd82j3j2b7wy33j";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz";
@ -53,8 +53,8 @@
sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r"; sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.7-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-linux-amd64.tar.gz";
sha256 = "1x0j93y65687qh2k62ks61q2rjdlr06kkhas07w82x36xl6r30h1"; sha256 = "0ah0yhwf79dgk7biifnapz0366mm5a54rlqf8hffn13czqnc3qbq";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz";
@ -81,8 +81,8 @@
sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh"; sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.1-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-linux-amd64.tar.gz";
sha256 = "0saavajpnn5rx70n7rzfymrx8v17jf99n1zz20zgrhww67s3p2l6"; sha256 = "069sq8lkw4n7ykh2b2fsaggxxr4731riyy9i15idffa52d1kkiq6";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz";
@ -91,16 +91,16 @@
]; ];
x86_64-darwin = [ x86_64-darwin = [
{ {
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.18.2-darwin-x64.tar.gz"; url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-darwin-x64.tar.gz";
sha256 = "0rrmiplwml864s6rsxmb0zprd8qnf6ss92hgay9xnr6bxs6gl8w2"; sha256 = "02wd0h5aq53zjy18xzbkv7nnl097ja0m783gsgrs1wdlqblwpqyw";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz";
sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry"; sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-darwin-amd64.tar.gz";
sha256 = "0jxsh5af08sjj21ff484n1a9dylhmf02gzagw6r8x6lh247l5qp2"; sha256 = "1j4czx1iqfm95y14isl1sqwvsw690h9y0xf2jpynp2ygmc3szrkr";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz";
@ -119,16 +119,16 @@
sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9"; sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-darwin-amd64.tar.gz";
sha256 = "06q9pysql611p24padz6cz2fhf14bqkw7li504479sbnsxqk3g0s"; sha256 = "122cf7v12vzv1szi9adcccakbs3hs23qsjbykjrhwmk8hw21g4kb";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.8.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-darwin-amd64.tar.gz";
sha256 = "1x59xfzfgk02fmddbpvjk4cy8pnbgc65qwz9w70q59pyzyxl050s"; sha256 = "11w4ykh846byg05jxnddm6ln901pms8n5g0q5gj3ldfjrfl1cn2q";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-darwin-amd64.tar.gz";
sha256 = "0c9m036s690vrspklg1dxa6rnyqbfpspjn6lm64wj1w75qk9z746"; sha256 = "1apaaa76dq53ppnmh4xi55zsrx1mwbnnsby63ymjw9xhdkc1sah6";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz";
@ -139,8 +139,8 @@
sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2"; sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.7-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-darwin-amd64.tar.gz";
sha256 = "1nvgvk2awimllmy0yj69250w06hy64zcml5mhn5i9i2zyhmnwb6q"; sha256 = "01xspqk3hzvrhka9nsxal8pwji3hm5qgkn49jjnk1cy01hy7s78q";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz";
@ -167,8 +167,8 @@
sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv"; sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.1-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-darwin-amd64.tar.gz";
sha256 = "12nfk2pc380gnkblrviwyijr9ff5h1xv2ybv6frdczfd1kdjf9ar"; sha256 = "1qkh8hg7nplv0slq2xark57l547z63fy1l6zvrcblrqsqfw5zybv";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz";

1
pkgs/tools/admin/pulumi/default.nix
View File

@ -32,6 +32,7 @@ in stdenv.mkDerivation {
ghuntley ghuntley
peterromfeldhk peterromfeldhk
jlesquembre jlesquembre
cpcloud
]; ];
}; };
} }

14
pkgs/tools/admin/pulumi/update.sh
View File

@ -3,30 +3,30 @@
# Version of Pulumi from # Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/ # https://www.pulumi.com/docs/get-started/install/versions/
VERSION="2.18.2" VERSION="2.19.0"
# Grab latest release ${VERSION} from # Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases # https://github.com/pulumi/pulumi-${NAME}/releases
plugins=( plugins=(
"auth0=1.5.2" "auth0=1.5.2"
"aws=3.25.0" "aws=3.25.1"
"cloudflare=2.11.1" "cloudflare=2.11.1"
"consul=2.7.0" "consul=2.7.0"
"datadog=2.15.0" "datadog=2.15.0"
"digitalocean=3.3.0" "digitalocean=3.3.0"
"docker=2.6.1" "docker=2.7.0"
"gcp=4.8.0" "gcp=4.9.0"
"github=2.5.0" "github=2.5.1"
"gitlab=3.5.0" "gitlab=3.5.0"
"hcloud=0.5.1" "hcloud=0.5.1"
"kubernetes=2.7.7" "kubernetes=2.7.8"
"mailgun=2.3.2" "mailgun=2.3.2"
"mysql=2.3.3" "mysql=2.3.3"
"openstack=2.11.0" "openstack=2.11.0"
"packet=3.2.2" "packet=3.2.2"
"postgresql=2.5.3" "postgresql=2.5.3"
"random=3.0.1" "random=3.0.1"
"vault=3.2.1" "vault=3.3.0"
"vsphere=2.11.4" "vsphere=2.11.4"
) )

2
pkgs/top-level/all-packages.nix
View File

@ -24818,8 +24818,6 @@ in
}; };
spotify-unwrapped = callPackage ../applications/audio/spotify { spotify-unwrapped = callPackage ../applications/audio/spotify {
libgcrypt = libgcrypt_1_5;
libpng = libpng12;
curl = curl.override { curl = curl.override {
sslSupport = false; gnutlsSupport = true; sslSupport = false; gnutlsSupport = true;
}; };