From 0f8e414c10a659dc219f8b6a038d031a7b24e1f5 Mon Sep 17 00:00:00 2001 From: soulomoon Date: Sun, 21 Aug 2022 01:36:58 +0800 Subject: [PATCH 1/9] accommodate with store's new addToStore API --- .vscode/settings.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..12b229e19 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "nixEnvSelector.nixFile": "${workspaceRoot}/shell.nix" +} \ No newline at end of file From 80fa536a804ff258f678075b01684bee588ed9f6 Mon Sep 17 00:00:00 2001 From: soulomoon Date: Sun, 6 Feb 2022 03:15:39 +0800 Subject: [PATCH 2/9] compute outputpath of getURL --- src/Nix/Effects.hs | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/Nix/Effects.hs b/src/Nix/Effects.hs index 24eb121cf..2431b9d75 100644 --- a/src/Nix/Effects.hs +++ b/src/Nix/Effects.hs @@ -6,6 +6,7 @@ {-# language GeneralizedNewtypeDeriving #-} {-# language UndecidableInstances #-} {-# language PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@ +-- {-# language OverloadedStrings#-} {-# options_ghc -Wno-orphans #-} @@ -19,6 +20,8 @@ import qualified Nix.Prelude as Prelude import GHC.Exception ( ErrorCall(ErrorCall) ) import qualified Data.HashSet as HS import qualified Data.Text as Text +import qualified Data.ByteString as B +import qualified Data.ByteString.Lazy as BL import Network.HTTP.Client hiding ( path, Proxy ) import Network.HTTP.Client.TLS import Network.HTTP.Types @@ -287,6 +290,8 @@ class default getURL :: (MonadTrans t, MonadHttp m', m ~ t m') => Text -> m (Either ErrorCall StorePath) getURL = lift . getURL +baseNameOf :: Text -> Text +baseNameOf a = Text.takeWhileEnd (/='/') $ Text.dropWhileEnd (=='/') a -- ** Instances @@ -301,17 +306,22 @@ instance MonadHttp IO where (newManager defaultManagerSettings) newTlsManager (secure req) - -- print req response <- httpLbs (req { method = "GET" }) manager let status = statusCode $ responseStatus response - pure $ Left $ ErrorCall $ - bool - ("fail, got " <> show status <> " when fetching url = ") - -- do - -- let bstr = responseBody response - "success in downloading but hnix-store is not yet ready; url = " - (status == 200) - <> urlstr + let body = responseBody response + let digest::Hash.Digest Hash.SHA256 = Hash.hash $ (B.concat . BL.toChunks) body + let name = baseNameOf url + bool + (pure $ Left $ ErrorCall $ "fail, got " <> show status <> " when fetching url = " <> urlstr) + -- using addTextToStore' result in different hash from the nix-instantiate. + -- have no idea why. + -- (addTextToStore' name (decodeUtf8 body) mempty False) + -- the current computation of hash is teh same with nix-instantiate. + (either (\ err -> pure $ Left $ ErrorCall $ "name: '" <> toString name <> "' is not a valid path name: " <> err) + (pure . Right. toStorePath . Store.makeFixedOutputPath "/nix/store" False digest) + (Store.makeStorePathName name)) + (status == 200) + deriving instance @@ -391,7 +401,9 @@ class default addTextToStore' :: (MonadTrans t, MonadStore m', m ~ t m') => StorePathName -> Text -> Store.StorePathSet -> RepairFlag -> m (Either ErrorCall StorePath) addTextToStore' a b c d = lift $ addTextToStore' a b c d - +-- conversion from Store.StorePath to Effects.StorePath, different type with the same name. +toStorePath :: Store.StorePath -> StorePath +toStorePath = StorePath . coerce . decodeUtf8 @FilePath @ByteString . Store.storePathToRawFilePath -- *** Instances instance MonadStore IO where @@ -405,7 +417,7 @@ instance MonadStore IO where res <- Store.Remote.runStore $ Store.Remote.addToStore @Hash.SHA256 pathName (Store.Nar.dumpPath $ coerce path) recursive repair either Left -- err - (pure . StorePath . coerce . decodeUtf8 @FilePath @ByteString . Store.storePathToRawFilePath) -- store path + (pure . toStorePath) -- store path <$> parseStoreResult "addToStore" res ) (Store.makeStorePathName name) @@ -415,7 +427,7 @@ instance MonadStore IO where res <- Store.Remote.runStore $ Store.Remote.addTextToStore name text references repair either Left -- err - (pure . StorePath . coerce . decodeUtf8 @FilePath @ByteString . Store.storePathToRawFilePath) -- path + (pure . toStorePath) -- path <$> parseStoreResult "addTextToStore" res From e077b4fe3d528d4a3de4bd0d134efff98b88f0fa Mon Sep 17 00:00:00 2001 From: soulomoon Date: Sun, 6 Feb 2022 03:18:07 +0800 Subject: [PATCH 3/9] fix typo --- src/Nix/Effects.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Nix/Effects.hs b/src/Nix/Effects.hs index 2431b9d75..13c56eb36 100644 --- a/src/Nix/Effects.hs +++ b/src/Nix/Effects.hs @@ -316,7 +316,7 @@ instance MonadHttp IO where -- using addTextToStore' result in different hash from the nix-instantiate. -- have no idea why. -- (addTextToStore' name (decodeUtf8 body) mempty False) - -- the current computation of hash is teh same with nix-instantiate. + -- the current computation of hash is the same with nix-instantiate. (either (\ err -> pure $ Left $ ErrorCall $ "name: '" <> toString name <> "' is not a valid path name: " <> err) (pure . Right. toStorePath . Store.makeFixedOutputPath "/nix/store" False digest) (Store.makeStorePathName name)) From fa238a10e5271c38924b01795f03a8e33aab5cfc Mon Sep 17 00:00:00 2001 From: soulomoon Date: Tue, 23 Aug 2022 03:18:08 +0800 Subject: [PATCH 4/9] modify addToStore to enable add text as nar file --- src/Nix/Builtins.hs | 2 +- src/Nix/Effects.hs | 42 +++++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/Nix/Builtins.hs b/src/Nix/Builtins.hs index a2552f12a..4ff48ed1f 100644 --- a/src/Nix/Builtins.hs +++ b/src/Nix/Builtins.hs @@ -912,7 +912,7 @@ pathNix arg = name <- toText <$> attrGetOr (takeFileName path) (fmap (coerce . toString) . fromStringNoContext) "name" attrs recursive <- attrGetOr True pure "recursive" attrs - Right (coerce . toText . coerce @StorePath @String -> s) <- addToStore name path recursive False + Right (coerce . toText . coerce @StorePath @String -> s) <- addToStore name (NarFile path) recursive False -- TODO: Ensure that s matches sha256 when not empty pure $ NVStr $ mkNixStringWithSingletonContext (StringContext DirectPath s) s where diff --git a/src/Nix/Effects.hs b/src/Nix/Effects.hs index 13c56eb36..9d4ce7888 100644 --- a/src/Nix/Effects.hs +++ b/src/Nix/Effects.hs @@ -6,7 +6,6 @@ {-# language GeneralizedNewtypeDeriving #-} {-# language UndecidableInstances #-} {-# language PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@ --- {-# language OverloadedStrings#-} {-# options_ghc -Wno-orphans #-} @@ -39,7 +38,9 @@ import System.Process import qualified System.Nix.Store.Remote as Store.Remote import qualified System.Nix.StorePath as Store +import qualified System.Nix.ReadonlyStore as Store import qualified System.Nix.Nar as Store.Nar +import qualified System.Nix.Nar as Nix.Nar -- | A path into the nix store newtype StorePath = StorePath Path @@ -293,6 +294,10 @@ class baseNameOf :: Text -> Text baseNameOf a = Text.takeWhileEnd (/='/') $ Text.dropWhileEnd (=='/') a +-- conversion from Store.StorePath to Effects.StorePath, different type with the same name. +toStorePath :: Store.StorePath -> StorePath +toStorePath = StorePath . coerce . decodeUtf8 @FilePath @ByteString . Store.storePathToRawFilePath + -- ** Instances instance MonadHttp IO where @@ -309,17 +314,13 @@ instance MonadHttp IO where response <- httpLbs (req { method = "GET" }) manager let status = statusCode $ responseStatus response let body = responseBody response - let digest::Hash.Digest Hash.SHA256 = Hash.hash $ (B.concat . BL.toChunks) body + -- let digest::Hash.Digest Hash.SHA256 = Hash.hash $ (B.concat . BL.toChunks) body let name = baseNameOf url bool (pure $ Left $ ErrorCall $ "fail, got " <> show status <> " when fetching url = " <> urlstr) - -- using addTextToStore' result in different hash from the nix-instantiate. - -- have no idea why. - -- (addTextToStore' name (decodeUtf8 body) mempty False) - -- the current computation of hash is the same with nix-instantiate. - (either (\ err -> pure $ Left $ ErrorCall $ "name: '" <> toString name <> "' is not a valid path name: " <> err) - (pure . Right. toStorePath . Store.makeFixedOutputPath "/nix/store" False digest) - (Store.makeStorePathName name)) + -- using addTextToStore' result in different hash from the addToStore. + -- see https://github.com/haskell-nix/hnix/pull/1051#issuecomment-1031380804 + (addToStore name (NarText $ toStrict body) False False) (status == 200) @@ -382,17 +383,23 @@ type StorePathName = Text type PathFilter m = Path -> m Bool type StorePathSet = HS.HashSet StorePath +data NarContent = NarFile Path | NarText ByteString +-- convert NarContent to NarSource needed in the store API +toNarSource :: MonadIO m => NarContent -> Nix.Nar.NarSource m +toNarSource (NarFile path) = Nix.Nar.dumpPath $ coerce path +toNarSource (NarText text) = Nix.Nar.dumpString text + -- ** @class MonadStore m@ class Monad m => MonadStore m where - -- | Copy the contents of a local path to the store. The resulting store + -- | Copy the contents of a local path(Or pure text) to the store. The resulting store -- path is returned. Note: This does not support yet support the expected -- `filter` function that allows excluding some files. - addToStore :: StorePathName -> Path -> RecursiveFlag -> RepairFlag -> m (Either ErrorCall StorePath) - default addToStore :: (MonadTrans t, MonadStore m', m ~ t m') => StorePathName -> Path -> RecursiveFlag -> RepairFlag -> m (Either ErrorCall StorePath) + addToStore :: StorePathName -> NarContent -> RecursiveFlag -> RepairFlag -> m (Either ErrorCall StorePath) + default addToStore :: (MonadTrans t, MonadStore m', m ~ t m') => StorePathName -> NarContent -> RecursiveFlag -> RepairFlag -> m (Either ErrorCall StorePath) addToStore a b c d = lift $ addToStore a b c d -- | Like addToStore, but the contents written to the output path is a @@ -401,20 +408,17 @@ class default addTextToStore' :: (MonadTrans t, MonadStore m', m ~ t m') => StorePathName -> Text -> Store.StorePathSet -> RepairFlag -> m (Either ErrorCall StorePath) addTextToStore' a b c d = lift $ addTextToStore' a b c d --- conversion from Store.StorePath to Effects.StorePath, different type with the same name. -toStorePath :: Store.StorePath -> StorePath -toStorePath = StorePath . coerce . decodeUtf8 @FilePath @ByteString . Store.storePathToRawFilePath + -- *** Instances instance MonadStore IO where - addToStore name path recursive repair = + addToStore name content recursive repair = either (\ err -> pure $ Left $ ErrorCall $ "String '" <> show name <> "' is not a valid path name: " <> err) (\ pathName -> do - -- TODO: redesign the filter parameter - res <- Store.Remote.runStore $ Store.Remote.addToStore @Hash.SHA256 pathName (Store.Nar.dumpPath $ coerce path) recursive repair + res <- Store.Remote.runStore $ Store.Remote.addToStore @Hash.SHA256 pathName (toNarSource content) recursive repair either Left -- err (pure . toStorePath) -- store path @@ -455,7 +459,7 @@ addPath p = either throwError pure - =<< addToStore (fromString $ coerce takeFileName p) p True False + =<< addToStore (fromString $ coerce takeFileName p) (NarFile p) True False toFile_ :: (Framed e m, MonadStore m) => Path -> Text -> m StorePath toFile_ p contents = addTextToStore (fromString $ coerce p) contents mempty False From 30c864dfe3c1bad8c53bd0a7691fed284e2b66e6 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 23 Aug 2022 03:20:27 +0800 Subject: [PATCH 5/9] Delete settings.json --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 12b229e19..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "nixEnvSelector.nixFile": "${workspaceRoot}/shell.nix" -} \ No newline at end of file From 9c8e4da213c78168af82346397ed339944851db4 Mon Sep 17 00:00:00 2001 From: soulomoon Date: Tue, 23 Aug 2022 03:30:23 +0800 Subject: [PATCH 6/9] Effect.hs: remove redundant import --- src/Nix/Effects.hs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Nix/Effects.hs b/src/Nix/Effects.hs index 9d4ce7888..92b53e4be 100644 --- a/src/Nix/Effects.hs +++ b/src/Nix/Effects.hs @@ -19,8 +19,6 @@ import qualified Nix.Prelude as Prelude import GHC.Exception ( ErrorCall(ErrorCall) ) import qualified Data.HashSet as HS import qualified Data.Text as Text -import qualified Data.ByteString as B -import qualified Data.ByteString.Lazy as BL import Network.HTTP.Client hiding ( path, Proxy ) import Network.HTTP.Client.TLS import Network.HTTP.Types @@ -38,9 +36,7 @@ import System.Process import qualified System.Nix.Store.Remote as Store.Remote import qualified System.Nix.StorePath as Store -import qualified System.Nix.ReadonlyStore as Store import qualified System.Nix.Nar as Store.Nar -import qualified System.Nix.Nar as Nix.Nar -- | A path into the nix store newtype StorePath = StorePath Path @@ -385,9 +381,9 @@ type StorePathSet = HS.HashSet StorePath data NarContent = NarFile Path | NarText ByteString -- convert NarContent to NarSource needed in the store API -toNarSource :: MonadIO m => NarContent -> Nix.Nar.NarSource m -toNarSource (NarFile path) = Nix.Nar.dumpPath $ coerce path -toNarSource (NarText text) = Nix.Nar.dumpString text +toNarSource :: MonadIO m => NarContent -> Store.Nar.NarSource m +toNarSource (NarFile path) = Store.Nar.dumpPath $ coerce path +toNarSource (NarText text) = Store.Nar.dumpString text -- ** @class MonadStore m@ From 83f1b9e18864eb7e49ff9a281ea29ef07e22317d Mon Sep 17 00:00:00 2001 From: soulomoon Date: Tue, 23 Aug 2022 04:00:33 +0800 Subject: [PATCH 7/9] Test: unmask fetchurl --- tests/EvalTests.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/EvalTests.hs b/tests/EvalTests.hs index c0e9c62ae..462472495 100644 --- a/tests/EvalTests.hs +++ b/tests/EvalTests.hs @@ -662,7 +662,7 @@ sameFreeVars a xs = assertEqual mempty (S.fromList xs) free' maskedFiles :: [Path] -maskedFiles = one "builtins.fetchurl-01.nix" +maskedFiles = [] testDir :: Path testDir = "tests/eval-compare" From 556bd21b60b1bf3682ecd21c729df52b01f5fc4e Mon Sep 17 00:00:00 2001 From: soulomoon Date: Thu, 25 Aug 2022 19:32:10 +0800 Subject: [PATCH 8/9] ChangeLog update --- .vscode/configurationCache.log | 1 + .vscode/dryrun.log | 5 + .vscode/targets.log | 437 ++++++++++++++++++++++++ ChangeLog.md | 7 + real-store/nix/var/nix/db/big-lock | 0 real-store/nix/var/nix/db/db.sqlite | Bin 0 -> 45056 bytes real-store/nix/var/nix/db/reserved | 1 + real-store/nix/var/nix/db/schema | 1 + real-store/nix/var/nix/gcroots/profiles | 1 + src/Nix/Effects.hs | 7 +- 10 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 .vscode/configurationCache.log create mode 100644 .vscode/dryrun.log create mode 100644 .vscode/targets.log create mode 100644 real-store/nix/var/nix/db/big-lock create mode 100644 real-store/nix/var/nix/db/db.sqlite create mode 100644 real-store/nix/var/nix/db/reserved create mode 100644 real-store/nix/var/nix/db/schema create mode 120000 real-store/nix/var/nix/gcroots/profiles diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log new file mode 100644 index 000000000..14d906f07 --- /dev/null +++ b/.vscode/configurationCache.log @@ -0,0 +1 @@ +{"buildTargets":["all","default.nix"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}} \ No newline at end of file diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log new file mode 100644 index 000000000..a206c0230 --- /dev/null +++ b/.vscode/dryrun.log @@ -0,0 +1,5 @@ +make --dry-run --always-make --keep-going --print-directory +make: Entering directory '/Users/ares/src/hnix' +cabal2nix --shell . > default.nix +make: Leaving directory '/Users/ares/src/hnix' + diff --git a/.vscode/targets.log b/.vscode/targets.log new file mode 100644 index 000000000..428da0588 --- /dev/null +++ b/.vscode/targets.log @@ -0,0 +1,437 @@ +make all --print-data-base --no-builtin-variables --no-builtin-rules --question +# GNU Make 4.3 +# Built for aarch64-apple-darwin21.3.0 +# Copyright (C) 1988-2020 Free Software Foundation, Inc. +# License GPLv3+: GNU GPL version 3 or later +# This is free software: you are free to change and redistribute it. +# There is NO WARRANTY, to the extent permitted by law. + +# Make data base, printed on Tue Aug 23 03:28:33 2022 + +# Variables + +# environment +ZPLUG_PROTOCOL = HTTPS +# environment +AS = as +# environment +out = /nix/store/17g9fcqzw8r8nhn2lnxrxqq91lmzqp42-ghc-shell-for-hnix-0.16.0 +# environment +LC_ALL = C +# environment +AR = ar +# environment +shellHook = +# environment +HOMEBREW_PREFIX = /opt/homebrew +# environment +TEMPDIR = /tmp +# environment +_ZPLUG_AWKPATH = /nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/misc/contrib +# environment +ZPLUG_HOME = /Users/ares/.zplug +# environment +TMPDIR = /tmp +# environment +XPC_SERVICE_NAME = application.com.microsoft.VSCode.48757907.48757913 +# environment +doInstallCheck = +# environment +VSCODE_CWD = / +# environment +NIX_CFLAGS_COMPILE = -frandom-seed=17g9fcqzw8 -isystem /nix/store/5kp3dd4hgw1yvc5gb7bcpl0mm87rxqjm-libiconv-50/include -isystem /nix/store/iqywfqxdgnb1mrc9kl6xc654xshxkyvc-libcxx-11.1.0-dev/include -isystem /nix/store/3q72n32dpglbcphc6877nvd2762ig784-libcxxabi-11.1.0-dev/include -iframework /nix/store/7hvwkm22phjfiw65z8fhs9yzwaggc019-apple-framework-CoreFoundation-11.0.0/Library/Frameworks -isystem /nix/store/isp9fyx2cijss6a08bzhafvhgi6jhqd0-libobjc-11.0.0/include -isystem /nix/store/5kp3dd4hgw1yvc5gb7bcpl0mm87rxqjm-libiconv-50/include -isystem /nix/store/iqywfqxdgnb1mrc9kl6xc654xshxkyvc-libcxx-11.1.0-dev/include -isystem /nix/store/3q72n32dpglbcphc6877nvd2762ig784-libcxxabi-11.1.0-dev/include -iframework /nix/store/7hvwkm22phjfiw65z8fhs9yzwaggc019-apple-framework-CoreFoundation-11.0.0/Library/Frameworks -isystem /nix/store/isp9fyx2cijss6a08bzhafvhgi6jhqd0-libobjc-11.0.0/include +# environment +PERIOD = 30 +# environment +CAML_LD_LIBRARY_PATH = /Users/ares/.opam/default/lib/stublibs:/opt/homebrew/lib/ocaml/stublibs:/opt/homebrew/lib/ocaml +# default +MAKE_COMMAND := make +# environment +strictDeps = +# environment +FPATH = /nix/store/qpwcj7i2gmy3c4rzlkl1khjnx9zmww9m-oh-my-zsh-2022-04-24/share/oh-my-zsh/plugins/fasd:/nix/store/qpwcj7i2gmy3c4rzlkl1khjnx9zmww9m-oh-my-zsh-2022-04-24/share/oh-my-zsh/plugins/brew:/nix/store/qpwcj7i2gmy3c4rzlkl1khjnx9zmww9m-oh-my-zsh-2022-04-24/share/oh-my-zsh/functions:/nix/store/qpwcj7i2gmy3c4rzlkl1khjnx9zmww9m-oh-my-zsh-2022-04-24/share/oh-my-zsh/completions:/Users/ares/.cache/oh-my-zsh/completions:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/autoload:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/misc/completions:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/sources:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/utils:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/job:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/log:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/io:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/core:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/base:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/autoload/commands:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/autoload/options:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/autoload/tags:/usr/local/share/zsh/site-functions:/usr/share/zsh/site-functions:/usr/share/zsh/5.8.1/functions:/nix/var/nix/profiles/default/share/zsh/site-functions:/nix/var/nix/profiles/default/share/zsh/5.8.1/functions:/nix/var/nix/profiles/default/share/zsh/vendor-completions:/Users/ares/.nix-profile/share/zsh/site-functions:/Users/ares/.nix-profile/share/zsh/5.8.1/functions:/Users/ares/.nix-profile/share/zsh/vendor-completions:/Users/ares/.zplug/repos/zsh-users/zsh-completions/src +# environment +_ZPLUG_PREZTO = sorin-ionescu/prezto +# environment +__CFBundleIdentifier = com.microsoft.VSCode +# automatic +@D = $(patsubst %/,%,$(dir $@)) +# environment +LD_DYLD_PATH = /usr/lib/dyld +# environment +LOCALE_ARCHIVE = +# environment +ZPLUG_CACHE_DIR = /Users/ares/.zplug/cache +# environment +VSCODE_HANDLES_UNCAUGHT_ERRORS = true +# default +.VARIABLES := +# environment +COMMAND_MODE = unix2003 +# environment +PWD = /Users/ares/src/hnix +# automatic +%D = $(patsubst %/,%,$(dir $%)) +# environment +ZPLUG_ERROR_LOG = /Users/ares/.zplug/.error_log +# environment +SOURCE_DATE_EPOCH = 315532800 +# environment +__darwinAllowLocalNetworking = +# environment +LSCOLORS = Gxfxcxdxbxegedabagacad +# environment +ZPLUG_REPOS = /Users/ares/.zplug/repos +# environment +XDG_DATA_DIRS = /nix/store/rrjsd6ss649j6p13bwifn4m6rkp3g39c-ghc-8.10.7-with-packages/share:/nix/store/bq11bg9m07gpm666jq847vfxwvmmkgdg-cabal-install-3.6.2.0/share +# environment +NIX_LDFLAGS = -liconv -L/nix/store/z0j1va3hidksar7d2xx2g8wf7wr9yz6k-ncurses-6.3/lib -L/nix/store/jk3bliag6ss1wv1l0sgg6fc94cf5fill-libffi-3.4.2/lib -L/nix/store/9p8s9da0s08rynmbkcsqsj2v8mbglisv-gmp-with-cxx-6.2.1/lib -L/nix/store/5kp3dd4hgw1yvc5gb7bcpl0mm87rxqjm-libiconv-50/lib -L/nix/store/sg09c88mzmgrnb7n9xxpc6vp33i7m8mh-libcxx-11.1.0/lib -L/nix/store/0cb2416mc6y70aig1zcx21qcf547nyhp-libcxxabi-11.1.0/lib -L/nix/store/cj4znhcdaw5iicqhcmwnav53z5wdsr36-compiler-rt-libc-11.1.0/lib -L/nix/store/isp9fyx2cijss6a08bzhafvhgi6jhqd0-libobjc-11.0.0/lib -L/nix/store/z0j1va3hidksar7d2xx2g8wf7wr9yz6k-ncurses-6.3/lib -L/nix/store/jk3bliag6ss1wv1l0sgg6fc94cf5fill-libffi-3.4.2/lib -L/nix/store/9p8s9da0s08rynmbkcsqsj2v8mbglisv-gmp-with-cxx-6.2.1/lib -L/nix/store/5kp3dd4hgw1yvc5gb7bcpl0mm87rxqjm-libiconv-50/lib -L/nix/store/sg09c88mzmgrnb7n9xxpc6vp33i7m8mh-libcxx-11.1.0/lib -L/nix/store/0cb2416mc6y70aig1zcx21qcf547nyhp-libcxxabi-11.1.0/lib -L/nix/store/cj4znhcdaw5iicqhcmwnav53z5wdsr36-compiler-rt-libc-11.1.0/lib -L/nix/store/isp9fyx2cijss6a08bzhafvhgi6jhqd0-libobjc-11.0.0/lib +# environment +PATH_LOCALE = /nix/store/4cs71wv0i3p21vkxv8s9yp73rnhg4s64-adv_cmds-119-locale/share/locale +# automatic +^D = $(patsubst %/,%,$(dir $^)) +# automatic +%F = $(notdir $%) +# environment +NIX_GHCPKG = /nix/store/rrjsd6ss649j6p13bwifn4m6rkp3g39c-ghc-8.10.7-with-packages/bin/ghc-pkg +# environment +VSCODE_CODE_CACHE_PATH = /Users/ares/Library/Application Support/Code/CachedData/e4503b30fc78200f846c62cf8091b76ff5547662 +# environment +LANG = C +# default +.LOADED := +# environment +TMP = /tmp +# environment +HOMEBREW_REPOSITORY = /opt/homebrew +# environment +__HM_ZSH_SESS_VARS_SOURCED = 1 +# default +.INCLUDE_DIRS = /nix/store/5s20piw5v71ark00gm184c2asvli7z0i-gnumake-4.3/include +# environment +__CF_USER_TEXT_ENCODING = 0x1F5:0x0:0x0 +# makefile +MAKEFLAGS = pqrR +# environment +ZPLUG_FILTER = fzf-tmux:fzf:peco:percol:fzy:zaw +# environment +NIX_BUILD_CORES = 10 +# environment +stdenv = /nix/store/3zqj93rzxlff2945pn58wwdd6g5v655q-stdenv-darwin +# environment +_ZPLUG_CONFIG_SUBSHELL = : +# environment +__propagatedImpureHostDeps = +# environment +NIX_HARDENING_ENABLE = fortify stackprotector pic strictoverflow format relro bindnow +# environment +_ZPLUG_VERSION = 2.4.2 +# environment +NIX_CC_WRAPPER_TARGET_HOST_aarch64_apple_darwin = 1 +# makefile +CURDIR := /Users/ares/src/hnix +# environment +NIX_BINTOOLS = /nix/store/zik7vxshj3cr74q06r03nnw304gcpcin-cctools-binutils-darwin-wrapper-949.0.1 +# environment +APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = 1 +# automatic +*D = $(patsubst %/,%,$(dir $*)) +# environment +ZPLUG_LOADFILE = /Users/ares/.zplug/packages.zsh +# environment +MFLAGS = -pqrR +# environment +SSH_AUTH_SOCK = /private/tmp/com.apple.launchd.C3oChYOnRF/Listeners +# default +.SHELLFLAGS := -c +# automatic ++D = $(patsubst %/,%,$(dir $+)) +# environment +P9K_SSH = 0 +# makefile (from 'Makefile', line 1) +MAKEFILE_LIST := Makefile +# automatic +@F = $(notdir $@) +# environment +MACOSX_DEPLOYMENT_TARGET = 11.0 +# environment +OCAML_TOPLEVEL_PATH = /Users/ares/.opam/default/lib/toplevel +# environment +VSCODE_PID = 619 +# environment +installPhase = null +# automatic +?D = $(patsubst %/,%,$(dir $?)) +# environment +RANLIB = ranlib +# environment +NIX_NO_SELF_RPATH = 1 +# environment +MallocNanoZone = 0 +# environment +_ZPLUG_OHMYZSH = robbyrussell/oh-my-zsh +# environment +propagatedNativeBuildInputs = +# environment +depsHostHost = +# automatic + +*F = $(notdir $*) +# environment +shell = /nix/store/lkw407y1x1v5bg6hc290c5ry1qaabbgl-bash-5.1-p16/bin/bash +# environment +system = aarch64-darwin +# environment +MANPATH = /opt/homebrew/share/man: +# environment +depsBuildBuild = +# automatic + $@ + +# Not a target: +Makefile: +# Implicit rule search has been done. +# Last modified 2022-01-23 07:13:02 +# File has been updated. +# Successfully updated. + +# Not a target: +.DEFAULT: +# Implicit rule search has not been done. +# Modification time never checked. +# File has not been updated. + +all: default.nix +# Command line target. +# Implicit rule search has been done. +# File does not exist. +# File has been updated. +# Successfully updated. + +# files hash-table stats: +# Load=6/1024=1%, Rehash=0, Collisions=0/20=0% +# VPATH Search Paths + +# No 'vpath' search paths. + +# No general ('VPATH' variable) search path. + +# strcache buffers: 1 (0) / strings = 35 / storage = 374 B / avg = 10 B +# current buf: size = 8162 B / used = 374 B / count = 35 / avg = 10 B + +# strcache performance: lookups = 44 / hit rate = 20% +# hash-table stats: +# Load=35/8192=0%, Rehash=0, Collisions=0/44=0% +# Finished Make data base on Tue Aug 23 03:28:33 2022 + + diff --git a/ChangeLog.md b/ChangeLog.md index 85f21d76e..f0103c7f6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,7 +3,14 @@ ## [(diff)](https://github.com/haskell-nix/hnix/compare/0.16.0...0.17.0#files_bucket) 0.17.0 +* Additional + * `Nix.Effect` + * [(link)](https://github.com/haskell-nix/hnix/pull/1051) Introduction of new type NarContent, a tagged union type of `byteString` and `FilePath`. + * [(link)](https://github.com/haskell-nix/hnix/pull/1051) getURL of instance MonadHttp IO is finally working through hnix-store. Which also means + builtins.fetchurl is working through it. * Breaking: + * `Nix.Effect` + * [(link)](https://github.com/haskell-nix/hnix/pull/1051) MonadStore's addToStore signature changed to `StorePathName -> NarContent -> RecursiveFlag -> RepairFlag -> m (Either ErrorCall StorePath)` with new introduction of NarContent. Which enable us to add byteString as file to Store. It is corresponding to the hnix-store api change. * `Nix.Expr.Types` * [(link)](https://github.com/haskell-nix/hnix/pull/1042/files) The central HNix type `NExprF` changed, the `NApp` was moved out of `NBinary` & now a `NExprF` constructor of its own, the type signatures were changed accordingly. * [(link)](https://github.com/haskell-nix/hnix/pull/1038/files) project was using `megaparsec` `{,Source}Pos` and to use it shipped a lot of orphan instances. To improve the situation & performance (reports [#1026](https://github.com/haskell-nix/hnix/issues/1026), [#746](https://github.com/haskell-nix/hnix/issues/746)) project uses `N{,Source}Pos` types, related type signatures were changed accordingly. diff --git a/real-store/nix/var/nix/db/big-lock b/real-store/nix/var/nix/db/big-lock new file mode 100644 index 000000000..e69de29bb diff --git a/real-store/nix/var/nix/db/db.sqlite b/real-store/nix/var/nix/db/db.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..a79c2219796d941769e03e1a00695597d25d84e5 GIT binary patch literal 45056 zcmeI(L2Khi6bEq0o3$OgX7^%rD3nP`iN!h_(xrzI3QZf68bZ5u($dm{nOI|cSXpvr zr0u5A!)6PG9{ZK{GZgw!dMWhH$g-R`hW65f_zNt{qnXjnZ=RnmoSc7sCKJKNv6}IO zJ#!vAm5TEzV~*og=+UG{zSZbpD}O=H?#l6|!;16thmTs1{&Jf2zn#|GM{iqK@4Vmo zqWNd@x5gjaSB>AP7#jp2009U<00I#B{{&RC=6!tNzTTEmAYS#&?nEg0k|#2bzDkpM zn&`EH=I4Xn@kNjIzdY%E$L?>$;)ty^?96#G^>5zWu6YLs?wc10zYN7%t+j&f#q}GA5%$OoU=loUkYj!>&Cg13I6GS5%glv;BRhuVC#kT4cj`AEBuY+5>em3)9S)S@97T#AW| zti@smV-?Ss>7V^LrRip~R z)B1YYEzcW9Q>UZy7Jk24_4eAXxYHXA$5gCs=**1vR$o-$-|TMHyms6DWzR;eX>T46 zb37ZDreqO{$_&Evv>_htc@qsA&d*mvEAOmZz}**SdA0u(Yxjifa%}&uBPBFN*eGfE zdk?GLQF~L=4oGKsX!h0T531giC+_#wauMEIT&4Eykwts{a_g4xow}Wf&qSB1`fq-A zYu?U|`)kkkSp;cuRJqktQNCC)n;}dV$+tX_tS&|N9vmq#6VXa4$+CgT604g{H)$kk zUPaciRi|9vQ+1h{Y#l{!ErPXa_(IM$1xjFYwTZKQGgr+PHR9@A{v`4f%TUbDreQ+a zi;_;hE#})bdC??JCTH_dQo7n5^H7T{6>2%rc?0`wFK1KfoR7r57IRKx7J;3^h~KKa z$iURU92X*#5g6B6DD#2Ck}2JSCsV;}(v_NxVoK;yvd@EnB2A0nh-o2;G}MpAal?OB zsd}e7n?kQx?BQW?{D3}W>*j;DWp m Bool type StorePathSet = HS.HashSet StorePath + +-- ** @class MonadStore m@ + data NarContent = NarFile Path | NarText ByteString --- convert NarContent to NarSource needed in the store API +-- | convert NarContent to NarSource needed in the store API toNarSource :: MonadIO m => NarContent -> Store.Nar.NarSource m toNarSource (NarFile path) = Store.Nar.dumpPath $ coerce path toNarSource (NarText text) = Store.Nar.dumpString text --- ** @class MonadStore m@ - class Monad m => MonadStore m where From 3063b4ee5e792b2c7e0108f3917ee7e6c5e0038c Mon Sep 17 00:00:00 2001 From: soulomoon Date: Thu, 25 Aug 2022 19:36:41 +0800 Subject: [PATCH 9/9] remove unnecessary files --- .vscode/configurationCache.log | 1 - .vscode/dryrun.log | 5 - .vscode/targets.log | 437 ------------------------ real-store/nix/var/nix/db/big-lock | 0 real-store/nix/var/nix/db/db.sqlite | Bin 45056 -> 0 bytes real-store/nix/var/nix/db/reserved | 1 - real-store/nix/var/nix/db/schema | 1 - real-store/nix/var/nix/gcroots/profiles | 1 - 8 files changed, 446 deletions(-) delete mode 100644 .vscode/configurationCache.log delete mode 100644 .vscode/dryrun.log delete mode 100644 .vscode/targets.log delete mode 100644 real-store/nix/var/nix/db/big-lock delete mode 100644 real-store/nix/var/nix/db/db.sqlite delete mode 100644 real-store/nix/var/nix/db/reserved delete mode 100644 real-store/nix/var/nix/db/schema delete mode 120000 real-store/nix/var/nix/gcroots/profiles diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log deleted file mode 100644 index 14d906f07..000000000 --- a/.vscode/configurationCache.log +++ /dev/null @@ -1 +0,0 @@ -{"buildTargets":["all","default.nix"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}} \ No newline at end of file diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log deleted file mode 100644 index a206c0230..000000000 --- a/.vscode/dryrun.log +++ /dev/null @@ -1,5 +0,0 @@ -make --dry-run --always-make --keep-going --print-directory -make: Entering directory '/Users/ares/src/hnix' -cabal2nix --shell . > default.nix -make: Leaving directory '/Users/ares/src/hnix' - diff --git a/.vscode/targets.log b/.vscode/targets.log deleted file mode 100644 index 428da0588..000000000 --- a/.vscode/targets.log +++ /dev/null @@ -1,437 +0,0 @@ -make all --print-data-base --no-builtin-variables --no-builtin-rules --question -# GNU Make 4.3 -# Built for aarch64-apple-darwin21.3.0 -# Copyright (C) 1988-2020 Free Software Foundation, Inc. -# License GPLv3+: GNU GPL version 3 or later -# This is free software: you are free to change and redistribute it. -# There is NO WARRANTY, to the extent permitted by law. - -# Make data base, printed on Tue Aug 23 03:28:33 2022 - -# Variables - -# environment -ZPLUG_PROTOCOL = HTTPS -# environment -AS = as -# environment -out = /nix/store/17g9fcqzw8r8nhn2lnxrxqq91lmzqp42-ghc-shell-for-hnix-0.16.0 -# environment -LC_ALL = C -# environment -AR = ar -# environment -shellHook = -# environment -HOMEBREW_PREFIX = /opt/homebrew -# environment -TEMPDIR = /tmp -# environment -_ZPLUG_AWKPATH = /nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/misc/contrib -# environment -ZPLUG_HOME = /Users/ares/.zplug -# environment -TMPDIR = /tmp -# environment -XPC_SERVICE_NAME = application.com.microsoft.VSCode.48757907.48757913 -# environment -doInstallCheck = -# environment -VSCODE_CWD = / -# environment -NIX_CFLAGS_COMPILE = -frandom-seed=17g9fcqzw8 -isystem /nix/store/5kp3dd4hgw1yvc5gb7bcpl0mm87rxqjm-libiconv-50/include -isystem /nix/store/iqywfqxdgnb1mrc9kl6xc654xshxkyvc-libcxx-11.1.0-dev/include -isystem /nix/store/3q72n32dpglbcphc6877nvd2762ig784-libcxxabi-11.1.0-dev/include -iframework /nix/store/7hvwkm22phjfiw65z8fhs9yzwaggc019-apple-framework-CoreFoundation-11.0.0/Library/Frameworks -isystem /nix/store/isp9fyx2cijss6a08bzhafvhgi6jhqd0-libobjc-11.0.0/include -isystem /nix/store/5kp3dd4hgw1yvc5gb7bcpl0mm87rxqjm-libiconv-50/include -isystem /nix/store/iqywfqxdgnb1mrc9kl6xc654xshxkyvc-libcxx-11.1.0-dev/include -isystem /nix/store/3q72n32dpglbcphc6877nvd2762ig784-libcxxabi-11.1.0-dev/include -iframework /nix/store/7hvwkm22phjfiw65z8fhs9yzwaggc019-apple-framework-CoreFoundation-11.0.0/Library/Frameworks -isystem /nix/store/isp9fyx2cijss6a08bzhafvhgi6jhqd0-libobjc-11.0.0/include -# environment -PERIOD = 30 -# environment -CAML_LD_LIBRARY_PATH = /Users/ares/.opam/default/lib/stublibs:/opt/homebrew/lib/ocaml/stublibs:/opt/homebrew/lib/ocaml -# default -MAKE_COMMAND := make -# environment -strictDeps = -# environment -FPATH = /nix/store/qpwcj7i2gmy3c4rzlkl1khjnx9zmww9m-oh-my-zsh-2022-04-24/share/oh-my-zsh/plugins/fasd:/nix/store/qpwcj7i2gmy3c4rzlkl1khjnx9zmww9m-oh-my-zsh-2022-04-24/share/oh-my-zsh/plugins/brew:/nix/store/qpwcj7i2gmy3c4rzlkl1khjnx9zmww9m-oh-my-zsh-2022-04-24/share/oh-my-zsh/functions:/nix/store/qpwcj7i2gmy3c4rzlkl1khjnx9zmww9m-oh-my-zsh-2022-04-24/share/oh-my-zsh/completions:/Users/ares/.cache/oh-my-zsh/completions:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/autoload:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/misc/completions:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/sources:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/utils:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/job:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/log:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/io:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/core:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/base/base:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/autoload/commands:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/autoload/options:/nix/store/v8qpwdpnwdh3l8ay706lw3p20b4g06qg-zplug-2.4.2/autoload/tags:/usr/local/share/zsh/site-functions:/usr/share/zsh/site-functions:/usr/share/zsh/5.8.1/functions:/nix/var/nix/profiles/default/share/zsh/site-functions:/nix/var/nix/profiles/default/share/zsh/5.8.1/functions:/nix/var/nix/profiles/default/share/zsh/vendor-completions:/Users/ares/.nix-profile/share/zsh/site-functions:/Users/ares/.nix-profile/share/zsh/5.8.1/functions:/Users/ares/.nix-profile/share/zsh/vendor-completions:/Users/ares/.zplug/repos/zsh-users/zsh-completions/src -# environment -_ZPLUG_PREZTO = sorin-ionescu/prezto -# environment -__CFBundleIdentifier = com.microsoft.VSCode -# automatic -@D = $(patsubst %/,%,$(dir $@)) -# environment -LD_DYLD_PATH = /usr/lib/dyld -# environment -LOCALE_ARCHIVE = -# environment -ZPLUG_CACHE_DIR = /Users/ares/.zplug/cache -# environment -VSCODE_HANDLES_UNCAUGHT_ERRORS = true -# default -.VARIABLES := -# environment -COMMAND_MODE = unix2003 -# environment -PWD = /Users/ares/src/hnix -# automatic -%D = $(patsubst %/,%,$(dir $%)) -# environment -ZPLUG_ERROR_LOG = /Users/ares/.zplug/.error_log -# environment -SOURCE_DATE_EPOCH = 315532800 -# environment -__darwinAllowLocalNetworking = -# environment -LSCOLORS = Gxfxcxdxbxegedabagacad -# environment -ZPLUG_REPOS = /Users/ares/.zplug/repos -# environment -XDG_DATA_DIRS = /nix/store/rrjsd6ss649j6p13bwifn4m6rkp3g39c-ghc-8.10.7-with-packages/share:/nix/store/bq11bg9m07gpm666jq847vfxwvmmkgdg-cabal-install-3.6.2.0/share -# environment -NIX_LDFLAGS = -liconv -L/nix/store/z0j1va3hidksar7d2xx2g8wf7wr9yz6k-ncurses-6.3/lib -L/nix/store/jk3bliag6ss1wv1l0sgg6fc94cf5fill-libffi-3.4.2/lib -L/nix/store/9p8s9da0s08rynmbkcsqsj2v8mbglisv-gmp-with-cxx-6.2.1/lib -L/nix/store/5kp3dd4hgw1yvc5gb7bcpl0mm87rxqjm-libiconv-50/lib -L/nix/store/sg09c88mzmgrnb7n9xxpc6vp33i7m8mh-libcxx-11.1.0/lib -L/nix/store/0cb2416mc6y70aig1zcx21qcf547nyhp-libcxxabi-11.1.0/lib -L/nix/store/cj4znhcdaw5iicqhcmwnav53z5wdsr36-compiler-rt-libc-11.1.0/lib -L/nix/store/isp9fyx2cijss6a08bzhafvhgi6jhqd0-libobjc-11.0.0/lib -L/nix/store/z0j1va3hidksar7d2xx2g8wf7wr9yz6k-ncurses-6.3/lib -L/nix/store/jk3bliag6ss1wv1l0sgg6fc94cf5fill-libffi-3.4.2/lib -L/nix/store/9p8s9da0s08rynmbkcsqsj2v8mbglisv-gmp-with-cxx-6.2.1/lib -L/nix/store/5kp3dd4hgw1yvc5gb7bcpl0mm87rxqjm-libiconv-50/lib -L/nix/store/sg09c88mzmgrnb7n9xxpc6vp33i7m8mh-libcxx-11.1.0/lib -L/nix/store/0cb2416mc6y70aig1zcx21qcf547nyhp-libcxxabi-11.1.0/lib -L/nix/store/cj4znhcdaw5iicqhcmwnav53z5wdsr36-compiler-rt-libc-11.1.0/lib -L/nix/store/isp9fyx2cijss6a08bzhafvhgi6jhqd0-libobjc-11.0.0/lib -# environment -PATH_LOCALE = /nix/store/4cs71wv0i3p21vkxv8s9yp73rnhg4s64-adv_cmds-119-locale/share/locale -# automatic -^D = $(patsubst %/,%,$(dir $^)) -# automatic -%F = $(notdir $%) -# environment -NIX_GHCPKG = /nix/store/rrjsd6ss649j6p13bwifn4m6rkp3g39c-ghc-8.10.7-with-packages/bin/ghc-pkg -# environment -VSCODE_CODE_CACHE_PATH = /Users/ares/Library/Application Support/Code/CachedData/e4503b30fc78200f846c62cf8091b76ff5547662 -# environment -LANG = C -# default -.LOADED := -# environment -TMP = /tmp -# environment -HOMEBREW_REPOSITORY = /opt/homebrew -# environment -__HM_ZSH_SESS_VARS_SOURCED = 1 -# default -.INCLUDE_DIRS = /nix/store/5s20piw5v71ark00gm184c2asvli7z0i-gnumake-4.3/include -# environment -__CF_USER_TEXT_ENCODING = 0x1F5:0x0:0x0 -# makefile -MAKEFLAGS = pqrR -# environment -ZPLUG_FILTER = fzf-tmux:fzf:peco:percol:fzy:zaw -# environment -NIX_BUILD_CORES = 10 -# environment -stdenv = /nix/store/3zqj93rzxlff2945pn58wwdd6g5v655q-stdenv-darwin -# environment -_ZPLUG_CONFIG_SUBSHELL = : -# environment -__propagatedImpureHostDeps = -# environment -NIX_HARDENING_ENABLE = fortify stackprotector pic strictoverflow format relro bindnow -# environment -_ZPLUG_VERSION = 2.4.2 -# environment -NIX_CC_WRAPPER_TARGET_HOST_aarch64_apple_darwin = 1 -# makefile -CURDIR := /Users/ares/src/hnix -# environment -NIX_BINTOOLS = /nix/store/zik7vxshj3cr74q06r03nnw304gcpcin-cctools-binutils-darwin-wrapper-949.0.1 -# environment -APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = 1 -# automatic -*D = $(patsubst %/,%,$(dir $*)) -# environment -ZPLUG_LOADFILE = /Users/ares/.zplug/packages.zsh -# environment -MFLAGS = -pqrR -# environment -SSH_AUTH_SOCK = /private/tmp/com.apple.launchd.C3oChYOnRF/Listeners -# default -.SHELLFLAGS := -c -# automatic -+D = $(patsubst %/,%,$(dir $+)) -# environment -P9K_SSH = 0 -# makefile (from 'Makefile', line 1) -MAKEFILE_LIST := Makefile -# automatic -@F = $(notdir $@) -# environment -MACOSX_DEPLOYMENT_TARGET = 11.0 -# environment -OCAML_TOPLEVEL_PATH = /Users/ares/.opam/default/lib/toplevel -# environment -VSCODE_PID = 619 -# environment -installPhase = null -# automatic -?D = $(patsubst %/,%,$(dir $?)) -# environment -RANLIB = ranlib -# environment -NIX_NO_SELF_RPATH = 1 -# environment -MallocNanoZone = 0 -# environment -_ZPLUG_OHMYZSH = robbyrussell/oh-my-zsh -# environment -propagatedNativeBuildInputs = -# environment -depsHostHost = -# automatic - -*F = $(notdir $*) -# environment -shell = /nix/store/lkw407y1x1v5bg6hc290c5ry1qaabbgl-bash-5.1-p16/bin/bash -# environment -system = aarch64-darwin -# environment -MANPATH = /opt/homebrew/share/man: -# environment -depsBuildBuild = -# automatic - $@ - -# Not a target: -Makefile: -# Implicit rule search has been done. -# Last modified 2022-01-23 07:13:02 -# File has been updated. -# Successfully updated. - -# Not a target: -.DEFAULT: -# Implicit rule search has not been done. -# Modification time never checked. -# File has not been updated. - -all: default.nix -# Command line target. -# Implicit rule search has been done. -# File does not exist. -# File has been updated. -# Successfully updated. - -# files hash-table stats: -# Load=6/1024=1%, Rehash=0, Collisions=0/20=0% -# VPATH Search Paths - -# No 'vpath' search paths. - -# No general ('VPATH' variable) search path. - -# strcache buffers: 1 (0) / strings = 35 / storage = 374 B / avg = 10 B -# current buf: size = 8162 B / used = 374 B / count = 35 / avg = 10 B - -# strcache performance: lookups = 44 / hit rate = 20% -# hash-table stats: -# Load=35/8192=0%, Rehash=0, Collisions=0/44=0% -# Finished Make data base on Tue Aug 23 03:28:33 2022 - - diff --git a/real-store/nix/var/nix/db/big-lock b/real-store/nix/var/nix/db/big-lock deleted file mode 100644 index e69de29bb..000000000 diff --git a/real-store/nix/var/nix/db/db.sqlite b/real-store/nix/var/nix/db/db.sqlite deleted file mode 100644 index a79c2219796d941769e03e1a00695597d25d84e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45056 zcmeI(L2Khi6bEq0o3$OgX7^%rD3nP`iN!h_(xrzI3QZf68bZ5u($dm{nOI|cSXpvr zr0u5A!)6PG9{ZK{GZgw!dMWhH$g-R`hW65f_zNt{qnXjnZ=RnmoSc7sCKJKNv6}IO zJ#!vAm5TEzV~*og=+UG{zSZbpD}O=H?#l6|!;16thmTs1{&Jf2zn#|GM{iqK@4Vmo zqWNd@x5gjaSB>AP7#jp2009U<00I#B{{&RC=6!tNzTTEmAYS#&?nEg0k|#2bzDkpM zn&`EH=I4Xn@kNjIzdY%E$L?>$;)ty^?96#G^>5zWu6YLs?wc10zYN7%t+j&f#q}GA5%$OoU=loUkYj!>&Cg13I6GS5%glv;BRhuVC#kT4cj`AEBuY+5>em3)9S)S@97T#AW| zti@smV-?Ss>7V^LrRip~R z)B1YYEzcW9Q>UZy7Jk24_4eAXxYHXA$5gCs=**1vR$o-$-|TMHyms6DWzR;eX>T46 zb37ZDreqO{$_&Evv>_htc@qsA&d*mvEAOmZz}**SdA0u(Yxjifa%}&uBPBFN*eGfE zdk?GLQF~L=4oGKsX!h0T531giC+_#wauMEIT&4Eykwts{a_g4xow}Wf&qSB1`fq-A zYu?U|`)kkkSp;cuRJqktQNCC)n;}dV$+tX_tS&|N9vmq#6VXa4$+CgT604g{H)$kk zUPaciRi|9vQ+1h{Y#l{!ErPXa_(IM$1xjFYwTZKQGgr+PHR9@A{v`4f%TUbDreQ+a zi;_;hE#})bdC??JCTH_dQo7n5^H7T{6>2%rc?0`wFK1KfoR7r57IRKx7J;3^h~KKa z$iURU92X*#5g6B6DD#2Ck}2JSCsV;}(v_NxVoK;yvd@EnB2A0nh-o2;G}MpAal?OB zsd}e7n?kQx?BQW?{D3}W>*j;DWp