Merge pull request #122 from vlaci/flake

Added initial flake support

default.nix

@@ -1 +1 @@
-(import ./nix {}).openconnect-sso
+(import ./nix { }).openconnect-sso

flake.nix

@@ -0,0 +1,19 @@
+{
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, flake-utils, nixpkgs }: (flake-utils.lib.eachDefaultSystem (
+    system:
+    let
+      pkgs = nixpkgs.legacyPackages.${system};
+      openconnect-sso = (import ./nix { inherit pkgs; }).openconnect-sso;
+    in
+    {
+      packages = { inherit openconnect-sso; };
+      defaultPackage = openconnect-sso;
+    }
+  ) // {
+      overlay = import ./overlay.nix;
+  });
+}

nix/sources.nix

@@ -30,7 +30,8 @@ let
 
           $ niv modify <package> -a type=tarball -a builtin=true
       ''
-      builtins_fetchTarball { inherit (spec) url sha256; };
+      builtins_fetchTarball
+      { inherit (spec) url sha256; };
 
   fetch_builtin-url = spec:
     builtins.trace
@@ -58,19 +59,20 @@ let
     if hasNixpkgsPath
     then
       if hasThisAsNixpkgsPath
-      then import (builtins_fetchTarball { inherit (sources_nixpkgs) url sha256; }) {}
-      else import <nixpkgs> {}
+      then import (builtins_fetchTarball { inherit (sources_nixpkgs) url sha256; }) { }
+      else import <nixpkgs> { }
     else
-      import (builtins_fetchTarball { inherit (sources_nixpkgs) url sha256; }) {};
+      import (builtins_fetchTarball { inherit (sources_nixpkgs) url sha256; }) { };
 
   sources_nixpkgs =
     if builtins.hasAttr "nixpkgs" sources
     then sources.nixpkgs
-    else abort
-      ''
-        Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-        add a package called "nixpkgs" to your sources.json.
-      '';
+    else
+      abort
+        ''
+          Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+          add a package called "nixpkgs" to your sources.json.
+        '';
 
   hasNixpkgsPath = (builtins.tryEval <nixpkgs>).success;
   hasThisAsNixpkgsPath =
@@ -102,27 +104,30 @@ let
     let
       inherit (builtins) lessThan nixVersion fetchTarball;
     in
-      if lessThan nixVersion "1.12" then
-        fetchTarball { inherit url; }
-      else
-        fetchTarball attrs;
+    if lessThan nixVersion "1.12" then
+      fetchTarball { inherit url; }
+    else
+      fetchTarball attrs;
 
   # fetchurl version that is compatible between all the versions of Nix
   builtins_fetchurl = { url, sha256 }@attrs:
     let
       inherit (builtins) lessThan nixVersion fetchurl;
     in
-      if lessThan nixVersion "1.12" then
-        fetchurl { inherit url; }
-      else
-        fetchurl attrs;
+    if lessThan nixVersion "1.12" then
+      fetchurl { inherit url; }
+    else
+      fetchurl attrs;
 
 in
-mapAttrs (
-  name: spec:
-    if builtins.hasAttr "outPath" spec
-    then abort
-      "The values in sources.json should not have an 'outPath' attribute"
-    else
-      spec // { outPath = fetch name spec; }
-) sources
+mapAttrs
+  (
+    name: spec:
+      if builtins.hasAttr "outPath" spec
+      then
+        abort
+          "The values in sources.json should not have an 'outPath' attribute"
+      else
+        spec // { outPath = fetch name spec; }
+  )
+  sources

overlay.nix

@@ -1,3 +1,3 @@
-self: super: {
-  inherit (super.callPackage ./nix { pkgs = self; }) openconnect-sso;
+final: prev: {
+  inherit (prev.callPackage ./nix { pkgs = final; }) openconnect-sso;
 }

shell.nix

@@ -1 +1 @@
-(import ./nix {}).shell
+(import ./nix { }).shell