diff options
author | volth <volth@webmaster.ms> | 2018-07-22 02:03:24 +0000 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-21 22:03:24 -0400 |
commit | cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16 (patch) | |
tree | 5f1c203e608071455dbbda699f52730bd4fbf058 /pkgs/development | |
parent | b6704130b426eb30c10424ad84b0e7b8f83a1e0f (diff) | |
download | nixpkgs-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar nixpkgs-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.gz nixpkgs-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.bz2 nixpkgs-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.lz nixpkgs-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.xz nixpkgs-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.zst nixpkgs-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.zip |
treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/haskell-modules/hackage-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/flatpak/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libguestfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/web/postman/default.nix | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 85355782171..ff62e2eba3b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -207831,7 +207831,7 @@ self: { }) {}; "udev" = callPackage - ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }: + ({ mkDerivation, base, bytestring, udev, posix-paths, unix }: mkDerivation { pname = "udev"; version = "0.1.0.0"; @@ -207839,12 +207839,12 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring posix-paths unix ]; - libraryPkgconfigDepends = [ libudev ]; + libraryPkgconfigDepends = [ udev ]; description = "libudev bindings"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libudev;}; + }) {inherit (pkgs) udev;}; "udp-conduit" = callPackage ({ mkDerivation, base, chunked-data, conduit-combinators diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index b8b55d6a874..e769cb50513 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -5,7 +5,7 @@ let version = "0.99.3"; - desktop_schemas = gnome3.gsettings_desktop_schemas; + desktop_schemas = gnome3.gsettings-desktop-schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 7569f2613bb..555828bfaf6 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor +, gmp, readline, file, libintl_perl, GetoptLong, SysVirt, numactl, xen, libapparmor , getopt, perlPackages, ocamlPackages , appliance ? null , javaSupport ? false, jdk ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong + systemd fuse yajl libvirt gmp readline file hivex libintl_perl GetoptLong SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) ++ stdenv.lib.optional javaSupport jdk; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index cf516b16f4b..f4f72491970 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -22,7 +22,7 @@ let CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace - CatalystPluginUnicodeEncoding + CatalystRuntime CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON @@ -52,7 +52,6 @@ let SetScalar Starman SysHostnameLong - TestMore TextDiff TextTable XMLSimple diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index cbe7d3da8aa..6c3509d632f 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pkgs.alsaLib pkgs.cairo pkgs.cups - pkgs.dbus_daemon.lib + pkgs.dbus.daemon.lib pkgs.expat pkgs.gdk_pixbuf pkgs.glib |