From 155661be6cccab09d812433c842afda56051e49f Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 20 Jan 2025 16:38:49 -0600 Subject: [PATCH] go back to using nixpkgs#attic --- flake.lock | 101 ------------------------------------ flake.nix | 17 +++--- hosts/algiz/services.nix | 4 +- hosts/othalan/default.nix | 5 -- hosts/othalan/settings/pkgs | 1 + overlays/default.nix | 2 - pkgs/default.nix | 12 +---- pkgs/lix/default.nix | 1 + todo.md | 1 + 9 files changed, 14 insertions(+), 130 deletions(-) diff --git a/flake.lock b/flake.lock index e7f6fdf..1159da3 100644 --- a/flake.lock +++ b/flake.lock @@ -54,21 +54,6 @@ "type": "github" } }, - "crane": { - "locked": { - "lastModified": 1736898272, - "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "f1multiviewer": { "inputs": { "nixpkgs": [ @@ -89,43 +74,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "lix-attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -486,38 +434,6 @@ "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" } }, - "lix-attic": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "lix": [ - "lix-module", - "lix" - ], - "lix-module": [ - "lix-module" - ], - "nix-github-actions": [], - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1736969694, - "narHash": "sha256-4OKeL5HbDNDKl1JgRH97HCe/QQjhLGB4pjxxYr5PTFc=", - "ref": "refs/heads/main", - "rev": "d413a74fa132cf5f421732dc7dd5cadda96fb874", - "revCount": 361, - "type": "git", - "url": "https://git.lix.systems/nrabulinski/attic.git" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/nrabulinski/attic.git" - } - }, "lix-module": { "inputs": { "flake-utils": [ @@ -666,22 +582,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-wayland": { "inputs": { "flake-compat": [], @@ -738,7 +638,6 @@ "jj": "jj", "lib-aggregate": "lib-aggregate", "lix": "lix", - "lix-attic": "lix-attic", "lix-module": "lix-module", "my-nixpkgs": "my-nixpkgs", "nim2nix": "nim2nix", diff --git a/flake.nix b/flake.nix index f62183c..26f6f19 100644 --- a/flake.nix +++ b/flake.nix @@ -61,13 +61,14 @@ tsm.inputs.nim2nix.follows = "nim2nix"; utils.inputs.nim2nix.follows = "nim2nix"; - lix-attic = { - url = "git+https://git.lix.systems/nrabulinski/attic.git"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix-module.follows = "lix-module"; - # make lix-module source of truth - inputs.lix.follows = "lix-module/lix"; - }; + # lix-attic = { + # url = "git+https://git.lix.systems/nrabulinski/attic.git"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.lix-module.follows = "lix-module"; + # # make lix-module source of truth + # inputs.lix.follows = "lix-module/lix"; + # inputs.nix-github-actions.follows = ""; + # }; # roc = { # url = "github:roc-lang/roc"; @@ -95,7 +96,7 @@ nixos-wsl.inputs.flake-compat.follows = ""; nixpkgs-wayland.inputs.flake-compat.follows = ""; nixpkgs-wayland.inputs.nix-eval-jobs.follows = ""; - lix-attic.inputs.nix-github-actions.follows = ""; + }; nixConfig = { diff --git a/hosts/algiz/services.nix b/hosts/algiz/services.nix index 10683b6..21c30f2 100644 --- a/hosts/algiz/services.nix +++ b/hosts/algiz/services.nix @@ -1,7 +1,6 @@ { pkgs, enabled, - flake, ... }: let @@ -25,13 +24,12 @@ in }; security.polkit = enabled; # attic was looking for this... - environment.systemPackages = [ (flake.pkgs "self").attic-client ]; + environment.systemPackages = with pkgs; [ attic-client ]; # allow docker to forward the request to the host running attic # https://discourse.nixos.org/t/docker-container-not-resolving-to-host/30259/6 # networking.firewall.extraCommands = "iptables -A INPUT -p tcp --destination-port ${atticPort} -s 172.16.0.0/12 -j ACCEPT"; services.atticd = enabled // { - package = (flake.pkgs "self").attic-server; # Replace with absolute path to your credentials file # TODO: replace with sops-secret! diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix index 2db0da0..13d1b74 100644 --- a/hosts/othalan/default.nix +++ b/hosts/othalan/default.nix @@ -1,7 +1,6 @@ { config, enabled, - flake, ... }: { @@ -28,8 +27,4 @@ }; }; - environment.systemPackages = [ - (flake.pkgs "self").attic-client - ]; - } diff --git a/hosts/othalan/settings/pkgs b/hosts/othalan/settings/pkgs index 56ac61f..438bc50 100644 --- a/hosts/othalan/settings/pkgs +++ b/hosts/othalan/settings/pkgs @@ -8,3 +8,4 @@ graphviz charm-freeze quarto calibre +attic-client diff --git a/overlays/default.nix b/overlays/default.nix index 7fe0ea4..b79e668 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -5,10 +5,8 @@ (final: prev: { - # make sure attic is using this lix nix = inputs.self.packages.${final.system}.lix; - stable = import inputs.stable { system = final.system; config.allowUnfree = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index ba06175..7d6cbf5 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,14 +6,6 @@ let inherit (lib) flakeFromSystem; flake = flakeFromSystem pkgs.system; - lix = pkgs.callPackage ./lix { inherit flake; }; - - # make attic also use the "no check lix" - atticPackages = pkg: { - "${pkg}" = (flake.pkgs "lix-attic").${pkg}.overrideAttrs (oldAttrs: { - buildInputs = [ pkgs.boost lix ]; - }); - }; in { @@ -25,10 +17,8 @@ in llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { }; - lix = lix; + lix = pkgs.callPackage ./lix { inherit flake; }; } -// (atticPackages "attic-client") -// (atticPackages "attic-server") // (flake.toPackageAttrs [ "pixi" "f1multiviewer" diff --git a/pkgs/lix/default.nix b/pkgs/lix/default.nix index 9968a9f..3912f34 100644 --- a/pkgs/lix/default.nix +++ b/pkgs/lix/default.nix @@ -1,5 +1,6 @@ { flake, ... }: ((flake.pkgs "lix-module").default.override { + # is this doing anything? aws-sdk-cpp = null; }).overrideAttrs (attrs: { diff --git a/todo.md b/todo.md index ae32432..f610c13 100644 --- a/todo.md +++ b/todo.md @@ -2,6 +2,7 @@ ## oizys + ## software - [ ] switch systemd desktop file to libvirt VM