mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix flake lock

Browse Source
This commit is contained in:
mjallen18
2024-04-15 15:12:13 -05:00
parent df83fa93d4
commit 74ae425c7b
1 changed files with 0 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
flake.lock generated
View File

@@ -53,19 +53,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1713178514, "lastModified": 1713178514,
"narHash": "sha256-WbG/7YWAT0n37LS7unI6gJjYQERkORsRXRovBCXAYqw=", "narHash": "sha256-WbG/7YWAT0n37LS7unI6gJjYQERkORsRXRovBCXAYqw=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "546bfa46a80292e800d2767db90170d64d92c200", "rev": "546bfa46a80292e800d2767db90170d64d92c200",
=======
"lastModified": 1712786091,
"narHash": "sha256-YK84WXkrqs0/uVoXb8x3+xx1P1dn/IoO+DwD6P/+7n0=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "0d1cb79bc1fdae025f557f6c5053c69b35f4cc35",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -121,19 +113,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1712765734, "lastModified": 1712765734,
"narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=", "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1", "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1",
=======
"lastModified": 1712690805,
"narHash": "sha256-5/gL5CM1MeuHh3zoSyt07lhJTb5GBGRTIGFqONyJl9g=",
"owner": "girlbossceo",
"repo": "conduwuit",
"rev": "6345742e8b83a528353beb0fbb0e5b54aa39191d",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -400,19 +384,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1713166971, "lastModified": 1713166971,
"narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
=======
"lastModified": 1712759992,
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -428,19 +404,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1713166971, "lastModified": 1713166971,
"narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
=======
"lastModified": 1712759992,
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -473,19 +441,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1712909442, "lastModified": 1712909442,
"narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55",
=======
"lastModified": 1712521891,
"narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -507,19 +467,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1712983637, "lastModified": 1712983637,
"narHash": "sha256-PSoOKfevRvoVZdMqijl9VcaB5OqgCoAgQ8UpsEAdEDQ=", "narHash": "sha256-PSoOKfevRvoVZdMqijl9VcaB5OqgCoAgQ8UpsEAdEDQ=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "82c85ba7542b0a5c938f53d71f9a481fc37eda1d", "rev": "82c85ba7542b0a5c938f53d71f9a481fc37eda1d",
=======
"lastModified": 1712679520,
"narHash": "sha256-TQ9Y4wQV+wIuMBGkwbkDey+mcfdHH+ix7ccepzFQBNc=",
"owner": "martinvonz",
"repo": "jj",
"rev": "580a90b6944f3a658e5bdea8d6f43afebd91eda7",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -579,19 +531,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1712992043, "lastModified": 1712992043,
"narHash": "sha256-xUbqDxGiDab1et16JupBHpliGNpRSUcKfm++7t0UgBo=", "narHash": "sha256-xUbqDxGiDab1et16JupBHpliGNpRSUcKfm++7t0UgBo=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "71be19b234d58f4ec447e921633506beb81a52c0", "rev": "71be19b234d58f4ec447e921633506beb81a52c0",
=======
"lastModified": 1712736594,
"narHash": "sha256-r9i9cZUB02l0qhJ7Q4g3zXM8uClM4zxjEYM1AAFq48I=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "0cd149c939c1f756a96381a84801073021ac1e63",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -693,19 +637,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1712909959, "lastModified": 1712909959,
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
=======
"lastModified": 1712760404,
"narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -717,21 +653,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1712963716, "lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"revCount": 611350, "revCount": 611350,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.611350%2Brev-cfd6b5fc90b15709b780a5a1619695a88505a176/018eddfc-e6d9-74bb-a823-20f2ae60079b/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.611350%2Brev-cfd6b5fc90b15709b780a5a1619695a88505a176/018eddfc-e6d9-74bb-a823-20f2ae60079b/source.tar.gz"
=======
"lastModified": 1712608508,
"narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"revCount": 609462,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.609462%2Brev-4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6/018ec465-ecc0-7383-ad59-bf84009e7b07/source.tar.gz"
>>>>>>> Stashed changes
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -772,19 +699,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1713013257, "lastModified": 1713013257,
"narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
=======
"lastModified": 1712741485,
"narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -825,19 +744,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1712963716, "lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
=======
"lastModified": 1712608508,
"narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
>>>>>>> Stashed changes
"type": "github" "type": "github"
}, },
"original": { "original": {