summaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
authorseth <[email protected]>2024-11-02 02:30:42 -0400
committerGitHub <[email protected]>2024-11-02 06:30:42 +0000
commit5689577cfbd7a62dcd4411d669c070963e39a653 (patch)
treee5e0ec764eb22bb4fd14425bbea9600175ebe4bc /flake.nix
parent4d66d61f2aae3c3c0a2e9556f33681f53e64a91f (diff)
fix: update for nix 2.24 (#20)
* chore(nix): cleanup flake * chore(nix): update flake.lock Flake lock file updates: • Updated input 'nix-filter': 'github:numtide/nix-filter/3342559a24e85fc164b295c3444e8a139924675b?narHash=sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj%2BrL8sRQsSM%3D' (2024-03-11) → 'github:numtide/nix-filter/776e68c1d014c3adde193a18db9d738458cd2ba4?narHash=sha256-SCHiL%2B1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I%3D' (2024-10-29) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/280db3decab4cbeb22a4599bd472229ab74d25e1?narHash=sha256-Jks8O42La%2Bnm5AMTSq/PvM5O%2BfUAhIy0Ce1QYqLkyZ4%3D' (2024-09-12) → 'github:NixOS/nixpkgs/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53?narHash=sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z%2Bw%3D' (2024-10-30) * fix: update for nix 2.24 nix path-info's output changed
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix19
1 files changed, 7 insertions, 12 deletions
diff --git a/flake.nix b/flake.nix
index 429b61c..040f5a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
];
forAllSystems = lib.genAttrs allSystems;
- nixpkgsFor = forAllSystems (system: nixpkgs.legacyPackages.${system});
+ nixpkgsFor = nixpkgs.legacyPackages;
in
{
checks = forAllSystems (
@@ -133,15 +133,10 @@
let
pkgs = nixpkgsFor.${system};
nixForecastPackages = lib.makeScope pkgs.newScope (final: self.overlays.default final pkgs);
-
- isCompatible = lib.meta.availableOn pkgs.stdenv.hostPlatform;
- filteredPackages = lib.filterAttrs (
- _: deriv: isCompatible deriv && lib.isDerivation deriv
- ) nixForecastPackages;
in
- filteredPackages
- // {
- default = filteredPackages.nix-forecast or pkgs.emptyFile;
+ {
+ inherit (nixForecastPackages) nix-forecast;
+ default = self.packages.${system}.nix-forecast;
}
);
@@ -163,8 +158,6 @@
pname = "nix-forecast";
inherit (passthru.cargoTOML.package) version;
- cargoLock.lockFile = ./Cargo.lock;
-
src = nix-filter {
root = self;
include = [
@@ -175,12 +168,14 @@
];
};
+ cargoLock.lockFile = ./Cargo.lock;
+
nativeBuildInputs = [
installShellFiles
makeBinaryWrapper
];
- buildInputs = lib.optionals stdenv.isDarwin [
+ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.SystemConfiguration
darwin.libiconv