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

update: jujutsu version

Browse Source
This commit is contained in:
Jeremy Wall 2024-11-20 14:18:22 -05:00
parent e33ccc18ac
commit 6cb30f0ed2
2 changed files with 127 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
nix/base-system/flake.lock generated
View File

@ -271,6 +271,24 @@
} }
}, },
"flake-utils_10": { "flake-utils_10": {
"inputs": {
"systems": "systems_9"
},
"locked": {
"lastModified": 1687709756,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_11": {
"locked": { "locked": {
"lastModified": 1649676176, "lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
@ -285,9 +303,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_11": { "flake-utils_12": {
"inputs": { "inputs": {
"systems": "systems_9" "systems": "systems_10"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -303,9 +321,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_12": { "flake-utils_13": {
"inputs": { "inputs": {
"systems": "systems_10" "systems": "systems_11"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -431,11 +449,11 @@
"systems": "systems_7" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +467,11 @@
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1687709756, "lastModified": 1710146030,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,6 +593,26 @@
"type": "github" "type": "github"
} }
}, },
"jujutsu-flake": {
"inputs": {
"flake-utils": "flake-utils_8",
"nixpkgs": "nixpkgs_9",
"rust-overlay": "rust-overlay_5"
},
"locked": {
"lastModified": 1732123224,
"narHash": "sha256-ak/hxe4VaBnNSHfaRanGivVdtxgSHdFd2ifXZ54QePo=",
"owner": "martinvonz",
"repo": "jj",
"rev": "ac0e531de5b0dc609562c34f9f1ab8558ea8a4cd",
"type": "github"
},
"original": {
"owner": "martinvonz",
"repo": "jj",
"type": "github"
}
},
"libtexpdf-src": { "libtexpdf-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -665,7 +703,7 @@
}, },
"naersk_5": { "naersk_5": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_14"
}, },
"locked": { "locked": {
"lastModified": 1650101877, "lastModified": 1650101877,
@ -715,8 +753,8 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_8", "flake-utils": "flake-utils_9",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
@ -757,9 +795,9 @@
}, },
"nil-flake_2": { "nil-flake_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_9", "flake-utils": "flake-utils_10",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_11",
"rust-overlay": "rust-overlay_5" "rust-overlay": "rust-overlay_6"
}, },
"locked": { "locked": {
"lastModified": 1694177726, "lastModified": 1694177726,
@ -808,6 +846,22 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1715787315,
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1690441914, "lastModified": 1690441914,
"narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=",
@ -823,7 +877,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_11": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1717179513, "lastModified": 1717179513,
"narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
@ -839,7 +893,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1689850295, "lastModified": 1689850295,
"narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=",
@ -855,7 +909,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_13": { "nixpkgs_14": {
"locked": { "locked": {
"lastModified": 1650109093, "lastModified": 1650109093,
"narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=", "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=",
@ -869,7 +923,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_14": { "nixpkgs_15": {
"locked": { "locked": {
"lastModified": 1682109806, "lastModified": 1682109806,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
@ -989,18 +1043,16 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1715787315, "lastModified": 1728538411,
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixos-unstable", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nurl-flake": { "nurl-flake": {
@ -1023,7 +1075,7 @@
}, },
"nurl-flake_2": { "nurl-flake_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1701273941, "lastModified": 1701273941,
@ -1049,10 +1101,11 @@
"durnitisp-flake": "durnitisp-flake", "durnitisp-flake": "durnitisp-flake",
"harpoon-src": "harpoon-src", "harpoon-src": "harpoon-src",
"heracles-flake": "heracles-flake", "heracles-flake": "heracles-flake",
"jujutsu-flake": "jujutsu-flake",
"neogit-src": "neogit-src_2", "neogit-src": "neogit-src_2",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nil-flake": "nil-flake_2", "nil-flake": "nil-flake_2",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_12",
"nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-darwin": "nixpkgs-darwin",
"nurl-flake": "nurl-flake_2", "nurl-flake": "nurl-flake_2",
"roslyn-lsp": "roslyn-lsp_2", "roslyn-lsp": "roslyn-lsp_2",
@ -1100,7 +1153,7 @@
"runwhen-flake": { "runwhen-flake": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_10", "flake-utils": "flake-utils_11",
"naersk": "naersk_5" "naersk": "naersk_5"
}, },
"locked": { "locked": {
@ -1142,7 +1195,7 @@
}, },
"rust-overlay-flake": { "rust-overlay-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_11", "flake-utils": "flake-utils_12",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1229,6 +1282,27 @@
} }
}, },
"rust-overlay_5": { "rust-overlay_5": {
"inputs": {
"nixpkgs": [
"jujutsu-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729304879,
"narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_6": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"nil-flake", "nil-flake",
@ -1256,10 +1330,10 @@
"sile-flake": { "sile-flake": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_12", "flake-utils": "flake-utils_13",
"gitignore": "gitignore", "gitignore": "gitignore",
"libtexpdf-src": "libtexpdf-src", "libtexpdf-src": "libtexpdf-src",
"nixpkgs": "nixpkgs_14" "nixpkgs": "nixpkgs_15"
}, },
"locked": { "locked": {
"lastModified": 1694595810, "lastModified": 1694595810,
@ -1305,6 +1379,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_11": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": { "systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

6
nix/base-system/flake.nix
View File

@ -35,7 +35,7 @@
# NOTE(jeremy): Currently this needs a newer nixpkgs version # NOTE(jeremy): Currently this needs a newer nixpkgs version
#inputs.nixpkgs.follows = "nixpkgs"; #inputs.nixpkgs.follows = "nixpkgs";
}; };
jujutsu-flake.url = "github:martinvonz/jj";
custom-flakes = { custom-flakes = {
url = "github:zaphar/nix-flakes"; url = "github:zaphar/nix-flakes";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -67,6 +67,7 @@
outputs = { outputs = {
darwin, darwin,
sile-flake, sile-flake,
jujutsu-flake,
runwhen-flake, runwhen-flake,
durnitisp-flake, durnitisp-flake,
rust-overlay-flake, rust-overlay-flake,
@ -230,6 +231,7 @@ EOF";
durnitisp = durnitisp-flake.defaultPackage."${system}"; durnitisp = durnitisp-flake.defaultPackage."${system}";
rust-overlay = rust-overlay-flake.overlays.default; rust-overlay = rust-overlay-flake.overlays.default;
sile = sile-flake.defaultPackage.${system}; sile = sile-flake.defaultPackage.${system};
jujutsu = jujutsu-flake.packages.${system}.jujutsu;
age = agenix-flake.packages."${system}".default; age = agenix-flake.packages."${system}".default;
nurl = nurl-flake.packages."${system}".default; nurl = nurl-flake.packages."${system}".default;
clio = clio-flake.packages."${system}".default; clio = clio-flake.packages."${system}".default;
@ -346,7 +348,6 @@ EOF";
victoriametrics victoriametrics
# TODO add sonic-pi here if it supports the arch # TODO add sonic-pi here if it supports the arch
unstablePkgs.dbeaver-bin unstablePkgs.dbeaver-bin
jujutsu
]) ])
#++ (with pkgs.ocamlPackages; [ #++ (with pkgs.ocamlPackages; [
# dune_3 # dune_3
@ -361,6 +362,7 @@ EOF";
durnitisp durnitisp
age age
nurl nurl
jujutsu
]; ];
}; };
}; };