jackmechem/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix left over merge conflict notation

Browse source
This commit is contained in:
Jack Mechem 2026-05-23 18:57:23 -07:00
parent 3c3e28d1cd
commit 1faebe8624
1 changed files with 14 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

71
flake.lock generated
View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1777436347, "lastModified": 1775271377,
"narHash": "sha256-RD/HyNMkmeN4zqENph5Xzks/fz/ZwdUyL1x8rr5tQyA=", "narHash": "sha256-0ru4G0uQeokPTlJGuRHf3ApBZMeuIRdUyp0SYi//RWM=",
"owner": "sadjow", "owner": "sadjow",
"repo": "claude-code-nix", "repo": "claude-code-nix",
"rev": "bf3e43090b15d1e335f08e21c80678d6457458e8", "rev": "214fdf6592f40a8bb472e80283c029d01fb6653d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -277,11 +277,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1777270315, "lastModified": 1775126147,
"narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=", "narHash": "sha256-J0dZU4atgcfo4QvM9D92uQ0Oe1eLTxBVXjJzdEMQpD0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6368eda62c9775c38ef7f714b2555a741c20c72d", "rev": "8d8c1fa5b412c223ffa47410867813290cdedfef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,31 +373,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1779357205, "lastModified": 1779508470,
"narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
<<<<<<< Updated upstream "rev": "29916453413845e54a65b8a1cf996842300cd299",
"rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1774386573,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
=======
"rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -510,38 +490,15 @@
"server-dash-mono": { "server-dash-mono": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
<<<<<<< Updated upstream "nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1777671232,
"narHash": "sha256-eLLr3lON++si1Ti+NXooj/cgA6dbkLlc2BahIllTHUY=",
"owner": "JackMechem",
"repo": "server-dash",
"rev": "c991fe7b6df55ce159754bc446efd1866dfb58b5",
"type": "github"
},
"original": {
"owner": "JackMechem",
"repo": "server-dash",
"type": "github"
}
},
"server-dash-api": {
"inputs": {
"flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_8",
=======
"nixpkgs": "nixpkgs_6",
>>>>>>> Stashed changes
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1779530119, "lastModified": 1779586719,
"narHash": "sha256-gxbpi0EWtqr/B94l92FH7oI1hStiwBCmytAmOsUnNPc=", "narHash": "sha256-zEkCjPV9W5UKVFqeJ53iH3kxJfuziusLBVDk/xJuSHc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "4cea6512b11ae0d11fd10ea215ca7a55f35828f7", "rev": "24355b1a89f7306d60132a17929be86a1e161bd7",
"revCount": 4, "revCount": 6,
"type": "git", "type": "git",
"url": "ssh://forgejo@gitssh.jackmechem.dev:443/jackmechem/server-dash-mono-repo.git" "url": "ssh://forgejo@gitssh.jackmechem.dev:443/jackmechem/server-dash-mono-repo.git"
}, },