From 10feef08ae5859400a0adca9628b7783f7f56156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 6 Aug 2014 21:43:10 +0100
Subject: [PATCH 1/3] Add derivation for Sodium (Haskell FRP library)
---
.../libraries/haskell/sodium/default.nix | 15 +++++++++++++++
pkgs/top-level/haskell-packages.nix | 2 ++
2 files changed, 17 insertions(+)
create mode 100644 pkgs/development/libraries/haskell/sodium/default.nix
diff --git a/pkgs/development/libraries/haskell/sodium/default.nix b/pkgs/development/libraries/haskell/sodium/default.nix
new file mode 100644
index 000000000000..f27c5d0e51c0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sodium/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+ pname = "sodium";
+ version = "0.10.0.2";
+ sha256 = "0rm1blh0br4gdnqb6ixvql6nrxzcjxjkwp4lmqmsisa2b68gbzqy";
+ buildDepends = [ mtl ];
+ meta = {
+ description = "Sodium Reactive Programming (FRP) System";
+ 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 eccb9ceb5796..1a52b22d52e9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2149,6 +2149,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
socketIo = callPackage ../development/libraries/haskell/socket-io {};
+ sodium = callPackage ../development/libraries/haskell/sodium {};
+
sparse = callPackage ../development/libraries/haskell/sparse {};
spawn = callPackage ../development/libraries/haskell/spawn {};
From 356bd34b866d04e73d566d340c04929d6f3f878d Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Thu, 7 Aug 2014 10:32:39 +0200
Subject: [PATCH 2/3] new package: haskell xorshift
---
.../libraries/haskell/xorshift/default.nix | 15 +++++++++++++++
pkgs/top-level/haskell-packages.nix | 2 ++
2 files changed, 17 insertions(+)
create mode 100644 pkgs/development/libraries/haskell/xorshift/default.nix
diff --git a/pkgs/development/libraries/haskell/xorshift/default.nix b/pkgs/development/libraries/haskell/xorshift/default.nix
new file mode 100644
index 000000000000..7fe91aad0e70
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xorshift/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, random, time }:
+
+cabal.mkDerivation (self: {
+ pname = "xorshift";
+ version = "2.0.1";
+ sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf";
+ buildDepends = [ random time ];
+ meta = {
+ description = "Haskell implementation of the xorshift random generator";
+ license = "LGPL";
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index eccb9ceb5796..e6227707fce5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2703,6 +2703,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
+ xorshift = callPackage ../development/libraries/haskell/xorshift {};
+
xournalParser = callPackage ../development/libraries/haskell/xournal-parser {};
xournalTypes = callPackage ../development/libraries/haskell/xournal-types {};
From 85145ab6669b6be7bc4a9b5db87d8d28d46abe13 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Thu, 7 Aug 2014 17:46:37 +0200
Subject: [PATCH 3/3] Fixed license
---
pkgs/development/libraries/haskell/xorshift/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/haskell/xorshift/default.nix b/pkgs/development/libraries/haskell/xorshift/default.nix
index 7fe91aad0e70..2da08ced4ebd 100644
--- a/pkgs/development/libraries/haskell/xorshift/default.nix
+++ b/pkgs/development/libraries/haskell/xorshift/default.nix
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
buildDepends = [ random time ];
meta = {
description = "Haskell implementation of the xorshift random generator";
- license = "LGPL";
+ license = self.stdenv.lib.licenses.lgpl2;
platforms = self.ghc.meta.platforms;
};
})