From 31a95a3e32e6a108bfb90fb6115f1baec96dad61 Mon Sep 17 00:00:00 2001 From: Matvey Aksenov Date: Mon, 13 Jun 2022 16:37:44 +0000 Subject: [PATCH] alnost as if this project haven't been maintained for a while --- .gitignore | 1 + README.markdown | 2 -- default.nix | 2 -- package.nix | 11 ----------- shell.nix | 30 ++++++++---------------------- stack.yaml | 2 +- 6 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 default.nix delete mode 100644 package.nix diff --git a/.gitignore b/.gitignore index c87ed4e..2924753 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ dist/ .stack-work/ +stack.yaml.lock codex.tags .gitignore diff --git a/README.markdown b/README.markdown index f3bba7a..340255c 100644 --- a/README.markdown +++ b/README.markdown @@ -1,7 +1,5 @@ envparse ======== -[![Hackage](https://budueba.com/hackage/envparse)](https://hackage.haskell.org/package/envparse) -[![Build Status](https://secure.travis-ci.org/supki/envparse.png?branch=master)](https://travis-ci.org/supki/envparse) [optparse-applicative][0], but for environment variables diff --git a/default.nix b/default.nix deleted file mode 100644 index 63e6c79..0000000 --- a/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ nixpkgs ? import {}, compiler ? "ghc802" }: -nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./package.nix {} diff --git a/package.nix b/package.nix deleted file mode 100644 index e988e78..0000000 --- a/package.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ mkDerivation, base, containers, hspec, stdenv, text }: -mkDerivation { - pname = "envparse"; - version = "0.3.3"; - src = ./.; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers hspec text ]; - homepage = "https://supki.github.io/envparse"; - description = "Parse environment variables"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/shell.nix b/shell.nix index 913ac51..7caa296 100644 --- a/shell.nix +++ b/shell.nix @@ -1,23 +1,9 @@ -{ nixpkgs ? import {}, compiler ? "ghc802" }: let - inherit (nixpkgs) pkgs; - haskell = pkgs.haskell.packages.${compiler}; +{ pkgs ? import {} +, ghc ? pkgs.haskell.compiler.ghc8107 +}: - ghc = haskell.ghcWithPackages(ps: [ - ps.hdevtools ps.doctest ps.hspec-discover ps.hlint ps.ghc-mod - ]); - - this = (import ./default.nix { inherit nixpkgs compiler; }); -in - pkgs.stdenv.mkDerivation rec { - name = this.pname; - buildInputs = [ - ghc - haskell.cabal-install - - pkgs.moreutils - ] ++ this.env.buildInputs; - shellHook = '' - ${this.env.shellHook} - chronic cabal configure --package-db=$NIX_GHC_LIBDIR/package.conf.d --enable-tests - ''; - } +pkgs.mkShell rec { + buildInputs = with pkgs; [ + ghc + ]; +} diff --git a/stack.yaml b/stack.yaml index 170ab9b..34727ca 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-12.4 +resolver: lts-18.28 packages: - '.' allow-newer: true