From e278868975e9073c30d9f010258cfdb2dde14512 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:40:32 +0100 Subject: [PATCH] haskell-libsystemd-journal: re-generate expression with cabal2nix --- .../libraries/haskell/libsystemd-journal/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix index 8cf84a5a14e3..e4dc138eae05 100644 --- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix +++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text +{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd, text , transformers, uniplate, unixBytestring, unorderedContainers, uuid , vector }: @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { hashable hsyslog pipes pipesSafe text transformers uniplate unixBytestring unorderedContainers uuid vector ]; - extraLibraries = [ systemd-journal ]; + extraLibraries = [ systemd ]; jailbreak = true; meta = { homepage = "http://github.com/ocharles/libsystemd-journal"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d1366024cec6..406c1220a114 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1521,9 +1521,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; - libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal { - systemd-journal = pkgs.systemd; - }; + libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {}; libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {};