From 803275ef5ad3750638f0146a2d3dc9c7274a95a8 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Thu, 13 Jun 2019 07:26:47 -0700 Subject: [PATCH] Rename 'pantry' to 'pantry-tmp' --- package.yaml | 2 +- subs/curator/package.yaml | 2 +- subs/pantry/package.yaml | 4 ++-- subs/pantry/test/Pantry/FileSpec.hs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.yaml b/package.yaml index 5021662f8e..585a2c51eb 100644 --- a/package.yaml +++ b/package.yaml @@ -84,7 +84,7 @@ dependencies: - network-uri - open-browser - optparse-applicative -- pantry +- pantry-tmp - path - path-io - persistent diff --git a/subs/curator/package.yaml b/subs/curator/package.yaml index 301784b27d..906b6e51e4 100644 --- a/subs/curator/package.yaml +++ b/subs/curator/package.yaml @@ -8,7 +8,7 @@ dependencies: - base >=4.10 && < 5 - http-client - http-client-tls -- pantry +- pantry-tmp - path - path-io - rio diff --git a/subs/pantry/package.yaml b/subs/pantry/package.yaml index ff256d7513..a4f8187b22 100644 --- a/subs/pantry/package.yaml +++ b/subs/pantry/package.yaml @@ -1,4 +1,4 @@ -name: pantry +name: pantry-tmp version: 0.1.0.0 synopsis: Content addressable Haskell package management description: Please see the README on Github at @@ -130,7 +130,7 @@ tests: source-dirs: test main: Spec.hs dependencies: - - pantry + - pantry-tmp - hspec - exceptions - hedgehog diff --git a/subs/pantry/test/Pantry/FileSpec.hs b/subs/pantry/test/Pantry/FileSpec.hs index 22df566385..c11b4ab5ab 100644 --- a/subs/pantry/test/Pantry/FileSpec.hs +++ b/subs/pantry/test/Pantry/FileSpec.hs @@ -11,8 +11,8 @@ spec = describe "loadCabalFilePath" $ do it "sanity" $ do abs' <- resolveDir' "." (f, name, cabalfp) <- runPantryApp $ loadCabalFilePath abs' - suffix <- parseRelFile "pantry.cabal" + suffix <- parseRelFile "pantry-tmp.cabal" cabalfp `shouldBe` abs' suffix - name' <- parsePackageNameThrowing "pantry" + name' <- parsePackageNameThrowing "pantry-tmp" name `shouldBe` name' void $ f NoPrintWarnings