From 2d6ad73f1c0916a98314547435fc7f2b94ff890e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 31 Jul 2017 17:05:46 +0200 Subject: profiles: Remove IPv6 patch for systemd v233 This reverts commit 224a63100f6233fda762c72818cad57173411802 and 85f3d5340e53e2624f65248740ed04cb1f5e94e9. Since the last staging merge done in commit NixOS/nixpkgs@740d76371e6c1c76bae4801fc5b736a796c1ebbe we have systemd version 234, which already has the change this patch has addressed. Signed-off-by: aszlig --- modules/user/aszlig/profiles/base.nix | 8 -------- modules/user/aszlig/profiles/managed.nix | 11 ----------- 2 files changed, 19 deletions(-) (limited to 'modules/user/aszlig/profiles') diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix index e1f3e05a..c6123e7d 100644 --- a/modules/user/aszlig/profiles/base.nix +++ b/modules/user/aszlig/profiles/base.nix @@ -80,14 +80,6 @@ in { checksumType = "mhash"; }; nix = super.nixUnstable; - # https://github.com/NixOS/systemd/pull/12 - systemd = super.systemd.overrideDerivation (drv: { - patches = (drv.patches or []) ++ lib.singleton (pkgs.fetchpatch { - url = "https://github.com/NixOS/systemd/commit/" - + "6554550f35a7976f9110aff94743d3576d5f02dd.patch"; - sha256 = "07l6wx0pb7pvjx8n9j0rwv5n260crbrfg5rh56l5nfan6biv81cl"; - }); - }) // { inherit (super.systemd) udev; }; uqm = super.uqm.override { use3DOVideos = true; useRemixPacks = true; diff --git a/modules/user/aszlig/profiles/managed.nix b/modules/user/aszlig/profiles/managed.nix index c20fd9aa..1287604b 100644 --- a/modules/user/aszlig/profiles/managed.nix +++ b/modules/user/aszlig/profiles/managed.nix @@ -21,17 +21,6 @@ in { environment.systemPackages = [ pkgs.simple-scan ]; - nixpkgs.overlays = lib.singleton (lib.const (super: { - # https://github.com/NixOS/systemd/pull/12 - systemd = super.systemd.overrideDerivation (drv: { - patches = (drv.patches or []) ++ lib.singleton (pkgs.fetchpatch { - url = "https://github.com/NixOS/systemd/commit/" - + "6554550f35a7976f9110aff94743d3576d5f02dd.patch"; - sha256 = "07l6wx0pb7pvjx8n9j0rwv5n260crbrfg5rh56l5nfan6biv81cl"; - }); - }) // { inherit (super.systemd) udev; }; - })); - # Printing for the most common printers among the managed machines. services.printing.enable = true; services.printing.drivers = [ -- cgit 1.4.1