From 054d6d948618c292c04555323c06b64690318e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 13 Oct 2021 18:33:34 +0200 Subject: [PATCH] netplan: 0.101 -> 0.103, fix package --- pkgs/tools/admin/netplan/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix index b9dc2c070731..77f2ad26de1d 100644 --- a/pkgs/tools/admin/netplan/default.nix +++ b/pkgs/tools/admin/netplan/default.nix @@ -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 = [