From edaed825650eea32878441d3b8c7eb40e8877882 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 28 Sep 2020 16:17:31 -0700
Subject: Add examples
---
examples/simple/flake.lock | 25 +++++++++++++++++++++++++
examples/simple/flake.nix | 23 +++++++++++++++++++++++
2 files changed, 48 insertions(+)
create mode 100644 examples/simple/flake.lock
create mode 100644 examples/simple/flake.nix
(limited to 'examples/simple')
diff --git a/examples/simple/flake.lock b/examples/simple/flake.lock
new file mode 100644
index 0000000..a57ff9d
--- /dev/null
+++ b/examples/simple/flake.lock
@@ -0,0 +1,25 @@
+{
+ "nodes": {
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1592491430,
+ "narHash": "sha256-7WNpr16iUyjG4caad137nCqxXNTdct202jy05lslZXA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "07299ff81e58e16b282fe602ce5e629854dfd544",
+ "type": "github"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "type": "indirect"
+ }
+ },
+ "root": {
+ "inputs": {
+ "nixpkgs": "nixpkgs"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
new file mode 100644
index 0000000..6e516d3
--- /dev/null
+++ b/examples/simple/flake.nix
@@ -0,0 +1,23 @@
+{
+ description = "Deploy GNU hello to localhost";
+
+ outputs = { self, nixpkgs }: {
+ deploy.nodes.example = {
+ hostname = "localhost";
+ profiles.hello = {
+ user = "test_deploy";
+ path = nixpkgs.legacyPackages.x86_64-linux.hello;
+ # Just to test that it's working
+ activate = "$PROFILE/bin/hello";
+ };
+ };
+ checks = builtins.mapAttrs
+ (_: pkgs: {
+ jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
+ "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
+ pkgs.writeText "deploy.json" (builtins.toJSON self.deploy)
+ } ${../../interface/deploy.json} && touch $out";
+ })
+ nixpkgs.legacyPackages;
+ };
+}
--
cgit v1.2.3
From 8d21dd335e5259dadf832a5d1a7c72b9dd1f4400 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Tue, 29 Sep 2020 15:10:06 -0700
Subject: Add license information, reformat Nix files, clean up
---
examples/simple/flake.lock.license | 3 +++
examples/simple/flake.nix | 16 +++++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
create mode 100644 examples/simple/flake.lock.license
(limited to 'examples/simple')
diff --git a/examples/simple/flake.lock.license b/examples/simple/flake.lock.license
new file mode 100644
index 0000000..9e9897d
--- /dev/null
+++ b/examples/simple/flake.lock.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2020 Serokell
+
+SPDX-License-Identifier: MPL-2.0
\ No newline at end of file
diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index 6e516d3..800363f 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2020 Serokell
+#
+# SPDX-License-Identifier: MPL-2.0
+
{
description = "Deploy GNU hello to localhost";
@@ -5,19 +9,17 @@
deploy.nodes.example = {
hostname = "localhost";
profiles.hello = {
- user = "test_deploy";
+ user = "balsoft";
path = nixpkgs.legacyPackages.x86_64-linux.hello;
# Just to test that it's working
activate = "$PROFILE/bin/hello";
};
};
- checks = builtins.mapAttrs
- (_: pkgs: {
- jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
- "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
+ checks = builtins.mapAttrs (_: pkgs: {
+ jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
+ "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
pkgs.writeText "deploy.json" (builtins.toJSON self.deploy)
} ${../../interface/deploy.json} && touch $out";
- })
- nixpkgs.legacyPackages;
+ }) nixpkgs.legacyPackages;
};
}
--
cgit v1.2.3
From 5674670a59168fb05f26e5b4fb41dd2662810e94 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Fri, 2 Oct 2020 12:58:11 -0700
Subject: General improvements, deprecate `activate` profile option in favor of
executing $PROFILE/activate (Wrap It Yourself) to ensure successful rollback
activations
---
examples/simple/flake.nix | 47 +++++++++++++++++++++++++++++++++--------------
1 file changed, 33 insertions(+), 14 deletions(-)
(limited to 'examples/simple')
diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index 800363f..f53352b 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -5,21 +5,40 @@
{
description = "Deploy GNU hello to localhost";
- outputs = { self, nixpkgs }: {
- deploy.nodes.example = {
- hostname = "localhost";
- profiles.hello = {
- user = "balsoft";
- path = nixpkgs.legacyPackages.x86_64-linux.hello;
- # Just to test that it's working
- activate = "$PROFILE/bin/hello";
+ outputs = { self, nixpkgs }:
+ let
+ setActivate = base: activate: nixpkgs.legacyPackages.x86_64-linux.symlinkJoin {
+ name = ("activatable-" + base.name);
+ paths = [
+ base
+ (nixpkgs.legacyPackages.x86_64-linux.writeTextFile {
+ name = base.name + "-activate-path";
+ text = ''
+ #!${nixpkgs.legacyPackages.x86_64-linux.runtimeShell}
+ ${activate}
+ '';
+ executable = true;
+ destination = "/activate";
+ })
+ ];
};
- };
- checks = builtins.mapAttrs (_: pkgs: {
- jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
- "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
+ in
+ {
+
+ deploy.nodes.example = {
+ hostname = "localhost";
+ profiles.hello = {
+ user = "balsoft";
+ path = setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
+ };
+ };
+ checks = builtins.mapAttrs
+ (_: pkgs: {
+ jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
+ "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
pkgs.writeText "deploy.json" (builtins.toJSON self.deploy)
} ${../../interface/deploy.json} && touch $out";
- }) nixpkgs.legacyPackages;
- };
+ })
+ nixpkgs.legacyPackages;
+ };
}
--
cgit v1.2.3
From 7c00fd2761e6efffe763ece5d08d9a6d3fb95092 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 5 Oct 2020 19:46:28 -0700
Subject: Add interface with json schema, fix flake-less issues, put
setActivate and jsonSchema check in flake lib
---
examples/simple/flake.lock | 85 +++++++++++++++++++++++++++++++++++++++++++++-
examples/simple/flake.nix | 16 ++++-----
2 files changed, 90 insertions(+), 11 deletions(-)
(limited to 'examples/simple')
diff --git a/examples/simple/flake.lock b/examples/simple/flake.lock
index a57ff9d..7791c84 100644
--- a/examples/simple/flake.lock
+++ b/examples/simple/flake.lock
@@ -1,6 +1,73 @@
{
"nodes": {
+ "deploy-rs": {
+ "inputs": {
+ "naersk": "naersk",
+ "nixpkgs": "nixpkgs_2",
+ "utils": "utils"
+ },
+ "locked": {
+ "lastModified": 1601668691,
+ "narHash": "sha256-1mWf71DPRNgTIUKJ4Dy+CjoyZo4JkPdrwjYJy2UzqZE=",
+ "type": "git",
+ "url": "file:///home/notgne2/Dev/Serokell/deploy-rs"
+ },
+ "original": {
+ "owner": "serokell",
+ "repo": "deploy-rs",
+ "type": "github"
+ }
+ },
+ "naersk": {
+ "inputs": {
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1597138680,
+ "narHash": "sha256-3pDN/W17wjVDbrkgo60xQSb24+QAPQ7ulsUq5atNni0=",
+ "owner": "nmattia",
+ "repo": "naersk",
+ "rev": "529e910a3f423a8211f8739290014b754b2555b6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nmattia",
+ "ref": "master",
+ "repo": "naersk",
+ "type": "github"
+ }
+ },
"nixpkgs": {
+ "locked": {
+ "lastModified": 1601091160,
+ "narHash": "sha256-26UI9LGjRO8Sv253zJZkoapP260QkJPQ2+vRyC1i+kI=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "2768436826543af2b1540e4fe6b5afa15850e155",
+ "type": "github"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "type": "indirect"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1600387253,
+ "narHash": "sha256-WtdpHuiunPF9QMlcXrWJkESuIjSSjP9WMOKvYQS/D7M=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "72b9660dc18ba347f7cd41a9504fc181a6d87dc3",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
"locked": {
"lastModified": 1592491430,
"narHash": "sha256-7WNpr16iUyjG4caad137nCqxXNTdct202jy05lslZXA=",
@@ -16,7 +83,23 @@
},
"root": {
"inputs": {
- "nixpkgs": "nixpkgs"
+ "deploy-rs": "deploy-rs",
+ "nixpkgs": "nixpkgs_3"
+ }
+ },
+ "utils": {
+ "locked": {
+ "lastModified": 1600209923,
+ "narHash": "sha256-zoOWauTliFEjI++esk6Jzk7QO5EKpddWXQm9yQK24iM=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "3cd06d3c1df6879c9e41cb2c33113df10566c760",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
}
}
},
diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index f53352b..d44b888 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -5,7 +5,9 @@
{
description = "Deploy GNU hello to localhost";
- outputs = { self, nixpkgs }:
+ inputs.deploy-rs.url = "github:serokell/deploy-rs";
+
+ outputs = { self, nixpkgs, deploy-rs }:
let
setActivate = base: activate: nixpkgs.legacyPackages.x86_64-linux.symlinkJoin {
name = ("activatable-" + base.name);
@@ -29,16 +31,10 @@
hostname = "localhost";
profiles.hello = {
user = "balsoft";
- path = setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
+ path = deploy-rs.lib.x86_64-linux.setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
};
};
- checks = builtins.mapAttrs
- (_: pkgs: {
- jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
- "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
- pkgs.writeText "deploy.json" (builtins.toJSON self.deploy)
- } ${../../interface/deploy.json} && touch $out";
- })
- nixpkgs.legacyPackages;
+
+ checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; };
};
}
--
cgit v1.2.3
From 58a934b997bb06f475bf707d0994f1fa37584cc1 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 5 Oct 2020 19:53:59 -0700
Subject: Clean up `simple` example
---
examples/simple/flake.lock | 4 ++--
examples/simple/flake.nix | 37 +++++++++----------------------------
2 files changed, 11 insertions(+), 30 deletions(-)
(limited to 'examples/simple')
diff --git a/examples/simple/flake.lock b/examples/simple/flake.lock
index 7791c84..1e2fab0 100644
--- a/examples/simple/flake.lock
+++ b/examples/simple/flake.lock
@@ -7,8 +7,8 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1601668691,
- "narHash": "sha256-1mWf71DPRNgTIUKJ4Dy+CjoyZo4JkPdrwjYJy2UzqZE=",
+ "lastModified": 1601952388,
+ "narHash": "sha256-g5t4JNUl4xmKfKmzo5yzligVNTBHOTgw+vkuebP4B/Q=",
"type": "git",
"url": "file:///home/notgne2/Dev/Serokell/deploy-rs"
},
diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index d44b888..a8ad0f7 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -7,34 +7,15 @@
inputs.deploy-rs.url = "github:serokell/deploy-rs";
- outputs = { self, nixpkgs, deploy-rs }:
- let
- setActivate = base: activate: nixpkgs.legacyPackages.x86_64-linux.symlinkJoin {
- name = ("activatable-" + base.name);
- paths = [
- base
- (nixpkgs.legacyPackages.x86_64-linux.writeTextFile {
- name = base.name + "-activate-path";
- text = ''
- #!${nixpkgs.legacyPackages.x86_64-linux.runtimeShell}
- ${activate}
- '';
- executable = true;
- destination = "/activate";
- })
- ];
+ outputs = { self, nixpkgs, deploy-rs }: {
+ deploy.nodes.example = {
+ hostname = "localhost";
+ profiles.hello = {
+ user = "balsoft";
+ path = deploy-rs.lib.x86_64-linux.setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
};
- in
- {
-
- deploy.nodes.example = {
- hostname = "localhost";
- profiles.hello = {
- user = "balsoft";
- path = deploy-rs.lib.x86_64-linux.setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
- };
- };
-
- checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; };
};
+
+ checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; };
+ };
}
--
cgit v1.2.3
From aabcf6b77d4159100a49b143cbb8da4bad194f14 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 5 Oct 2020 20:10:41 -0700
Subject: Improve schema a bit, fix flake locks for examples
---
examples/simple/flake.lock | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'examples/simple')
diff --git a/examples/simple/flake.lock b/examples/simple/flake.lock
index 1e2fab0..8f4ca88 100644
--- a/examples/simple/flake.lock
+++ b/examples/simple/flake.lock
@@ -7,10 +7,12 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1601952388,
- "narHash": "sha256-g5t4JNUl4xmKfKmzo5yzligVNTBHOTgw+vkuebP4B/Q=",
- "type": "git",
- "url": "file:///home/notgne2/Dev/Serokell/deploy-rs"
+ "lastModified": 1601952901,
+ "narHash": "sha256-6U0JIlh6GLqkxdyUiVRbph9k1lVCtWLno2uM/Fd/ZzI=",
+ "owner": "serokell",
+ "repo": "deploy-rs",
+ "rev": "1de1ad5ff893bfcabdf2bfa20d8c93a8cdbb0156",
+ "type": "github"
},
"original": {
"owner": "serokell",
--
cgit v1.2.3
From f2e5b9b39303ec66142caadad6aea74ee56a4c93 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Sun, 11 Oct 2020 15:09:37 -0700
Subject: Update lock files
---
examples/simple/flake.lock | 53 +++++++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 24 deletions(-)
(limited to 'examples/simple')
diff --git a/examples/simple/flake.lock b/examples/simple/flake.lock
index 8f4ca88..ff339a8 100644
--- a/examples/simple/flake.lock
+++ b/examples/simple/flake.lock
@@ -2,16 +2,17 @@
"nodes": {
"deploy-rs": {
"inputs": {
+ "flake-compat": "flake-compat",
"naersk": "naersk",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
- "lastModified": 1601952901,
- "narHash": "sha256-6U0JIlh6GLqkxdyUiVRbph9k1lVCtWLno2uM/Fd/ZzI=",
+ "lastModified": 1602454082,
+ "narHash": "sha256-nx6ULJCys3u+nLFHrt9+zux3fsfTloLTRd/FpJcL//Q=",
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "1de1ad5ff893bfcabdf2bfa20d8c93a8cdbb0156",
+ "rev": "e463c62922ad09f016e4f1dd1d6d0cabccb0ff79",
"type": "github"
},
"original": {
@@ -20,9 +21,27 @@
"type": "github"
}
},
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1600853454,
+ "narHash": "sha256-EgsgbcJNZ9AQLVhjhfiegGjLbO+StBY9hfKsCwc8Hw8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "94cf59784c73ecec461eaa291918eff0bfb538ac",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"naersk": {
"inputs": {
- "nixpkgs": "nixpkgs"
+ "nixpkgs": [
+ "nixpkgs"
+ ]
},
"locked": {
"lastModified": 1597138680,
@@ -40,20 +59,6 @@
}
},
"nixpkgs": {
- "locked": {
- "lastModified": 1601091160,
- "narHash": "sha256-26UI9LGjRO8Sv253zJZkoapP260QkJPQ2+vRyC1i+kI=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "2768436826543af2b1540e4fe6b5afa15850e155",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "nixpkgs_2": {
"locked": {
"lastModified": 1600387253,
"narHash": "sha256-WtdpHuiunPF9QMlcXrWJkESuIjSSjP9WMOKvYQS/D7M=",
@@ -69,13 +74,13 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_2": {
"locked": {
- "lastModified": 1592491430,
- "narHash": "sha256-7WNpr16iUyjG4caad137nCqxXNTdct202jy05lslZXA=",
+ "lastModified": 1602453019,
+ "narHash": "sha256-bEzkPMG5JTFpd7xsl73/K/hZ9jBgiRKMdkpmwAG4lwI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "07299ff81e58e16b282fe602ce5e629854dfd544",
+ "rev": "a6fec75d0472670448b9708e1619fef2c36af9d5",
"type": "github"
},
"original": {
@@ -86,7 +91,7 @@
"root": {
"inputs": {
"deploy-rs": "deploy-rs",
- "nixpkgs": "nixpkgs_3"
+ "nixpkgs": "nixpkgs_2"
}
},
"utils": {
--
cgit v1.2.3
From 898bb2814b51fb76ef3d54164768512ed13016be Mon Sep 17 00:00:00 2001
From: notgne2
Date: Sun, 11 Oct 2020 15:19:34 -0700
Subject: Update lockfiles
---
examples/simple/flake.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
(limited to 'examples/simple')
diff --git a/examples/simple/flake.lock b/examples/simple/flake.lock
index ff339a8..a6a3fa9 100644
--- a/examples/simple/flake.lock
+++ b/examples/simple/flake.lock
@@ -8,11 +8,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1602454082,
- "narHash": "sha256-nx6ULJCys3u+nLFHrt9+zux3fsfTloLTRd/FpJcL//Q=",
+ "lastModified": 1602454749,
+ "narHash": "sha256-wSPZEl6xyqewPrNQg9k6z3DLshn2Fwha8mDv8ECWMf8=",
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "e463c62922ad09f016e4f1dd1d6d0cabccb0ff79",
+ "rev": "e5bd558c5b6505621d3b5a27e9b39bf54f6788a1",
"type": "github"
},
"original": {
@@ -44,11 +44,11 @@
]
},
"locked": {
- "lastModified": 1597138680,
- "narHash": "sha256-3pDN/W17wjVDbrkgo60xQSb24+QAPQ7ulsUq5atNni0=",
+ "lastModified": 1602173141,
+ "narHash": "sha256-m6wU6lP0wf2OMw3KtJqn27ITtg29+ftciGHicLiVSGE=",
"owner": "nmattia",
"repo": "naersk",
- "rev": "529e910a3f423a8211f8739290014b754b2555b6",
+ "rev": "22b96210b2433228d42bce460f3befbdcfde7520",
"type": "github"
},
"original": {
@@ -60,11 +60,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1600387253,
- "narHash": "sha256-WtdpHuiunPF9QMlcXrWJkESuIjSSjP9WMOKvYQS/D7M=",
+ "lastModified": 1601961544,
+ "narHash": "sha256-uuh9CkDWkXlXse8IcergqoIM5JffqfQDKsl1uHB7XJI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "72b9660dc18ba347f7cd41a9504fc181a6d87dc3",
+ "rev": "89281dd1dfed6839610f0ccad0c0e493606168fe",
"type": "github"
},
"original": {
@@ -96,11 +96,11 @@
},
"utils": {
"locked": {
- "lastModified": 1600209923,
- "narHash": "sha256-zoOWauTliFEjI++esk6Jzk7QO5EKpddWXQm9yQK24iM=",
+ "lastModified": 1601282935,
+ "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "3cd06d3c1df6879c9e41cb2c33113df10566c760",
+ "rev": "588973065fce51f4763287f0fda87a174d78bf48",
"type": "github"
},
"original": {
--
cgit v1.2.3
From 7ec0bc21cd3678e39270d7ea59bccaefa288abfa Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 26 Oct 2020 12:27:20 -0700
Subject: Update example flakes
---
examples/simple/flake.lock | 12 ++++++------
examples/simple/flake.nix | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'examples/simple')
diff --git a/examples/simple/flake.lock b/examples/simple/flake.lock
index a6a3fa9..fc92f40 100644
--- a/examples/simple/flake.lock
+++ b/examples/simple/flake.lock
@@ -8,11 +8,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1602454749,
- "narHash": "sha256-wSPZEl6xyqewPrNQg9k6z3DLshn2Fwha8mDv8ECWMf8=",
+ "lastModified": 1603740297,
+ "narHash": "sha256-yeTrA8AaLzDFICApX725gQhKoHNI2TCqWAeOl9axVZE=",
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "e5bd558c5b6505621d3b5a27e9b39bf54f6788a1",
+ "rev": "426fb3c489dcbb4ccbf98a3ab6a7fe25e71b95ca",
"type": "github"
},
"original": {
@@ -76,11 +76,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1602453019,
- "narHash": "sha256-bEzkPMG5JTFpd7xsl73/K/hZ9jBgiRKMdkpmwAG4lwI=",
+ "lastModified": 1603739127,
+ "narHash": "sha256-mdLESpo4jXrAynLp7ypRaqkx6IS1jx2l78f1tg9iiJU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a6fec75d0472670448b9708e1619fef2c36af9d5",
+ "rev": "d699505277b99e4698d90563c5eb1b62ba5ba0ea",
"type": "github"
},
"original": {
diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index a8ad0f7..e5003c7 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -16,6 +16,6 @@
};
};
- checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; };
+ checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
};
}
--
cgit v1.2.3