diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-01 15:42:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 15:42:32 -0500 |
| commit | 67d48c56a61fbdfe18e33a2f765373d581ac5724 (patch) | |
| tree | dac11b9f06a84fb73b5f1137c49f2f8c6ba721c9 /nix | |
| parent | 0ba47f71c0dd829114666d13776792f748682be3 (diff) | |
| parent | 6c595dd31155f5af377ece1f106e3bed4e395494 (diff) | |
| download | podman-67d48c56a61fbdfe18e33a2f765373d581ac5724.tar.gz podman-67d48c56a61fbdfe18e33a2f765373d581ac5724.tar.bz2 podman-67d48c56a61fbdfe18e33a2f765373d581ac5724.zip | |
Merge pull request #9180 from cevich/v3.0_static_remote
[v3.0] Use cachix for static build & include podman-remote build
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 2 | ||||
| -rw-r--r-- | nix/nixpkgs.json | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nix/default.nix b/nix/default.nix index 13b4585ea..7745d8b50 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -49,9 +49,11 @@ let buildPhase = '' patchShebangs . make bin/podman + make bin/podman-remote ''; installPhase = '' install -Dm755 bin/podman $out/bin/podman + install -Dm755 bin/podman-remote $out/bin/podman-remote ''; }; in self diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index d304de536..0cfb251f2 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nixos/nixpkgs", - "rev": "4a75203f0270f96cbc87f5dfa5d5185690237d87", - "date": "2020-12-29T03:18:48+01:00", - "path": "/nix/store/scswsm6r4jnhp9ki0f6s81kpj5x6jkn7-nixpkgs", - "sha256": "0h70fm9aa7s06wkalbadw70z5rscbs3p6nblb47z523nhlzgjxk9", + "rev": "ce7b327a52d1b82f82ae061754545b1c54b06c66", + "date": "2021-01-25T11:28:05+01:00", + "path": "/nix/store/dpsa6a1sy8hwhwjkklc52brs9z1k5fx9-nixpkgs", + "sha256": "1rc4if8nmy9lrig0ddihdwpzg2s8y36vf20hfywb8hph5hpsg4vj", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false |