From 0b27d2f1392d8a9ad6fb0c4aee735d8c7834dd8a Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 28 Jun 2022 12:33:31 +0200 Subject: [PATCH] sdrweb: switch to nixpkgs-unstable openwebrx 1.2.0 incoming --- flake.lock | 34 +++++++++++++++++----------------- flake.nix | 5 +++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 35e3eb95..b450ac72 100644 --- a/flake.lock +++ b/flake.lock @@ -360,22 +360,6 @@ "type": "github" } }, - "nixpkgs-openwebrx": { - "locked": { - "lastModified": 1655737596, - "narHash": "sha256-01ZiKa5VpvP2KYyTMu7p8Q/Vb17PPkNVaHVhVZlfipc=", - "owner": "astro", - "repo": "nixpkgs", - "rev": "33afc8b8a849cae112f072871a6e27ad1ff13acc", - "type": "github" - }, - "original": { - "owner": "astro", - "ref": "openwebrx", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -391,6 +375,22 @@ "type": "indirect" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1656239181, + "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1632864508, @@ -507,7 +507,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-mobilizon": "nixpkgs-mobilizon", - "nixpkgs-openwebrx": "nixpkgs-openwebrx", + "nixpkgs-unstable": "nixpkgs-unstable", "oparl-scraper": "oparl-scraper", "openwrt": "openwrt", "openwrt-imagebuilder": "openwrt-imagebuilder", diff --git a/flake.nix b/flake.nix index ad75c4c1..97398016 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon"; - nixpkgs-openwebrx.url = "github:astro/nixpkgs/openwebrx"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:nixos/nixos-hardware"; fenix = { url = "github:nix-community/fenix"; @@ -91,7 +91,7 @@ }; }; - outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, microvm, riscv64, oparl-scraper, ... }: + outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, microvm, riscv64, oparl-scraper, ... }: let inherit (nixpkgs) lib; forAllSystems = lib.genAttrs [ "aarch64-linux" "x86_64-linux" ]; @@ -591,6 +591,7 @@ }; sdrweb = nixosSystem' { + nixpkgs = nixpkgs-unstable; modules = [ self.nixosModules.microvm { nixpkgs.overlays = [ secrets.overlays.mucbot ]; }