From 49474fcb6055522d32656a6bb415f68212c7d87f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 28 Apr 2024 13:39:53 +1000 Subject: [PATCH] Revert "separate runtime dependencies" This reverts commit 71ab24a2ebb8a10cce8248e5f637067a9de6e6ff. --- flake.lock | 17 ----------------- flake.nix | 4 +--- pkgs/default.nix | 5 +---- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 360539c..9b39967 100644 --- a/flake.lock +++ b/flake.lock @@ -55,26 +55,9 @@ "inputs": { "mmdoc": "mmdoc", "nixpkgs": "nixpkgs", - "runtimeDeps": "runtimeDeps", "treefmt-nix": "treefmt-nix" } }, - "runtimeDeps": { - "locked": { - "lastModified": 1714247354, - "narHash": "sha256-6dFKqP/aCKIdpOgqgIQUrRT0NOfVc14ftNcdELa4Pu4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c8d7c8a78fb516c0842cc65346506a565c88014d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 18fd02b..edb9aad 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,10 @@ inputs.treefmt-nix.url = "github:numtide/treefmt-nix"; inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; - inputs.runtimeDeps.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - nixConfig.extra-substituters = "https://nix-community.cachix.org"; nixConfig.extra-trusted-public-keys = "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; - outputs = { self, nixpkgs, mmdoc, treefmt-nix, runtimeDeps } @ args: + outputs = { self, nixpkgs, mmdoc, treefmt-nix } @ args: let systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; eachSystem = f: nixpkgs.lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system}); diff --git a/pkgs/default.nix b/pkgs/default.nix index 73a9c9f..1161c0a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,5 @@ { nixpkgs , mmdoc -, runtimeDeps , system , self , ... @@ -8,11 +7,9 @@ let - runtimePkgs = import runtimeDeps { inherit system; }; - pkgs = import nixpkgs { inherit system; config = { allowBroken = true; }; }; - drvAttrs = attrs: with runtimePkgs; { + drvAttrs = attrs: with pkgs; { NIX = nix; GIT = git; JQ = jq;