diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index a87a734..425f1ff 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -24,10 +24,12 @@ agenix-flake, nil-flake, nurl-flake, + nixpkgs, ... # We don't use the self or nixpkgs args here so we just glob it. }: { systemModule = system: let runwhen = runwhen-flake.defaultPackage."${system}"; + nixPkgs = import nixpkgs { inherit system; }; durnitisp = durnitisp-flake.defaultPackage."${system}"; rust-overlay = rust-overlay-flake.overlays.default; sile = sile-flake.defaultPackage.${system}; @@ -84,7 +86,7 @@ environment.variables = { EDITOR="nvim"; PAGER="less -R"; - OMNISHARP_BIN = "${pkgs.omnisharp-roslyn}/bin/OmniSharp"; + OMNISHARP_BIN = "${nixPkgs.omnisharp-roslyn}/bin/OmniSharp"; }; environment.etc."nvim.lua" = { @@ -190,7 +192,7 @@ EOF"; awscli2 nil-pkg alloy6 - omnisharp-roslyn + nixPkgs.omnisharp-roslyn (tlaplus.override { adoptopenjdk-bin = jdk; }) @@ -205,7 +207,7 @@ EOF"; mkcert octave kubo - dotnet-sdk_7 + nixPkgs.dotnet-sdk_7 netcoredbg powershell rust-analyzer diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock index 28a171e..c23ac53 100644 --- a/nix/darwin/flake.lock +++ b/nix/darwin/flake.lock @@ -36,12 +36,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9HfOJnBrdvyK5KFee23K+PzfQQl03B6c2d1tjI/2Jow=", - "path": "/nix/store/vg0kcch2pr0xpwdjyw4z9g7cvd0by4gz-source/nix/base-system", + "narHash": "sha256-ZQs3QUQ5pSROCdIjljeekglluVqJTQJPCRhPmagDkUI=", + "path": "/nix/store/42325m36f5gg3jzx45prgxdnnhc9gkg5-source/nix/base-system", "type": "path" }, "original": { - "path": "/nix/store/vg0kcch2pr0xpwdjyw4z9g7cvd0by4gz-source/nix/base-system", + "path": "/nix/store/42325m36f5gg3jzx45prgxdnnhc9gkg5-source/nix/base-system", "type": "path" } }, @@ -513,16 +513,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1703646585, - "narHash": "sha256-+opnZCFE4k+EiTNxnpSOHoKcDFV2C6kgD802ApRhp8c=", + "lastModified": 1701282334, + "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9fc0de7eff04a03c9c43f5ff55d97d0e4e8f3141", + "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-23.11", + "ref": "23.11", "repo": "nixpkgs", "type": "github" } diff --git a/nix/darwin/flake.nix b/nix/darwin/flake.nix index dfd00ae..30dd8bb 100644 --- a/nix/darwin/flake.nix +++ b/nix/darwin/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/23.11"; darwin.url = "github:lnl7/nix-darwin"; base-system = { url = "../base-system/";