diff --git a/flake.lock b/flake.lock index 93d69ffcc..ce1610303 100644 --- a/flake.lock +++ b/flake.lock @@ -265,16 +265,16 @@ }, "nixbsd-nixpkgs": { "locked": { - "lastModified": 1770284456, - "narHash": "sha256-nDAqW1zGtoqyzSTRScTQ7gBVj7jrxWaGmFbLkNwKw4M=", + "lastModified": 1771439456, + "narHash": "sha256-HtQgNJrjYvZdpqpPJddF+TxGCazNyxvA8umbDcjrxT8=", "ref": "refs/heads/master", - "rev": "53264f9cdbe07d0a6045b7e1a24668a61679f284", + "rev": "f84d6f6cd5f17d594439710f40349ba7d0706f4b", "shallow": true, "type": "git", "url": "https://github.com/NixOS/nixpkgs" }, "original": { - "rev": "53264f9cdbe07d0a6045b7e1a24668a61679f284", + "rev": "f84d6f6cd5f17d594439710f40349ba7d0706f4b", "shallow": true, "type": "git", "url": "https://github.com/NixOS/nixpkgs" diff --git a/flake.nix b/flake.nix index 74eb2b6fe..92db79102 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ nix-darwin.url = "github:nix-darwin/nix-darwin"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.url = "github:nix-community/nix-index-database"; - nixbsd-nixpkgs.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&rev=53264f9cdbe07d0a6045b7e1a24668a61679f284"; + nixbsd-nixpkgs.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&rev=f84d6f6cd5f17d594439710f40349ba7d0706f4b"; nixbsd.inputs.cppnix.follows = "freebsd-nix"; nixbsd.inputs.flake-compat.follows = "flake-compat"; nixbsd.inputs.nixpkgs.follows = "nixbsd-nixpkgs"; diff --git a/hosts/freebsd/configuration.nix b/hosts/freebsd/configuration.nix index 6773d2c17..b5b96da77 100644 --- a/hosts/freebsd/configuration.nix +++ b/hosts/freebsd/configuration.nix @@ -7,19 +7,6 @@ ./telegraf-service.nix ]; - nixpkgs.overlays = [ - (final: prev: { - # https://github.com/NixOS/nixpkgs/pull/485688 - ncurses = prev.ncurses.overrideAttrs (o: { - configureFlags = - o.configureFlags - ++ final.lib.optionals (final.stdenv.hostPlatform.isFreeBSD && final.stdenv.hostPlatform.isStatic) [ - "--without-cxx" - ]; - }); - }) - ]; - nixpkgs.buildPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-freebsd";