swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 10:16:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-10-15 00:01:42 +00:00 committed by GitHub
parent adf4e67dd4 fe4a08c3d3
commit e4886fa815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -195,8 +195,8 @@ rec {
};
terraform_1_0 = mkTerraform {
version = "1.0.8";
sha256 = "1755m3h9iz086znjpkhxjbyl3jaxpsqmk73infn9wbhql8pq2wil";
version = "1.0.9";
sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3";
vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };

4
pkgs/servers/dico/default.nix
View file

@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl
, guile, python2, pcre, libffi, groff }:
, guile, python3, pcre, libffi, groff }:
stdenv.mkDerivation rec {
pname = "dico";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs =
[ libtool gettext zlib readline gsasl guile python2 pcre libffi groff ];
[ libtool gettext zlib readline gsasl guile python3 pcre libffi groff ];
doCheck = true;