From b02c65ab30edbbe699402307f8f63bd024ff3076 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 2 Oct 2018 21:27:02 -0700 Subject: [PATCH] treewide: fix allowAliases = false evaluation problems (cherry picked from commit 856fbc8dba947221788841de414bba7a391de4ed) Conflicts: pkgs/os-specific/linux/roccat-tools/default.nix File isn't in release-18.09 --- pkgs/applications/editors/flpsed/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 1c40b509bfe4..104206a14913 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fltk13, ghostscript, xlibs }: +{ stdenv, fetchurl, fltk13, ghostscript }: stdenv.mkDerivation rec { name = "flpsed-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac98f9daa57e..7209c08141d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21963,11 +21963,6 @@ with pkgs; callPackage ../applications/networking/cluster/terraform-providers {} ); - terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {}; - - terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {}; - - terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};