Skip to content

Commit

Permalink
Use flake-compat
Browse files Browse the repository at this point in the history
  • Loading branch information
kugland committed Jan 9, 2025
1 parent 13c223f commit e05862d
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 25 deletions.
30 changes: 13 additions & 17 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
{
pkgs ? import <nixpkgs> { },
fenix ? import (fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz") { },
}: rec {
# The `lib`, `modules`, and `overlays` names are special
lib = import ./lib { inherit pkgs; }; # functions
modules = import ./modules; # NixOS modules
overlays = import ./overlays; # nixpkgs overlays

auditok = pkgs.callPackage ./pkgs/auditok { };
bip39 = pkgs.callPackage ./pkgs/bip39 { };
ffsubsync = pkgs.callPackage ./pkgs/ffsubsync { inherit auditok pysubs2; };
my-bookmarks-pl = pkgs.callPackage ./pkgs/my-bookmarks-pl { };
neocities-deploy = pkgs.callPackage ./pkgs/neocities-deploy { inherit fenix; };
pysubs2 = pkgs.callPackage ./pkgs/pysubs2 { };
subtitlecomposer = pkgs.callPackage ./pkgs/subtitlecomposer { };
}
(import
(
let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
nodeName = lock.nodes.root.inputs.flake-compat;
in
fetchTarball {
url = lock.nodes.${nodeName}.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
sha256 = lock.nodes.${nodeName}.locked.narHash;
}
)
{ src = ./.; }
).defaultNix
14 changes: 14 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 19 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
description = "My personal NUR repository";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
};
outputs =
{ self
, fenix
, nixpkgs
,
, flake-compat
}:
let
systems = [
Expand All @@ -29,10 +26,24 @@
modules = import ./modules;

legacyPackages = forAllSystems (system:
import ./default.nix {
pkgs = import nixpkgs { inherit system; };
let
pkgs = import nixpkgs { inherit system; };
in rec {
# The `lib`, `modules`, and `overlays` names are special
lib = import ./lib { inherit pkgs; }; # functions
modules = import ./modules; # NixOS modules
overlays = import ./overlays; # nixpkgs overlays

auditok = pkgs.callPackage ./pkgs/auditok { };
bip39 = pkgs.callPackage ./pkgs/bip39 { };
ffsubsync = pkgs.callPackage ./pkgs/ffsubsync { inherit auditok pysubs2; };
my-bookmarks-pl = pkgs.callPackage ./pkgs/my-bookmarks-pl { };
neocities-deploy = pkgs.callPackage ./pkgs/neocities-deploy {
fenix = fenix.outputs.packages.${system};
});
};
pysubs2 = pkgs.callPackage ./pkgs/pysubs2 { };
subtitlecomposer = pkgs.callPackage ./pkgs/subtitlecomposer { };
});
packages = forAllSystems (system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system});
};
}

0 comments on commit e05862d

Please sign in to comment.