From c790672cc244ac4caba1bda3572829a6c6862891 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Sun, 27 Oct 2019 09:48:52 -0700 Subject: move everything to namespace directories --- pack/bs.nix | 39 --------------------------------------- pack/buildeasy.nix | 30 ------------------------------ pack/cmdwave.nix | 30 ------------------------------ pack/default.nix | 12 ------------ pack/duree.nix | 33 --------------------------------- pack/fathom.nix | 18 ------------------ pack/ibb.nix | 31 ------------------------------- pack/nixpkgs.nix | 5 ----- pack/overlay.nix | 3 --- 9 files changed, 201 deletions(-) delete mode 100644 pack/bs.nix delete mode 100644 pack/buildeasy.nix delete mode 100644 pack/cmdwave.nix delete mode 100644 pack/default.nix delete mode 100644 pack/duree.nix delete mode 100644 pack/fathom.nix delete mode 100644 pack/ibb.nix delete mode 100644 pack/nixpkgs.nix delete mode 100644 pack/overlay.nix (limited to 'pack') diff --git a/pack/bs.nix b/pack/bs.nix deleted file mode 100644 index d869dd1..0000000 --- a/pack/bs.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ nixpkgs }: -with nixpkgs; -let - ghc = pkgs.haskell.packages.ghc844.ghcWithPackages (hp: with hp; [ - hinotify - - containers - directory - haskeline - HTTP - mtl - optparse-applicative - parsec - protolude - text - transformers - wl-pprint-text - ]); - entrypoint = "Bs"; -in -stdenv.mkDerivation rec { - name = "bs"; - version = "0"; - src = ../.; - nativeBuildInputs = [ - ghc - ]; - strictDeps = true; - buildPhase = '' - ${ghc}/bin/ghc \ - -iapex -ilore \ - -main-is ${entrypoint} --make apex/${entrypoint}.hs \ - -o bild/${name} - ''; - installPhase = '' - mkdir -p $out/bin - cp bild/${name} $out/bin/${name} - ''; -} diff --git a/pack/buildeasy.nix b/pack/buildeasy.nix deleted file mode 100644 index f5b0963..0000000 --- a/pack/buildeasy.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - # n.b.: 'buildeasy' is already taken by webuildeasy.com. we might want to find - # another name. - # - name = "buildeasy"; - deps = { - both = [ - "miso" - "protolude" - "servant" - "text" - ]; - apex = [ - "acid-state" - "blaze-html" - "blaze-markup" - "bytestring" - "ixset" - "safecopy" - "scotty" - "servant-server" - "text" - ]; - aero = [ - "aeson" - "containers" - "ghcjs-base" - ]; - }; -} diff --git a/pack/cmdwave.nix b/pack/cmdwave.nix deleted file mode 100644 index a26945c..0000000 --- a/pack/cmdwave.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ nixpkgs }: -with nixpkgs; -let - ghc = pkgs.haskell.packages.ghc844.ghcWithPackages (hp: with hp; [ - hinotify - - protolude - pulse-simple - ]); - entrypoint = "Cmdwave"; -in -stdenv.mkDerivation rec { - name = "cmdwave"; - version = "0"; - src = ../.; - nativeBuildInputs = [ - ghc - ]; - strictDeps = true; - buildPhase = '' - ${ghc}/bin/ghc \ - -iapex -ilore \ - -main-is ${entrypoint} --make apex/${entrypoint}.hs \ - -o bild/${name} - ''; - installPhase = '' - mkdir -p $out/bin - cp bild/${name} $out/bin/${name} - ''; -} diff --git a/pack/default.nix b/pack/default.nix deleted file mode 100644 index ece0378..0000000 --- a/pack/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ nixpkgs }: - -with import ../lore/bild.nix; - -{ - bs = import ./bs.nix { inherit nixpkgs; }; - cmdwave = import ./cmdwave.nix { inherit nixpkgs; }; - duree = import ./duree.nix { inherit nixpkgs; }; - fathom = import ./fathom.nix { inherit nixpkgs; }; - ibb = bild ./ibb.nix { inherit nixpkgs; }; - buildeasy = bild ./buildeasy.nix { inherit nixpkgs; }; -} diff --git a/pack/duree.nix b/pack/duree.nix deleted file mode 100644 index 84b82da..0000000 --- a/pack/duree.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ nixpkgs }: -with nixpkgs; -let - ghc = pkgs.haskell.packages.ghc844.ghcWithPackages (hp: with hp; [ - hinotify - - mongoDB - mtl - protolude - text - transformers - ]); - entrypoint = "Duree"; -in -stdenv.mkDerivation rec { - name = "duree"; - version = "0"; - src = ../.; - nativeBuildInputs = [ - ghc - ]; - strictDeps = true; - buildPhase = '' - ${ghc}/bin/ghc \ - -iapex -ilore \ - -main-is ${entrypoint} --make apex/${entrypoint}.hs \ - -o bild/${name} - ''; - installPhase = '' - mkdir -p $out/bin - cp bild/${name} $out/bin/${name} - ''; -} diff --git a/pack/fathom.nix b/pack/fathom.nix deleted file mode 100644 index a845eb6..0000000 --- a/pack/fathom.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ nixpkgs }: -with nixpkgs; -stdenv.mkDerivation rec { - name = "fathom-v${version}"; - version = "1.2.1"; - src = builtins.fetchurl { - url = "https://github.com/usefathom/fathom/releases/download/v${version}/fathom_${version}_linux_amd64.tar.gz"; - sha256 = "0sfpxh2xrvz992k0ynib57zzpcr0ikga60552i14m13wppw836nh"; - }; - sourceRoot = "."; - dontBuild = true; - installPhase = '' - mkdir -p $out/bin - cp fathom $out/bin - cp LICENSE $out - cp README.md $out - ''; -} diff --git a/pack/ibb.nix b/pack/ibb.nix deleted file mode 100644 index 12f8eb4..0000000 --- a/pack/ibb.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - name = "ibb"; - deps = { - both = [ - "clay" - "miso" - "protolude" - "servant" - "text" - ]; - apex = [ - "MonadRandom" - "acid-state" - "blaze-html" - "blaze-markup" - "bytestring" - "githash" - "ixset" - "random" - "safecopy" - "scotty" - "servant-server" - "text" - ]; - aero = [ - "aeson" - "containers" - "ghcjs-base" - ]; - }; -} diff --git a/pack/nixpkgs.nix b/pack/nixpkgs.nix deleted file mode 100644 index 5d8dc56..0000000 --- a/pack/nixpkgs.nix +++ /dev/null @@ -1,5 +0,0 @@ -# generated with ~/bin/nix-pin -{ - url = "https://github.com/NixOS/nixpkgs/archive/0715f2f1a9b3a1c15ddf3f7386a6d58c9a1bbe2d.tar.gz"; - sha256 = "0awm087hnsx0x5phxna5a0cm9ir6m7vha94b0q0zq5lb24clgr6s"; -} diff --git a/pack/overlay.nix b/pack/overlay.nix deleted file mode 100644 index b19eeb7..0000000 --- a/pack/overlay.nix +++ /dev/null @@ -1,3 +0,0 @@ -self: super: - -import ./default.nix { nixpkgs = super; } -- cgit v1.2.3