ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
Aycan iRiCAN 2014-07-19 11:25:30 +03:00
commit f057f06136
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/haskell/aeson-utils/default.nix
View File

@ -11,4 +11,3 @@ cabal.mkDerivation (self: {
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/rest-gen/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "rest-gen";
version = "0.14.1";
sha256 = "0skpj4y4v9q7brcq54wgl4kyxa1bqqw7gzb1r98d4ml0j3vhjn19";
version = "0.14.2";
sha256 = "1hmf77hs3pp6lf4glh3lbbwfjr029js185v69bk8ycr1c4ib8nbp";
buildDepends = [
aeson blazeHtml Cabal codeBuilder fclabels filepath hashable
haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore

11
pkgs/top-level/haskell-packages.nix
View File

@ -1998,12 +1998,19 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
resourcet = callPackage ../development/libraries/haskell/resourcet {};
restClient = callPackage ../development/libraries/haskell/rest-client {};
restCore = callPackage ../development/libraries/haskell/rest-core {};
restGen = callPackage ../development/libraries/haskell/rest-gen {};
restHappstack = callPackage ../development/libraries/haskell/rest-happstack {};
restTypes = callPackage ../development/libraries/haskell/rest-types {};
restStringmap = callPackage ../development/libraries/haskell/rest-stringmap {};
restSnap = callPackage ../development/libraries/haskell/rest-snap {};
restStringmap = callPackage ../development/libraries/haskell/rest-stringmap {};
restTypes = callPackage ../development/libraries/haskell/rest-types {};
restWai = callPackage ../development/libraries/haskell/rest-wai {};
retry = callPackage ../development/libraries/haskell/retry {};