From 4d970f5bf5d3d375372fac6293a6614cce1c7463 Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 31 May 2022 22:41:41 -0700 Subject: [PATCH] remove nixpkgs-unstable from inputs we don't need it. the one package it was being used for is identical in nixpkgs stable --- flake.lock | 18 +----------------- flake.nix | 6 +----- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 44af221d..0b821a7c 100644 --- a/flake.lock +++ b/flake.lock @@ -82,29 +82,13 @@ "type": "indirect" } }, - "pkgs-unstable": { - "locked": { - "lastModified": 1653845079, - "narHash": "sha256-7ghaQZ+7JXLI9FgNH8+RQHAt3/ubT92j8NtjZleP6t4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b62ada430501de88dfbb08cea4eb98ead3a5e3e7", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "root": { "inputs": { "home-manager": "home-manager", "mobile-nixos": "mobile-nixos", "nixpkgs": "nixpkgs", "nurpkgs": "nurpkgs", - "pkgs-mobile": "pkgs-mobile", - "pkgs-unstable": "pkgs-unstable" + "pkgs-mobile": "pkgs-mobile" } } }, diff --git a/flake.nix b/flake.nix index 3c709120..384606da 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ { inputs = { nixpkgs.url = "nixpkgs/nixos-22.05"; - pkgs-unstable.url = "nixpkgs/nixos-unstable"; # pkgs-telegram.url = "nixpkgs/33775ec9a2173a08e46edf9f46c9febadbf743e8";# 2022/04/18; telegram 3.7.3. fails: nix log /nix/store/y5kv47hnv55qknb6cnmpcyraicay79fx-telegram-desktop-3.7.3.drv: g++: fatal error: cannot execute '/nix/store/njk5sbd21305bhr7gwibxbbvgbx5lxvn-gcc-9.3.0/libexec/gcc/aarch64-unknown-linux-gnu/9.3.0/cc1plus': execv: No such file or directory pkgs-mobile.url = "nixpkgs/dfd82985c273aac6eced03625f454b334daae2e8"; # WORKS: 2022/05/20; mobile-nixos follows this same commit. mobile-nixos = { @@ -21,7 +20,7 @@ nurpkgs.url = "github:nix-community/NUR"; }; - outputs = { self, nixpkgs, pkgs-unstable, pkgs-mobile, mobile-nixos, home-manager, nurpkgs }: { + outputs = { self, nixpkgs, pkgs-mobile, mobile-nixos, home-manager, nurpkgs }: { machines.uninsane = self.decl-bootable-machine { name = "uninsane"; system = "aarch64-linux"; }; machines.desko = self.decl-bootable-machine { name = "desko"; system = "x86_64-linux"; }; machines.lappy = self.decl-bootable-machine { name = "lappy"; system = "x86_64-linux"; }; @@ -90,9 +89,6 @@ # patch rpi uboot with something that fixes USB HDD boot ubootRaspberryPi4_64bit = next.callPackage ./pkgs/ubootRaspberryPi4_64bit { pkgs = prev; }; - # we care about keeping these packages up-to-date - electrum = pkgs-unstable.legacyPackages.${system}.electrum; - #### TEMPORARY NIXOS-UNSTABLE PACKAGES # pkgs-mobile' telegram doesn't build, so explicitly use the stable one.