Skip to content

Update scientific.nix and add haskell-language-server to shell #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update scientific.nix and add haskell-language-server to shell #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions scientific.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
{ mkDerivation, base, binary, bytestring, containers, deepseq
, hashable, integer-gmp, integer-logarithms, QuickCheck, smallcheck, stdenv, tasty
, tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
, text, primitive, criterion
{ mkDerivation, base, binary, bytestring, containers, criterion
, deepseq, hashable, integer-logarithms, lib, primitive, QuickCheck
, smallcheck, tasty, tasty-hunit, tasty-quickcheck
, tasty-smallcheck, text
}:
mkDerivation {
pname = "scientific";
version = "HEAD";
version = "0.3.7.0";
src = ./.;
libraryHaskellDepends = [
base binary bytestring containers deepseq hashable integer-gmp
integer-logarithms text primitive
base binary bytestring containers deepseq hashable
integer-logarithms primitive text
];
testHaskellDepends = [
base bytestring QuickCheck smallcheck tasty tasty-ant-xml
tasty-hunit tasty-quickcheck tasty-smallcheck text

criterion
base binary bytestring QuickCheck smallcheck tasty tasty-hunit
tasty-quickcheck tasty-smallcheck text
];
benchmarkHaskellDepends = [ base criterion ];
homepage = "https://github.com/basvandijk/scientific";
description = "Numbers represented using scientific notation";
license = stdenv.lib.licenses.bsd3;
license = lib.licenses.bsd3;
}
13 changes: 9 additions & 4 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ let
then pkgs.haskellPackages
else pkgs.haskell.packages.${compiler};

drv = haskellPackages.callPackage (import ./scientific.nix) {};

in

if pkgs.lib.inNixShell then drv.env else drv
haskellPackages.shellFor {
packages = hpkgs: [
(hpkgs.callPackage (import ./scientific.nix) {})
];
nativeBuildInputs = [
pkgs.haskell-language-server
pkgs.cabal-install
];
}