diff --git a/clojure/flake.lock b/clojure/flake.lock index 5a22a93..db74b56 100644 --- a/clojure/flake.lock +++ b/clojure/flake.lock @@ -2,12 +2,12 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", - "revCount": 574351, + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "revCount": 580425, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.574351%2Brev-612f97239e2cc474c13c9dafa0df378058c5ad8d/018d3085-aff0-7a0b-ab80-1a9c414de8cd/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.580425%2Brev-faf912b086576fd1a15fca610166c98d47bc667e/018d7cf8-4100-74ee-a53f-928188670608/source.tar.gz" }, "original": { "type": "tarball", diff --git a/flake.nix b/flake.nix index 9d25637..1f37d9d 100644 --- a/flake.nix +++ b/flake.nix @@ -160,6 +160,11 @@ description = "PHP development environment"; }; + podman = { + path = ./podman; + description = "Podman OCI container development environment"; + }; + protobuf = { path = ./protobuf; description = "Protobuf development environment"; diff --git a/podman/.envrc b/podman/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/podman/.envrc @@ -0,0 +1 @@ +use flake diff --git a/podman/flake.lock b/podman/flake.lock new file mode 100644 index 0000000..5a22a93 --- /dev/null +++ b/podman/flake.lock @@ -0,0 +1,25 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "revCount": 574351, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.574351%2Brev-612f97239e2cc474c13c9dafa0df378058c5ad8d/018d3085-aff0-7a0b-ab80-1a9c414de8cd/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/podman/flake.nix b/podman/flake.nix new file mode 100644 index 0000000..299d41c --- /dev/null +++ b/podman/flake.nix @@ -0,0 +1,30 @@ +{ + description = "A Nix-flake-based PHP development environment"; + + inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz"; + + outputs = { + self, + nixpkgs, + }: let + supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]; + forEachSupportedSystem = f: + nixpkgs.lib.genAttrs supportedSystems (system: + f { + pkgs = import nixpkgs {inherit system;}; + }); + in { + devShells = forEachSupportedSystem ({ + pkgs, + #config, + }: { + # virtualisation.podman = { + # enable = true; + # dockerCompat = true; + # }; + default = pkgs.mkShell { + packages = with pkgs; [podman podman-compose]; + }; + }); + }; +}