Compare commits

..

No commits in common. "bd41cf2f6471bdf7d1b41d9f606b5c250eac7951" and "b46cf0bf15e85ae0c44c140976475f5aecec2adf" have entirely different histories.

3 changed files with 30 additions and 8 deletions

View File

@ -1 +0,0 @@
packages: */*.cabal

View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1637014545,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1660646295, "lastModified": 1637841632,
"narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=", "narHash": "sha256-QYqiKHdda0EOnLGQCHE+GluD/Lq2EJj4hVTooPM55Ic=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "762b003329510ea855b4097a37511eb19c7077f0", "rev": "73369f8d0864854d1acfa7f1e6217f7d6b6e3fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -12,6 +12,7 @@
// //
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
# pkgs = import nixpkgs { inherit system; overlays = [ self.overlay ]; };
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
hp = pkgs.haskellPackages.override ( old: { hp = pkgs.haskellPackages.override ( old: {
overrides = pkgs.lib.composeExtensions ( old.overrides or (_: _: {})) (f: p: { overrides = pkgs.lib.composeExtensions ( old.overrides or (_: _: {})) (f: p: {
@ -20,8 +21,30 @@
} ); } );
in in
rec { rec {
packages.rauhala-info = pkgs.callPackage ./rauhala.info { site = hp.build-rauhala-info; }; # packages = { inherit (pkgs) build-rauhala-info rauhala-info deploy-rauhala-info; };
packages.build-rauhala-info = pkgs.runCommand "site" { buildInputs = [pkgs.makeWrapper]; }
''
mkdir -p $out/bin/
cp ${hp.build-rauhala-info}/bin/site $out/bin/
wrapProgram $out/bin/site --prefix PATH : ${ pkgs.lib.makeBinPath [ pkgs.ipfs ] }
'';
apps.build-rauhala-info = flake-utils.lib.mkApp {
drv = packages.build-rauhala-info;
exePath = "/bin/site";
};
packages.deploy-rauhala-info = with pkgs; runCommand "deploy-rauhala-info.sh" { inherit bash ipfs; }
''
mkdir -p $out/bin/
substituteAll ${./support/deploy-rauhala-info.sh} $out/bin/deploy-rauhala-info.sh
chmod u+x $out/bin/deploy-rauhala-info.sh
'';
packages.rauhala-info = pkgs.callPackage ./rauhala.info { site = packages.build-rauhala-info; };
apps.deploy-rauhala-info = flake-utils.lib.mkApp {
drv = pkgs.deploy-rauhala-info;
exePath = "/bin/deploy-rauhala-info.sh";
};
defaultPackage = packages.rauhala-info; defaultPackage = packages.rauhala-info;
defaultApp = packages.build-rauhala-info;
devShell = hp.shellFor { devShell = hp.shellFor {
packages = h: [h.build-rauhala-info]; packages = h: [h.build-rauhala-info];
buildInputs = with pkgs; [ buildInputs = with pkgs; [