nmattia/niv
1
1
Fork 0
mirror of https://github.com/nmattia/niv.git synced 2024-11-08 08:26:02 +03:00
Code Issues Projects Releases Wiki Activity

Drop lots of generated files

Browse Source
This commit is contained in:
Nicolas Mattia 2019-04-07 12:50:47 +02:00
parent 60cc94d3e6
commit 13f81059c0
1 changed files with 4 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
app/Niv.hs
View File

@ -334,18 +334,6 @@ cmdInit = do
( PackageName "NixOS/nixpkgs-channels" ( PackageName "NixOS/nixpkgs-channels"
, PackageSpec (HMap.singleton "branch" "nixos-18.09")) , PackageSpec (HMap.singleton "branch" "nixos-18.09"))
, \path _content -> dontCreateFile path) , \path _content -> dontCreateFile path)
, ( pathNixDefaultNix
, (`createFile` initNixDefaultNixContent)
, \path _content -> dontCreateFile path)
, ( pathNixPackagesNix
, (`createFile` initNixPackagesNixContent)
, \path _content -> dontCreateFile path)
, ( pathDefaultNix
, (`createFile` initDefaultNixContent)
, \path _content -> dontCreateFile path)
, ( pathShellNix
, (`createFile` initShellNixContent)
, \path _content -> dontCreateFile path)
] $ \(path, onCreate, onUpdate) -> do ] $ \(path, onCreate, onUpdate) -> do
exists <- Dir.doesFileExist path exists <- Dir.doesFileExist path
if exists then readFile path >>= onUpdate path else onCreate path if exists then readFile path >>= onUpdate path else onCreate path
@ -621,10 +609,6 @@ nixPrefetchURL unpack url =
-- Files and their content -- Files and their content
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- | @nix/sources.nix@
pathNixSourcesNix :: FilePath
pathNixSourcesNix = "nix" </> "sources.nix"
-- | Checks if content is different than default and if it does /not/ contain -- | Checks if content is different than default and if it does /not/ contain
-- a comment line with @niv: no_update@ -- a comment line with @niv: no_update@
shouldUpdateNixSourcesNix :: String -> Bool shouldUpdateNixSourcesNix :: String -> Bool
@ -661,6 +645,10 @@ warnIfOutdated = do
] ]
else pure () else pure ()
-- | @nix/sources.nix@
pathNixSourcesNix :: FilePath
pathNixSourcesNix = "nix" </> "sources.nix"
-- | Glue code between nix and sources.json -- | Glue code between nix and sources.json
initNixSourcesNixContent :: String initNixSourcesNixContent :: String
initNixSourcesNixContent = [s| initNixSourcesNixContent = [s|
@ -701,59 +689,6 @@ mapAttrs (_: spec:
) sources ) sources
|] |]
-- | @nix/default.nix@
pathNixDefaultNix :: FilePath
pathNixDefaultNix = "nix" </> "default.nix"
-- | File importing @nixpkgs@, setting up overlays, etc
initNixDefaultNixContent :: String
initNixDefaultNixContent = [s|
{ sources ? import ./sources.nix }:
with
{ overlay = _: pkgs:
{ inherit (import sources.niv {}) niv;
packages = pkgs.callPackages ./packages.nix {};
};
};
import sources.nixpkgs
{ overlays = [ overlay ] ; config = {}; }
|]
-- | @nix/packages.nix@
pathNixPackagesNix :: FilePath
pathNixPackagesNix = "nix" </> "packages.nix"
-- | File with packages
initNixPackagesNixContent :: String
initNixPackagesNixContent = [s|
{ writeScriptBin
}:
{ foo = writeScriptBin "foo" "echo foo" ; }
|]
-- | @default.nix@
pathDefaultNix :: FilePath
pathDefaultNix = "default.nix"
-- | Top level @default.nix@
initDefaultNixContent :: String
initDefaultNixContent = [s|
let pkgs = import ./nix {}; in pkgs.packages
|]
-- | @shell.nix@
pathShellNix :: FilePath
pathShellNix = "shell.nix"
-- | Simple shell that loads @niv@
initShellNixContent :: String
initShellNixContent = [s|
with { pkgs = import ./nix {}; };
pkgs.mkShell
{ buildInputs = [ pkgs.niv ];
}
|]
-- | @nix/sources.json" -- | @nix/sources.json"
pathNixSourcesJson :: FilePath pathNixSourcesJson :: FilePath
pathNixSourcesJson = "nix" </> "sources.json" pathNixSourcesJson = "nix" </> "sources.json"