From 4e9963f07ba2e5553e62014c301b0597cdb21207 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 22 Sep 2014 16:01:33 +0200 Subject: [PATCH] haskell-libmpd: follow Haskell package conventions This patch brings libmpd into line with Haskell package conventions, per feedback from @peti at NixOS/nixpkgs#4190. --- .../libraries/haskell/libmpd/{default.nix => 0.9.0.1.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) rename pkgs/development/libraries/haskell/libmpd/{default.nix => 0.9.0.1.nix} (100%) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/libmpd/default.nix rename to pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e75c259452c..db227ae717a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1492,10 +1492,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libjenkins = callPackage ../development/libraries/haskell/libjenkins {}; - libmpd = callPackage ../development/libraries/haskell/libmpd {}; - libmpd_0_8_0_5 = callPackage ../development/libraries/haskell/libmpd/0.8.0.5.nix {}; + libmpd_0_9_0_1 = callPackage ../development/libraries/haskell/libmpd/0.9.0.1.nix {}; + + libmpd = self.libmpd_0_9_0_1; + liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {