genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 09:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #385 from genebean/flox-mac

Browse source 
Flox fixing and updates
This commit is contained in:
Gene Liverman 2024-04-09 11:47:28 -04:00 • committed by GitHub
commit 899ed0df90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 47 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

81
flake.lock generated
View file

@ -3,16 +3,16 @@
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1705326576, "lastModified": 1711985568,
"narHash": "sha256-9PvMgHgdbpb5vBO8fHCRufodR731ynzGMF9+68vKWck=", "narHash": "sha256-VLeP9HGQwfkiuHDp648PXGCkogr3ktYm0q9Yj+i0lGQ=",
"owner": "Homebrew", "owner": "Homebrew",
"repo": "brew", "repo": "brew",
"rev": "1c612baa096c69f2fcb221c74e6f5b9979efdcee", "rev": "bd1155be8f50998429a795c15a69c8fe75250510",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Homebrew", "owner": "Homebrew",
"ref": "4.2.4", "ref": "4.2.16",
"repo": "brew", "repo": "brew",
"type": "github" "type": "github"
} }
@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710906792, "lastModified": 1712612224,
"narHash": "sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo=", "narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "e9875b969086a53dff5ec4677575ad3156fc875d", "rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +120,11 @@
"sqlite3pp": "sqlite3pp" "sqlite3pp": "sqlite3pp"
}, },
"locked": { "locked": {
"lastModified": 1710948909, "lastModified": 1712601482,
"narHash": "sha256-kESddzTIzBUGToPgBcM2kFiKt1Njyo2wYwPb8GqAhIM=", "narHash": "sha256-MpiJmDRewGJT/jUl3IRKiiSfFVtA+bAzMZAKXMqL+a8=",
"owner": "flox", "owner": "flox",
"repo": "flox", "repo": "flox",
"rev": "21e1a2929eeadfb6e128d6f991f82ae029bf7e07", "rev": "7092e6d6108e1ed6e4989aa1ced779828ec79e37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,16 +136,17 @@
"flox-latest": { "flox-latest": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1710260111, "lastModified": 1711561242,
"narHash": "sha256-UYfalL+kEnHO6GOJzi5GqFlz8lo/vu7BFLBExNG5xXo=", "narHash": "sha256-oCnthe0/sSZi8lDA2kYliG/J++CBoEiEV8Go8TNwbOQ=",
"ref": "latest", "ref": "refs/tags/v1.0.2",
"rev": "8e5a1c7a38111fddc1ef34052f50919e195151ad", "rev": "947bd4c4a3b660d308a01a05d32ed62e495ef69f",
"revCount": 1108, "revCount": 1150,
"type": "git", "type": "git",
"url": "ssh://git@github.com/flox/flox" "url": "ssh://git@github.com/flox/flox"
}, },
"original": { "original": {
"ref": "latest", "ref": "refs/tags/v1.0.2",
"rev": "947bd4c4a3b660d308a01a05d32ed62e495ef69f",
"type": "git", "type": "git",
"url": "ssh://git@github.com/flox/flox" "url": "ssh://git@github.com/flox/flox"
} }
@ -195,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706981411, "lastModified": 1712386041,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37", "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -216,11 +217,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710717205, "lastModified": 1711763326,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,11 +250,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1708781964, "lastModified": 1711997375,
"narHash": "sha256-qbEZgB1mNuMADLmM64EtcRjDHXR3UFL4xVmoanv9wZU=", "narHash": "sha256-KvU4gOtuFMS9Il67glRGtdNfguAINT9pCaXtvCL8uI8=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "09d07c73b4d9771f527a168e0b1b6d8a1f39de28", "rev": "45bf66f7068db79b552da864c0e87452be624d6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +271,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1705952034, "lastModified": 1712182779,
"narHash": "sha256-H0nk8Gk8kPw4yi2WwOTsSHgPrzSwyNgWEYHk10IJwfc=", "narHash": "sha256-DchWIKi4c7Jl7CJXVzOxVetxy+SqnlAY3QuUNy8z+aE=",
"owner": "zhaofengli-wip", "owner": "zhaofengli-wip",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "40f5ee46b58e7c5f1927e2c5a583dc3d7e571ed9", "rev": "445f7989e096fb90902eed4256b04d8b57c8b358",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,11 +334,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1710628718, "lastModified": 1712437997,
"narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,11 +350,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1710889954, "lastModified": 1712634594,
"narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "narHash": "sha256-fzBqUvcJjjyIapioiaW5b/mj7V/xxljDt864JrDC5qI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "rev": "0dca19054c663a0cf3b471be3c3079acfd623924",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +395,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1710951922, "lastModified": 1712639375,
"narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", "narHash": "sha256-V/7wFmh6O1OGOrlk//CTW9q4lYpb/RB3p2tRQNws95U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f091af045dff8347d66d186a62d42aceff159456", "rev": "73844014f48f8f968f98366b33bbdcf693d6d407",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +456,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1710644594, "lastModified": 1712617241,
"narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
modules/system/common/all-darwin.nix
View file

@ -93,10 +93,14 @@
"nix-command" "nix-command"
"repl-flake" "repl-flake"
]; ];
extra-trusted-public-keys = [ trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
]; ];
extra-trusted-substituters = [ substituters = [
"https://cache.nixos.org"
];
trusted-substituters = [
"https://cache.flox.dev" "https://cache.flox.dev"
]; ];
trusted-users = [ "@admin" "${username}" ]; trusted-users = [ "@admin" "${username}" ];