From 356bd34b866d04e73d566d340c04929d6f3f878d Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Thu, 7 Aug 2014 10:32:39 +0200 Subject: [PATCH 1/2] 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 00000000000..7fe91aad0e7 --- /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 eccb9ceb579..e6227707fce 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 Date: Thu, 7 Aug 2014 17:46:37 +0200 Subject: [PATCH 2/2] 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 7fe91aad0e7..2da08ced4eb 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; }; })