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

Merge pull request #47700 from ryantm/aliaseval

Browse Source 
treewide: fix evaluation problems
This commit is contained in:
Ryan Mulligan 2018-10-02 21:37:01 -07:00 committed by GitHub
commit 6455c314a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/flpsed/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fltk13, ghostscript, xlibs }: { stdenv, fetchurl, fltk13, ghostscript }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flpsed-${version}"; name = "flpsed-${version}";

4
pkgs/os-specific/linux/roccat-tools/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, gettext { stdenv, fetchurl, cmake, pkgconfig, gettext
, dbus, dbus_glib, libgaminggear, libgudev, lua , dbus, dbus-glib, libgaminggear, libgudev, lua
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ cmake pkgconfig gettext ]; nativeBuildInputs = [ cmake pkgconfig gettext ];
buildInputs = [ dbus dbus_glib libgaminggear libgudev lua ]; buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ];
enableParallelBuilding = true; enableParallelBuilding = true;

5
pkgs/top-level/all-packages.nix
View File

@ -22155,11 +22155,6 @@ with pkgs;
callPackage ../applications/networking/cluster/terraform-providers {} 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-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};