diff --git a/flake.lock b/flake.lock index 8abf011c..24b8abcb 100644 --- a/flake.lock +++ b/flake.lock @@ -118,29 +118,13 @@ "type": "github" } }, - "nixpkgs-openwebrx": { - "locked": { - "lastModified": 1636560911, - "narHash": "sha256-TsyxmINKPni6lkrWhz6PkVjAb0uXyFVjn95vEzHnubE=", - "owner": "astro", - "repo": "nixpkgs", - "rev": "455ba6c08ea042718754db5a1d7b1389fd7d8f02", - "type": "github" - }, - "original": { - "owner": "astro", - "ref": "openwebrx", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1636267212, - "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=", + "lastModified": 1636976544, + "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35", + "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", "type": "github" }, "original": { @@ -235,7 +219,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgs-mobilizon": "nixpkgs-mobilizon", - "nixpkgs-openwebrx": "nixpkgs-openwebrx", "nixpkgs-unstable": "nixpkgs-unstable", "scrapers": "scrapers", "secrets": "secrets", diff --git a/flake.nix b/flake.nix index 873b6e2d..46634da7 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/release-21.05"; nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon"; - nixpkgs-openwebrx.url = "github:astro/nixpkgs/openwebrx"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; secrets.url = "git+ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"; secrets.inputs.sops-nix.follows = "sops-nix"; @@ -475,8 +474,7 @@ heliwatch.nixosModules.heliwatch ./hosts/containers/sdrweb ]; - # TODO: pending https://github.com/NixOS/nixpkgs/pull/145257 - nixpkgs = inputs.nixpkgs-openwebrx; + nixpkgs = inputs.nixpkgs-unstable; system = "x86_64-linux"; };