diff options
| author | Mendes <mendes.oulamara@pm.me> | 2022-10-04 18:14:49 +0200 |
|---|---|---|
| committer | Mendes <mendes.oulamara@pm.me> | 2022-10-04 18:14:49 +0200 |
| commit | 829f815a897b04986559910bbcbf53625adcdf20 (patch) | |
| tree | 6db3c27cff2aded754a641d1f2b05c83be701267 /nix/common.nix | |
| parent | 99f96b9564c9c841dc6c56f1255a6e70ff884d46 (diff) | |
| parent | a096ced35562bd0a8877a1ee2f755be1edafe343 (diff) | |
| download | garage-829f815a897b04986559910bbcbf53625adcdf20.tar.gz garage-829f815a897b04986559910bbcbf53625adcdf20.zip | |
Merge remote-tracking branch 'origin/main' into optimal-layout
Diffstat (limited to 'nix/common.nix')
| -rw-r--r-- | nix/common.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nix/common.nix b/nix/common.nix index 5cd15c8a..aa59cdc0 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -4,18 +4,16 @@ rec { */ pkgsSrc = fetchTarball { # As of 2021-10-04 - url ="https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz"; + url = "https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz"; sha256 = "1xy9zpypqfxs5gcq5dcla4bfkhxmh5nzn9dyqkr03lqycm9wg5cr"; }; cargo2nixSrc = fetchGit { - # As of 2022-03-17 - url = "https://github.com/superboum/cargo2nix"; - ref = "main"; - rev = "bcbf3ba99e9e01a61eb83a24624419c2dd9dec64"; + # As of 2022-08-29, stacking two patches: superboum@dedup_propagate and Alexis211@fix_fetchcrategit + url = "https://github.com/Alexis211/cargo2nix"; + ref = "fix_fetchcrategit"; + rev = "4b31c0cc05b6394916d46e9289f51263d81973b9"; }; - - /* * Shared objects */ |