Unverified Commit 9dd8bffe authored by Jonathan Ringer's avatar Jonathan Ringer
Browse files

Merge remote-tracking branch 'origin/master' into staging-next 

Conflicts:
	pkgs/development/python-modules/aiocron/default.nix
parents 255d79d6 0dc7780a

pkgs/applications/networking/cluster/terraform-providers/providers.json

+3 −3
Original line number Diff line number Diff line
@@ -581,10 +581,10 @@ 
    "owner": "hashicorp",

    "provider-source-address": "registry.terraform.io/hashicorp/kubernetes",

    "repo": "terraform-provider-kubernetes",

    "rev": "v2.7.0",

    "sha256": "07rqk60k87dff2wgg72ar7sdg99hd210k8afvvz9xh1arj63ixxi",

    "rev": "v2.7.1",

    "sha256": "061zxphysj6spr1giwfnqgy3hh8s4j0lw10gs3cjkqxbpc4bbs7a",

    "vendorSha256": null,

    "version": "2.7.0"

    "version": "2.7.1"

  },

  "launchdarkly": {

    "owner": "terraform-providers",

pkgs/applications/networking/cluster/tfswitch/default.nix

+3 −3
Original line number Diff line number Diff line 
{ buildGoModule, lib, fetchFromGitHub }:

buildGoModule rec {

  pname = "tfswitch";

  version = "0.12.1168";

  version = "0.13.1201";



  src = fetchFromGitHub {

    owner = "warrensbox";

    repo = "terraform-switcher";

    rev = version;

    sha256 = "sha256-BKqbxja19JxAr9/Cy7LpbZTJrt/pYfwtCbZMY0wwvZc=";

    sha256 = "sha256-gJa8oVdgerDi0GdTSNus5rHLsFuzg8ZqVeKTMuPXu0o=";

  };



  vendorSha256 = "sha256-y8T1MV2xHr9n7XWmB4LikIzyGx+0XKhsxmatnCZFN9I=";

  vendorSha256 = "sha256-tp2Bv/vcHCuB/HCZLfL/zOm/UfPt6XXGE7johrjL3cs=";



  # Disable tests since it requires network access and relies on the

  # presence of release.hashicorp.com

pkgs/applications/radio/tlf/default.nix

+13 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkg-config, glib

{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, pkg-config, glib

, perl, ncurses5, hamlib, xmlrpc_c }:



stdenv.mkDerivation rec {
@@ -12,6 +12,18 @@ stdenv.mkDerivation rec { 
    sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj";

  };



  patches = [

    # Pull upstream fix for ncurses-6.3:

    #   https://github.com/Tlf/tlf/pull/282

    # We use Debian's patch as upstream fixes don't apply as is due to

    # related code changes. The change will be a part of 1.4.2 release.

    (fetchpatch {

      name = "ncurses-6.3.patch";

      url = "https://salsa.debian.org/debian-hamradio-team/tlf/-/raw/5a2d79fc35bde97f653b1373fd970d41fe01a3ec/debian/patches/warnings-as-errors.patch?inline=false";

      sha256 = "1zi1dd4vqkgl2pg29lnhj91ralqg58gmkzq9fkcx0dyakbjm6070";

    })

  ];



  nativeBuildInputs = [ autoreconfHook autoconf automake pkg-config perl ];

  buildInputs = [ glib ncurses5 hamlib xmlrpc_c ];

pkgs/applications/science/programming/groove/default.nix

+4 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, unzip, makeWrapper, makeDesktopItem, icoutils, jre }:

{ lib, stdenv, fetchurl, unzip, makeWrapper, makeDesktopItem, icoutils, jre8 }:



let

  desktopItem = makeDesktopItem {
@@ -12,11 +12,11 @@ let 


in stdenv.mkDerivation rec {

  pname = "groove";

  version = "5.7.4";

  version = "5.8.1";



  src = fetchurl {

    url = "mirror://sourceforge/groove/groove/${version}/${pname}-${builtins.replaceStrings ["."] ["_"] version}-bin.zip";

    sha256 = "1cl3xzl3n8b9a7h5pvnv31bab9j9zaw07ppk8whk8h865dcq1d10";

    sha256 = "sha256-JwoUlO6F2+8NtCnLC+xm5q0Jm8RIyU1rnuKGmjgJhFU=";

  };



  nativeBuildInputs = [ unzip makeWrapper icoutils ];
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { 


    mkdir -p $out/bin

    for bin in Generator Imager ModelChecker PrologChecker Simulator Viewer; do

      makeWrapper ${jre}/bin/java $out/bin/groove-''${bin,,} \

      makeWrapper ${jre8}/bin/java $out/bin/groove-''${bin,,} \

        --add-flags "-jar $out/share/groove/bin/$bin.jar"

    done

pkgs/applications/version-management/git-and-tools/git-cliff/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "git-cliff";

  version = "0.4.0";

  version = "0.4.2";



  src = fetchFromGitHub {

    owner = "orhun";

    repo = "git-cliff";

    rev = "v${version}";

    sha256 = "sha256-9F15XHyFxcE48/ePwjvB7lLkw9FxoQd49G758nupRuk=";

    sha256 = "sha256-FCBNm51QI1jDdq2BZFwZA1kpIfXIvh1ickmY3ZqwGPY=";

  };



  cargoSha256 = "sha256-gPf4sGDbZzfzVJy+9k3FSOdJ5b8Xci1LTjIrCmP9bW8=";

  cargoSha256 = "sha256-CBCyujJHWTatJO+Tk6MyOk12B0cY1JSwLQizjcXeQzQ=";



  # attempts to run the program on .git in src which is not deterministic

  doCheck = false;