zaphar/dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Update jujutsu

Browse Source
This commit is contained in:
Jeremy Wall 2023-06-18 19:54:31 -04:00
parent 2ed648dfcf
commit 60c2b279cc
2 changed files with 63 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
nix/darwin/flake.lock generated
View File

@ -146,11 +146,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1649676176, "lastModified": 1667395993,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,11 +161,11 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1637014545, "lastModified": 1649676176,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,6 +190,21 @@
} }
}, },
"flake-utils_5": { "flake-utils_5": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
@ -230,14 +245,16 @@
}, },
"jj": { "jj": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1671036685, "lastModified": 1686876341,
"narHash": "sha256-sqku2+ZmidhCXB2RHY9FpMq9WyKyfoR8+6QEvLekv8Y=", "narHash": "sha256-JuZOBQzQc57GZ/yk0b6kwFIBuiWHzajuQ4/l88/4msk=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "ffbd6eb9459dde28ba0879b6b9d22eb0ad447844", "rev": "8b0c01d1e9afbc2fe4a12113436e9192a4e5dd33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -330,11 +347,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1651634615, "lastModified": 1683236849,
"narHash": "sha256-VtvcS61bLh5mIBm9cV3idUHdlfPRFus/NwdJfaj5s8o=", "narHash": "sha256-Y7PNBVLOBvZrmrFmHgXUBUA1lM72tl6JGIn1trOeuyE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "abfd31179174133ab8131139d650297bf4da63b7", "rev": "374ffe54403c3c42d97a513ac7a14ce1b5b86e30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -411,17 +428,17 @@
"jj": "jj", "jj": "jj",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"runwhen": "runwhen", "runwhen": "runwhen",
"rust-overlay": "rust-overlay_2", "rust-overlay": "rust-overlay_3",
"sile-flake": "sile-flake" "sile-flake": "sile-flake"
} }
}, },
"runwhen": { "runwhen": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"naersk": "naersk_2", "naersk": "naersk_2",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1654052497, "lastModified": 1654052497,
@ -440,7 +457,32 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": [
"jj",
"flake-utils"
],
"nixpkgs": [
"jj",
"nixpkgs"
]
},
"locked": {
"lastModified": 1674095406,
"narHash": "sha256-RexH/1rZTiX4OhdYkuJP3MuANJ+JRgoLKL60iHm//T0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "5f7315b9800e2e500e6834767a57e39f7dbfd495",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"runwhen", "runwhen",
"nixpkgs" "nixpkgs"
@ -460,9 +502,9 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_2": { "rust-overlay_3": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -484,7 +526,7 @@
"sile-flake": { "sile-flake": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_6",
"gitignore": "gitignore", "gitignore": "gitignore",
"libtexpdf-src": "libtexpdf-src", "libtexpdf-src": "libtexpdf-src",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"

3
nix/darwin/flake.nix
View File

@ -41,13 +41,12 @@
durnitisp = durnitisp.defaultPackage."${system}"; durnitisp = durnitisp.defaultPackage."${system}";
rust-overlay = rust-overlay.overlay; rust-overlay = rust-overlay.overlay;
sile = sile-flake.defaultPackage.${system}; sile = sile-flake.defaultPackage.${system};
jj = jj.defaultPackage."${system}"; jj = jj.packages."${system}".jujutsu;
age = agenix.packages."${system}".default; age = agenix.packages."${system}".default;
}; };
}); });
in in
{ {
darwinConfigurations."jeremys-mbp" = forSystem "aarch64-darwin"; darwinConfigurations."jeremys-mbp" = forSystem "aarch64-darwin";
darwinConfigurations."jeremys-mbpx86" = forSystem "x86_64-darwin";
}; };
} }