From cff5ccf62e1a5f27d9104ffa91a8080df9d70faa Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Sun, 16 Nov 2014 01:28:41 -0600 Subject: [PATCH 1/4] new package: concurrent-supply --- .../haskell/concurrent-supply/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/concurrent-supply/default.nix diff --git a/pkgs/development/libraries/haskell/concurrent-supply/default.nix b/pkgs/development/libraries/haskell/concurrent-supply/default.nix new file mode 100644 index 00000000000..7b91f2f018b --- /dev/null +++ b/pkgs/development/libraries/haskell/concurrent-supply/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hashable }: + +cabal.mkDerivation (self: { + pname = "concurrent-supply"; + version = "0.1.7"; + sha256 = "0crg4rm5wibw9h6lmsi43d280xg1xr9xbgqr9s4inxq7x0yyn68c"; + buildDepends = [ hashable ]; + meta = { + homepage = "http://github.com/ekmett/concurrent-supply/"; + description = "A fast concurrent unique identifier supply with a pure API"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8227c52d4b2..cc0e68167b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -502,6 +502,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in concurrentExtra = callPackage ../development/libraries/haskell/concurrent-extra {}; + concurrentSupply = callPackage ../development/libraries/haskell/concurrent-supply {}; + converge = callPackage ../development/libraries/haskell/converge {}; cookie = callPackage ../development/libraries/haskell/cookie {}; From e476a927a7ef74a15d3c167412436e76088c0787 Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Sun, 16 Nov 2014 01:38:56 -0600 Subject: [PATCH 2/4] new package: clash-prelude --- .../libraries/haskell/clash-prelude/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/clash-prelude/default.nix diff --git a/pkgs/development/libraries/haskell/clash-prelude/default.nix b/pkgs/development/libraries/haskell/clash-prelude/default.nix new file mode 100644 index 00000000000..b463b957e87 --- /dev/null +++ b/pkgs/development/libraries/haskell/clash-prelude/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, dataDefault, thLift }: + +cabal.mkDerivation (self: { + pname = "clash-prelude"; + version = "0.6.0.1"; + sha256 = "0d929g7js15aagd1pa2lfbhd1yiykd0ngp6fv522yhy1yyijn1l7"; + buildDepends = [ dataDefault thLift ]; + meta = { + homepage = "http://christiaanb.github.io/clash2/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cc0e68167b5..bb0f310bcf2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -424,6 +424,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in circlePacking = callPackage ../development/libraries/haskell/circle-packing {}; + clashPrelude = callPackage ../development/libraries/haskell/clash-prelude {}; + classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {}; classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {}; From a82e72a5c540f9e95526addeb42558749d5d9180 Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Sun, 16 Nov 2014 01:39:42 -0600 Subject: [PATCH 3/4] new package: clash-lib --- .../libraries/haskell/clash-lib/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/haskell/clash-lib/default.nix diff --git a/pkgs/development/libraries/haskell/clash-lib/default.nix b/pkgs/development/libraries/haskell/clash-lib/default.nix new file mode 100644 index 00000000000..40860d38911 --- /dev/null +++ b/pkgs/development/libraries/haskell/clash-lib/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, concurrentSupply, contravariant +, deepseq, errors, fgl, filepath, hashable, lens, ListLike, mtl +, text, time, transformers, unbound, unorderedContainers +, uuParsinglib, wlPprintText +}: + +cabal.mkDerivation (self: { + pname = "clash-lib"; + version = "0.4"; + sha256 = "1c3bxjm356cs7wf49zlazbv44bw06rs81akmsfzkfccrl7gjy7yc"; + buildDepends = [ + aeson attoparsec concurrentSupply contravariant deepseq errors fgl + filepath hashable lens ListLike mtl text time transformers unbound + unorderedContainers uuParsinglib wlPprintText + ]; + meta = { + homepage = "http://christiaanb.github.io/clash2"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bb0f310bcf2..5080cca7f0b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -424,6 +424,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in circlePacking = callPackage ../development/libraries/haskell/circle-packing {}; + clashLib = callPackage ../development/libraries/haskell/clash-lib {}; + clashPrelude = callPackage ../development/libraries/haskell/clash-prelude {}; classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {}; From 73b7bf67731cb95310af0429cc7982d03c84e8f1 Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Sun, 16 Nov 2014 01:40:35 -0600 Subject: [PATCH 4/4] new package: clash-ghc --- .../compilers/clash-ghc/default.nix | 33 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/compilers/clash-ghc/default.nix diff --git a/pkgs/development/compilers/clash-ghc/default.nix b/pkgs/development/compilers/clash-ghc/default.nix new file mode 100644 index 00000000000..a7e87b78dc7 --- /dev/null +++ b/pkgs/development/compilers/clash-ghc/default.nix @@ -0,0 +1,33 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bifunctors, clashLib, clashPrelude, filepath, ghcPaths +, hashable, haskeline, lens, makeWrapper, mtl, text, transformers, unbound +, unorderedContainers, thLift +}: + +cabal.mkDerivation (self: { + pname = "clash-ghc"; + version = "0.4"; + sha256 = "0pyv8snrmy7x9gv6xna5rd5chacrdvczcjs7854b80pifhag5c2g"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + bifunctors clashLib clashPrelude filepath ghcPaths hashable + haskeline lens mtl text transformers unbound unorderedContainers + thLift + ]; + buildTools = [ makeWrapper ]; + postInstall = '' + echo ${clashPrelude} + wrapProgram $out/bin/clash \ + --add-flags "-package-db ${clashPrelude}/lib/ghc-${self.ghc.version}/package.conf.d/${clashPrelude.fname}.installedconf" \ + --add-flags "-package-db ${thLift}/lib/ghc-${self.ghc.version}/package.conf.d/${thLift.fname}.installedconf" \ + --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-package-db\")" + ''; + meta = { + homepage = "http://christiaanb.github.io/clash2"; + description = "CAES Language for Synchronous Hardware"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5080cca7f0b..c4dfb83c741 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2957,6 +2957,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in arbtt = callPackage ../applications/misc/arbtt {}; + clashGhc = callPackage ../development/compilers/clash-ghc {}; + idris_plain = callPackage ../development/compilers/idris {}; idris = callPackage ../development/compilers/idris/wrapper.nix {};