Upgrading nixpkgs for all but sile

This commit is contained in:
Jeremy Wall 2023-06-11 20:09:08 -04:00
parent 37b2804fb2
commit 7d756124ac
3 changed files with 32 additions and 11 deletions

View File

@ -105,20 +105,19 @@
nssTools nssTools
mkcert mkcert
octave octave
ipfs kubo
inputs.sile inputs.sile
inputs.runwhen inputs.runwhen
inputs.durnitisp inputs.durnitisp
inputs.jj inputs.jj
inputs.age inputs.age
nil
# TODO add sonic-pi here if it supports the arch # TODO add sonic-pi here if it supports the arch
]; ];
launchd.user.agents.ipfs = { launchd.user.agents.ipfs = {
serviceConfig = { serviceConfig = {
ProgramArguments = [ ProgramArguments = [
"${pkgs.ipfs}/bin/ipfs" "${pkgs.kubo}/bin/ipfs"
"daemon" "daemon"
"--init" "--init"
]; ];

26
nix/darwin/flake.lock generated
View File

@ -243,6 +243,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lua": {
"locked": {
"lastModified": 1677676435,
"narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1645937171, "lastModified": 1645937171,
@ -273,15 +289,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1680977908, "lastModified": 1686526929,
"narHash": "sha256-0Ehcgswo51+dx+QH5sZBqUOZh4JeTgrnxGTACSn8ZkA=", "narHash": "sha256-ybQ4GDx/AViKJfeu2PUWvxxlGcmVHVY15zay849i6dg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54731a8cea6d8b9d4fcb9ca7cbfc75ae1e07a171", "rev": "5f6396e85487aa59c801da5f7c87ac20098b2fa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -322,6 +339,7 @@
"durnitisp": "durnitisp", "durnitisp": "durnitisp",
"jj": "jj", "jj": "jj",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-lua": "nixpkgs-lua",
"runwhen": "runwhen", "runwhen": "runwhen",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
} }
@ -375,7 +393,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-lua"
] ]
}, },
"locked": { "locked": {

View File

@ -2,7 +2,8 @@
inputs = { inputs = {
# TODO(jwall): Pinning this to a fixed version of lua on darwin for now. # TODO(jwall): Pinning this to a fixed version of lua on darwin for now.
nixpkgs.url = "github:nixos/nixpkgs"; nixpkgs-lua.url = "github:nixos/nixpkgs?rev=a08d6979dd7c82c4cef0dcc6ac45ab16051c1169";
nixpkgs.url = "github:nixos/nixpkgs/release-23.05";
darwin.url = "github:lnl7/nix-darwin"; darwin.url = "github:lnl7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs"; darwin.inputs.nixpkgs.follows = "nixpkgs";
runwhen.url = "github:zaphar/runwhen?ref=v0.0.5"; runwhen.url = "github:zaphar/runwhen?ref=v0.0.5";
@ -11,12 +12,14 @@
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs-lua";
}; };
jj.url = "github:martinvonz/jj"; jj.url = "github:martinvonz/jj";
}; };
outputs = {self, nixpkgs, outputs = {self,
nixpkgs,
nixpkgs-lua,
darwin, darwin,
runwhen, runwhen,
durnitisp, durnitisp,
@ -29,6 +32,7 @@
forSystem = (system: forSystem = (system:
let let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
pkgs-lua = import nixpkgs-lua { inherit system; };
in in
darwin.lib.darwinSystem rec { darwin.lib.darwinSystem rec {
inherit system; inherit system;
@ -41,7 +45,7 @@
durnitisp = durnitisp.defaultPackage."${system}"; durnitisp = durnitisp.defaultPackage."${system}";
rust-overlay = rust-overlay.overlay; rust-overlay = rust-overlay.overlay;
#TODO(jwall): when the libtexpdf issue is fixed we can stop doing this #TODO(jwall): when the libtexpdf issue is fixed we can stop doing this
sile = pkgs.sile.overrideAttrs(oldAttrs: { doCheck = false; meta.broken = false; }); sile = pkgs-lua.sile.overrideAttrs(oldAttrs: { doCheck = false; meta.broken = false; });
jj = jj.defaultPackage."${system}"; jj = jj.defaultPackage."${system}";
age = agenix.packages."${system}".default; age = agenix.packages."${system}".default;
#nil = nil.packages."${system}".default; #nil = nil.packages."${system}".default;