From 41f59e190af6e03be07b3bfea11d828a274e25ce Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Fri, 23 Feb 2024 14:34:56 +0100 Subject: [PATCH] flakify --- default.nix | 5 +---- flake-compat.nix | 10 ++++++++++ flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 12 ++++++++++++ 4 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 flake-compat.nix create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/default.nix b/default.nix index 70a0f56..7d0a944 100644 --- a/default.nix +++ b/default.nix @@ -1,8 +1,5 @@ let - _pkgs = import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/71d7a4c037dc4f3e98d5c4a81b941933cf5bf675.tar.gz"; - sha256 = "sha256:0mz1mrygnpwv87dd0sac32q3m8902ppn9zrkn4wrryljwvvpf60s"; - }) { config = {}; }; + _pkgs = import (import ./flake-compat.nix).nixpkgs { config = {}; }; in { pkgs ? _pkgs, ... }: { diff --git a/flake-compat.nix b/flake-compat.nix new file mode 100644 index 0000000..f620865 --- /dev/null +++ b/flake-compat.nix @@ -0,0 +1,10 @@ +(import + ( + let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in + fetchTarball { + url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + { src = ./.; } +).defaultNix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..17e2373 --- /dev/null +++ b/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..c720cf4 --- /dev/null +++ b/flake.nix @@ -0,0 +1,12 @@ +{ + description = "Wharfix examples"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + flake-compat.url = "github:edolstra/flake-compat"; + }; + + outputs = { self, nixpkgs, ... }: { + inherit nixpkgs; + }; +}