Merge branch 'staging-next' into staging

This commit is contained in:
Vladimír Čunát
2020-10-25 09:47:04 +01:00
418 changed files with 7056 additions and 3808 deletions
@@ -1,5 +1,5 @@
# This file was generated by go2nix, then modified by hand for Darwin support.
{ stdenv, buildGoPackage, fetchFromGitHub, darwin }:
{ stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }:
buildGoPackage rec {
pname = "sudolikeaboss-unstable";
@@ -17,8 +17,9 @@ buildGoPackage rec {
goDeps = ./deps.nix;
buildInputs = with darwin.apple_sdk.frameworks; [
propagatedBuildInputs = with darwin.apple_sdk.frameworks; [
Cocoa
fixDarwinDylibNames
];
meta = with stdenv.lib; {
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "tpm2-abrmd";
version = "2.3.2";
version = "2.3.3";
src = fetchFromGitHub {
owner = "tpm2-software";
repo = pname;
rev = version;
sha256 = "0jzglnlb700clcq6mjhhgvcq29a6893h888wsn9fbrh4f255sw8q";
sha256 = "17nv50w1yh6fg7393vfvys9y13lp0gvxx9vcw2pb87ky551d7xkf";
};
nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ];