From 5e27bc6838920fe2948bc0953a519232bced0397 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Thu, 19 Aug 2021 12:07:33 +0200 Subject: Flake-ify --- default.nix | 21 --------------------- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 27 +++++++++++++++++++++++++++ pkgs/katex-wrapper/default.nix | 9 +++++---- pkgs/oomox-archdroid-icon-theme/default.nix | 8 ++++---- pkgs/oomox-gtk-theme/default.nix | 8 ++++---- pkgs/persistent-nix-shell/default.nix | 2 +- pkgs/xslt/build-xslt/default.nix | 10 +++++----- pkgs/xslt/input-xslt/default.nix | 12 ++++++------ pkgs/xslt/static-xslt/default.nix | 10 +++++----- 10 files changed, 84 insertions(+), 50 deletions(-) delete mode 100644 default.nix create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index 0e44786..0000000 --- a/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ system ? builtins.currentSystem, pkgs ? import { inherit system; }, ... }: - -let - callPackage = pkgs.lib.callPackageWith (pkgs // custom); - - custom = { - custom-neovim = callPackage ./pkgs/custom-neovim { }; - - oomox-gtk-theme = t : callPackage ./pkgs/oomox-gtk-theme { theme = t; }; - oomox-archdroid-icon-theme = c : callPackage ./pkgs/oomox-archdroid-icon-theme { color = c; }; - - katex-wrapper = callPackage ./pkgs/katex-wrapper { }; - - input-xslt = callPackage ./pkgs/xslt/input-xslt { }; - build-xslt = callPackage ./pkgs/xslt/build-xslt { }; - static-xslt = callPackage ./pkgs/xslt/static-xslt { }; - make-xslt = callPackage ./pkgs/xslt/make-xslt { }; - - persistent-nix-shell = callPackage ./pkgs/persistent-nix-shell { }; - }; -in custom diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..8dcae31 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1629271619, + "narHash": "sha256-by9D3OkEKk4rOzJIMbC0uP2wP3Bt81auP5xmbmPg2a8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7bbca9877caed472c6b5866ea09302cfcdce3dbf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..6b74c33 --- /dev/null +++ b/flake.nix @@ -0,0 +1,27 @@ +{ + description = "Custom derivations of Adrian Kummerlaender"; + + inputs = { + nixpkgs.url = github:NixOS/nixpkgs/nixos-21.05; + }; + + outputs = { self, nixpkgs, ... }: let + pkgs = import nixpkgs { system = "x86_64-linux"; }; + in { + custom-neovim = import ./pkgs/custom-neovim { inherit pkgs; }; + + katex-wrapper = import ./pkgs/katex-wrapper { inherit pkgs; }; + + input-xslt = import ./pkgs/xslt/input-xslt { inherit pkgs; }; + build-xslt = import ./pkgs/xslt/build-xslt { inherit pkgs; }; + static-xslt = import ./pkgs/xslt/static-xslt { inherit pkgs; }; + make-xslt = import ./pkgs/xslt/make-xslt { inherit pkgs; }; + + persistent-nix-shell = import ./pkgs/persistent-nix-shell { inherit pkgs; }; + + customizable = { + oomox-gtk-theme = t : import ./pkgs/oomox-gtk-theme { inherit pkgs; theme = t; }; + oomox-archdroid-icon-theme = c : import ./pkgs/oomox-archdroid-icon-theme { inherit pkgs; color = c; }; + }; + }; +} diff --git a/pkgs/katex-wrapper/default.nix b/pkgs/katex-wrapper/default.nix index ef1cce6..881883c 100644 --- a/pkgs/katex-wrapper/default.nix +++ b/pkgs/katex-wrapper/default.nix @@ -1,7 +1,7 @@ -{ stdenv, pkgs, ... }: +{ pkgs, ... }: let - katex-src = stdenv.mkDerivation rec { + katex-src = pkgs.stdenv.mkDerivation rec { name = "katex-src"; src = pkgs.fetchzip { @@ -19,10 +19,11 @@ let meta = { description = "KaTeX"; homepage = https://github.com/Khan/KaTeX; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = pkgs.stdenv.lib.licenses.mit; + platforms = pkgs.stdenv.lib.platforms.all; }; }; + in pkgs.writeTextFile { name = "katex-wrapper"; executable = true; diff --git a/pkgs/oomox-archdroid-icon-theme/default.nix b/pkgs/oomox-archdroid-icon-theme/default.nix index 764bf2f..923a3a2 100644 --- a/pkgs/oomox-archdroid-icon-theme/default.nix +++ b/pkgs/oomox-archdroid-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgs, color, ... }: +{ pkgs, color, ... }: -stdenv.mkDerivation rec { +pkgs.stdenv.mkDerivation rec { name = "oomox-archdroid-icon-theme"; src = pkgs.fetchFromGitHub { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "oomox-archdroid-icon-theme is a customizable fork of archdroid-icon-theme"; homepage = https://github.com/themix-project/archdroid-icon-theme; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = pkgs.stdenv.lib.licenses.gpl3; + platforms = pkgs.stdenv.lib.platforms.all; }; } diff --git a/pkgs/oomox-gtk-theme/default.nix b/pkgs/oomox-gtk-theme/default.nix index 11736f4..0d895b4 100644 --- a/pkgs/oomox-gtk-theme/default.nix +++ b/pkgs/oomox-gtk-theme/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgs, theme, ... }: +{ pkgs, theme, ... }: -stdenv.mkDerivation rec { +pkgs.stdenv.mkDerivation rec { name = "oomox-gtk-theme"; src = pkgs.fetchFromGitHub { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "oomox-gtk-theme is a customizable fork of numix-gtk-theme."; homepage = https://github.com/themix-project/oomox-gtk-theme; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = pkgs.stdenv.lib.licenses.gpl3; + platforms = pkgs.stdenv.lib.platforms.all; }; } diff --git a/pkgs/persistent-nix-shell/default.nix b/pkgs/persistent-nix-shell/default.nix index 906fc2d..904912f 100644 --- a/pkgs/persistent-nix-shell/default.nix +++ b/pkgs/persistent-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, ... }: +{ pkgs, ... }: pkgs.writeShellScriptBin "persistent-nix-shell" diff --git a/pkgs/xslt/build-xslt/default.nix b/pkgs/xslt/build-xslt/default.nix index 578786a..8a809e5 100644 --- a/pkgs/xslt/build-xslt/default.nix +++ b/pkgs/xslt/build-xslt/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub }: +{ pkgs, ... }: -stdenv.mkDerivation rec { +pkgs.stdenv.mkDerivation rec { name = "build-xslt"; - src = fetchFromGitHub { + src = pkgs.fetchFromGitHub { owner = "KnairdA"; repo = "BuildXSLT"; rev = "master"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { cp -r * $out/ ''; - meta = with stdenv.lib; { + meta = with pkgs.stdenv.lib; { description = "BuildXSLT"; homepage = https://github.com/KnairdA/BuildXSLT/; - license = stdenv.lib.licenses.mit; + license = pkgs.stdenv.lib.licenses.mit; }; } diff --git a/pkgs/xslt/input-xslt/default.nix b/pkgs/xslt/input-xslt/default.nix index 50ba070..b06e4af 100644 --- a/pkgs/xslt/input-xslt/default.nix +++ b/pkgs/xslt/input-xslt/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, boost, xalanc, xercesc, discount }: +{ pkgs, ... }: -stdenv.mkDerivation rec { +pkgs.stdenv.mkDerivation rec { name = "input-xslt"; - src = fetchFromGitHub { + src = pkgs.fetchFromGitHub { owner = "KnairdA"; repo = "InputXSLT"; rev = "master"; sha256 = "1p2y1m65h1k3g0nj8sgc05f9w880wngrd2n1b53dhhqq4scsj2a7"; }; - buildInputs = [ cmake boost xalanc xercesc discount ]; + buildInputs = with pkgs; [ cmake boost xalanc xercesc discount ]; - meta = with stdenv.lib; { + meta = with pkgs.stdenv.lib; { description = "InputXSLT"; homepage = https://github.com/KnairdA/InputXSLT/; - license = stdenv.lib.licenses.asl20; + license = pkgs.stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/xslt/static-xslt/default.nix b/pkgs/xslt/static-xslt/default.nix index f3fcce9..4a4601d 100644 --- a/pkgs/xslt/static-xslt/default.nix +++ b/pkgs/xslt/static-xslt/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub }: +{ pkgs, ... }: -stdenv.mkDerivation rec { +pkgs.stdenv.mkDerivation rec { name = "static-xslt"; - src = fetchFromGitHub { + src = pkgs.fetchFromGitHub { owner = "KnairdA"; repo = "StaticXSLT"; rev = "0b84f519cb418d32c0fd62f9c6c852ee31f7c926"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { cp -r * $out/ ''; - meta = with stdenv.lib; { + meta = with pkgs.stdenv.lib; { description = "StaticXSLT"; homepage = https://github.com/KnairdA/StaticXSLT/; - license = stdenv.lib.licenses.mit; + license = pkgs.stdenv.lib.licenses.mit; }; } -- cgit v1.2.3