From 1f724d47f1b2cbe78844218630c166a283660efb Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Wed, 22 Mar 2023 20:44:12 +0000
Subject: [PATCH] move configurations to confguration dir
---
configuration.nix => configuration/common.nix | 8 ++++----
configuration-darwin.nix => configuration/darwin.nix | 0
configuration-ghc.nix => configuration/ghc.nix | 0
flake.nix | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
rename configuration.nix => configuration/common.nix (65%)
rename configuration-darwin.nix => configuration/darwin.nix (100%)
rename configuration-ghc.nix => configuration/ghc.nix (100%)
diff --git a/configuration.nix b/configuration/common.nix
similarity index 65%
rename from configuration.nix
rename to configuration/common.nix
index a227487c..2042679c 100644
--- a/configuration.nix
+++ b/configuration/common.nix
@@ -8,13 +8,13 @@ final: prev: {
hopenssl = prev.hopenssl.override { openssl = pkgs.openssl_1_1; };
- libsodium = prev.callPackage ./pkgs/libsodium.nix { inherit (pkgs) libsodium; };
+ libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; };
saltine = addPkgconfigDepend prev.saltine pkgs.libsodium;
- splitmix = prev.callPackage ./pkgs/splitmix.nix { inherit (pkgs) testu01; };
+ splitmix = prev.callPackage ../pkgs/splitmix.nix { inherit (pkgs) testu01; };
- text-icu = prev.callPackage ./pkgs/text-icu.nix { icu-i18n = pkgs.icu; };
+ text-icu = prev.callPackage ../pkgs/text-icu.nix { icu-i18n = pkgs.icu; };
sdl2-image = addPkgconfigDepends prev.sdl2-image [ pkgs.libtiff pkgs.libdeflate pkgs.libwebp ];
@@ -22,5 +22,5 @@ final: prev: {
X11-xft = addPkgconfigDepends prev.X11-xft [ pkgs.expat pkgs.xorg.libXau pkgs.xorg.libXdmcp ];
- zlib = prev.callPackage ./pkgs/zlib.nix { inherit (pkgs) zlib; };
+ zlib = prev.callPackage ../pkgs/zlib.nix { inherit (pkgs) zlib; };
}
diff --git a/configuration-darwin.nix b/configuration/darwin.nix
similarity index 100%
rename from configuration-darwin.nix
rename to configuration/darwin.nix
diff --git a/configuration-ghc.nix b/configuration/ghc.nix
similarity index 100%
rename from configuration-ghc.nix
rename to configuration/ghc.nix
diff --git a/flake.nix b/flake.nix
index bbcda025..2ab6e98e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,10 +31,10 @@
legacyPackages = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) {
buildHaskellPackages = pkgs.haskell.packages.ghc944;
- compilerConfig = pkgs.callPackage ./configuration-ghc.nix { inherit haskellLib; };
+ compilerConfig = pkgs.callPackage ./configuration/ghc.nix { inherit haskellLib; };
configurationArm = { pkgs, haskellLib }: self: super: { };
- configurationCommon = import ./configuration.nix;
- configurationDarwin = import ./configuration-darwin.nix;
+ configurationCommon = import ./configuration/common.nix;
+ configurationDarwin = import ./configuration/darwin.nix;
configurationNix = { pkgs, haskellLib }: self: super: { };
ghc = pkgs.haskell.compiler.ghc944;
inherit haskellLib;
--
GitLab