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

Merge pull request #141538 from mkg20001/netplanfix

Browse Source
This commit is contained in:
Maciej Krüger 2021-10-13 20:17:15 +02:00 committed by GitHub
commit 4bd6f7a10e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/admin/netplan/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "netplan";
version = "0.101";
version = "0.103";
src = fetchFromGitHub {
owner = "CanonicalLtd";
owner = "canonical";
repo = "netplan";
rev = version;
hash = "sha256-bCK7J2pCQUwjZu8c1n6jhF6T/gvUGwydqAXpxUMLgMc=";
hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE=";
fetchSubmodules = false;
};
@ -45,6 +45,9 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \
--replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \
--replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '
# from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81
sed -e "s/-Werror//g" -i Makefile
'';
makeFlags = [