walkah/athens
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

🐛 niv broken in aarch64-darwin unstable again

Browse Source
This commit is contained in:
James Walker 2023-01-01 13:37:25 -05:00
parent 08158fd335
commit b48348dacc
Signed by: walkah
GPG Key ID: 3C127179D6086E93
3 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
flake.lock
View File

@ -28,11 +28,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1668797197,
"narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=",
"lastModified": 1672327199,
"narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce",
"rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8",
"type": "github"
},
"original": {
@ -53,11 +53,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1672239216,
"narHash": "sha256-JZTEyFL8e6o2PgiAJVXIpwjxotfhj1GB6RZSP7dY7rg=",
"lastModified": 1672520044,
"narHash": "sha256-l7uwQ0DZ8k2/1srLozqjiiGWg91NBCTTj0uqbOILUQ4=",
"owner": "cachix",
"repo": "devenv",
"rev": "122474ed2213f6486f6fe78e290326a80319f7b7",
"rev": "493738c368612aec1f63ad9f28aa7726e057f411",
"type": "github"
},
"original": {
@ -85,11 +85,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1648199409,
"narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
@ -203,11 +203,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1671831633,
"narHash": "sha256-tANQOkJnlqK4M83KvvXFMFrIbR0xkloqXY5ruqzR3kE=",
"lastModified": 1672349765,
"narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d7eee202e597bc7789498a8664082cf0ffedaa8f",
"rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8",
"type": "github"
},
"original": {
@ -258,11 +258,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1671631481,
"narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=",
"lastModified": 1672566874,
"narHash": "sha256-/lmz3/xzdghGSFeCcTiKMjbj0uRmUqTZhh4HHeUJ++g=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd",
"rev": "0517e81e8ce24a0f4f9eebedbd7bbefcac97c058",
"type": "github"
},
"original": {
@ -274,11 +274,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1648219316,
"narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
"lastModified": 1671417167,
"narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
"rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7",
"type": "github"
},
"original": {
@ -322,11 +322,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1671459584,
"narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=",
"lastModified": 1672500394,
"narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "87b58217c9a05edcf7630b9be32570f889217aef",
"rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8",
"type": "github"
},
"original": {
@ -338,11 +338,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1671200928,
"narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=",
"lastModified": 1671983799,
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "757b82211463dd5ba1475b6851d3731dfe14d377",
"rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
"type": "github"
},
"original": {
@ -354,11 +354,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1671848398,
"narHash": "sha256-cJIIPd1kvCI6ne/S0facbiBNH7sZUzk405GfdSJPwZE=",
"lastModified": 1672428209,
"narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bb0359be0a1a08c8d74412fe8c69aa2ffb3f477e",
"rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847",
"type": "github"
},
"original": {
@ -383,11 +383,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1671452357,
"narHash": "sha256-HqzXiQEegpRQ4VEl9pEPgHSIxhJrNJ27HfN1wOc7w2E=",
"lastModified": 1672050129,
"narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "200790e9c77064c53eaf95805b013d96615ecc27",
"rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c",
"type": "github"
},
"original": {
@ -419,11 +419,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1671472949,
"narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=",
"lastModified": 1672543202,
"narHash": "sha256-nlCUtcIZxaBqUBG1GyaXhZmfyG5WK4e6LqypP8llX9E=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342",
"rev": "b35586cc5abacd4eba9ead138b53e2a60920f781",
"type": "github"
},
"original": {
@ -434,11 +434,11 @@
},
"utils": {
"locked": {
"lastModified": 1648297722,
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {

14
hosts/epicurus/darwin-configuration.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, dotfiles, ... }:
{ pkgs, dotfiles, ... }:
{
imports = [
./homebrew.nix
@ -9,7 +9,7 @@
# List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget
environment.systemPackages = with pkgs; [ emacs-nox vim ghc go gopls niv rustup stack ];
environment.systemPackages = with pkgs; [ emacs-nox vim ghc go gopls rustup stack ];
# Use a custom configuration.nix location.
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
@ -25,16 +25,6 @@
home-manager.users.walkah = import "${dotfiles}/home.nix";
nixpkgs.config.packageOverrides = pkgs: {
haskellPackages = pkgs.haskellPackages.override {
overrides = _self: super: {
niv = pkgs.haskell.lib.overrideCabal super.niv (_drv: {
enableSeparateBinOutput = false;
});
};
};
};
services.lorri.enable = true;
programs = {

10
modules/base/darwin.nix
View File

@ -35,4 +35,14 @@ _: {
upgrade = true;
};
};
nixpkgs.config.packageOverrides = pkgs: {
haskellPackages = pkgs.haskellPackages.override {
overrides = _self: super: {
niv = pkgs.haskell.lib.overrideCabal super.niv (_drv: {
enableSeparateBinOutput = false;
});
};
};
};
}