From b6e84f2596b78da497f63179d72c903bb9b92d4e Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Mon, 6 Nov 2023 12:39:26 +0400 Subject: [PATCH] git rid of NixOS configuration dependency --- flake.lock | 68 +----------------------------------------------------- flake.nix | 9 +------- 2 files changed, 2 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index b8e192d..670e85b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,18 +1,5 @@ { "nodes": { - "hardware-configuration-nix": { - "flake": false, - "locked": { - "lastModified": 1692731346, - "narHash": "sha256-rQIpYKwowqbbVVurEl5qNpuPfoRyEUMefoZXrUoO6p8=", - "path": "hardware-configuration.nix", - "type": "path" - }, - "original": { - "id": "hardware-configuration-nix", - "type": "indirect" - } - }, "nixpkgs": { "locked": { "lastModified": 1686476475, @@ -30,60 +17,7 @@ }, "root": { "inputs": { - "nixpkgs": [ - "selfprivacy-nixos-config", - "nixpkgs" - ], - "selfprivacy-nixos-config": "selfprivacy-nixos-config" - } - }, - "selfprivacy-nixos-config": { - "inputs": { - "hardware-configuration-nix": "hardware-configuration-nix", - "nixpkgs": "nixpkgs", - "selfprivacy-overlay": "selfprivacy-overlay", - "userdata-json": "userdata-json" - }, - "locked": { - "lastModified": 1695043402, - "narHash": "sha256-1zPdzEUQtuqVminXwrb1yfI7wydHfdtmBYSqUsgJlCA=", - "ref": "flake-to-override", - "rev": "3bf91c25c36d0e6dcf18b146ad95883f057dbd0b", - "revCount": 124, - "type": "git", - "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git" - }, - "original": { - "type": "git", - "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git" - } - }, - "selfprivacy-overlay": { - "locked": { - "lastModified": 1689554432, - "narHash": "sha256-hegMIgxBHUuRFbCecQpbjFfTHpduV3VZWr8OINtQO6k=", - "ref": "flakes", - "rev": "53ed9b3f5f70a7f2843ecbef7775307e23a2c1f4", - "revCount": 31, - "type": "git", - "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo.git" - }, - "original": { - "type": "git", - "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo.git" - } - }, - "userdata-json": { - "flake": false, - "locked": { - "lastModified": 1689259484, - "narHash": "sha256-Co3QGsxCjDspP5Nzzu1zICkee5CEq+ORlxSF3bFqbCY=", - "path": "userdata/userdata.json", - "type": "path" - }, - "original": { - "id": "userdata-json", - "type": "indirect" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 1f2e089..5e300f6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,7 @@ { description = "SelfPrivacy API application flake"; - inputs = { - selfprivacy-nixos-config.url = - "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git"; - - # nixpkgs is inherited from selfprivacy-nixos-config - # but can be overridden with `--override-input` option for nix build/flake - nixpkgs.follows = "selfprivacy-nixos-config/nixpkgs"; - }; + inputs.nixpkgs.url = "github:nixos/nixpkgs"; outputs = { nixpkgs, ... }: let