Merge pull request #60 from numtide/build-go-module

default.nix

@@ -1,25 +1,24 @@
-{ system ? builtins.currentSystem
-, inputs ? import ./flake.lock.nix { }
-, nixpkgs ? import inputs.nixpkgs {
+{
+  system ? builtins.currentSystem,
+  inputs ? import ./flake.lock.nix { },
+  nixpkgs ? import inputs.nixpkgs {
     inherit system;
     # Makes the config pure as well. See <nixpkgs>/top-level/impure.nix:
     config = { };
     overlays = [ ];
-  }
-, buildGoPackage ? nixpkgs.buildGoPackage
+  },
+  buildGoModule ? nixpkgs.buildGoModule,
 }:
 let
-  versionFile = builtins.readFile ./version.go;
-  versionMatch = builtins.match ".*\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*" versionFile;
-  version = builtins.head versionMatch;
-  github-deploy = buildGoPackage
-    rec {
-      name = "github-deploy-${version}";
-      goPackagePath = "github.com/zimbatm/github-deploy";
-      src = nixpkgs.lib.cleanSource ./.;
-      # FIXME: for some reason the go reference rewrites are failing
-      allowGoReference = true;
-    };
+  inherit (nixpkgs) lib;
+  versionFile = lib.readFile ./version.go;
+  versionMatch = lib.match ".*\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*" versionFile;
+  version = lib.head versionMatch;
+  github-deploy = buildGoModule {
+    name = "github-deploy-${version}";
+    src = nixpkgs.lib.cleanSource ./.;
+    vendorHash = "sha256-vcm3UhqwiUCdope9TpfO/CQQsxM0eh8nhvOCv4bGCng=";
+  };
 in
 {
   inherit github-deploy;

flake.nix

@@ -1,30 +1,26 @@
 {
   inputs = {
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-    nixpkgs.url = "github:nixos/nixpkgs/release-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/release-24.05";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, flake-compat }:
+  outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
       let
-        pkgs = import nixpkgs { inherit system; };
         github-deploy = import self {
           inherit system;
           inputs = null;
           nixpkgs = nixpkgs.legacyPackages.${system};
         };
         name = "github-deploy";
       in
-      with pkgs;
       {
         devShell = github-deploy.devShell;
         packages.${name} = github-deploy.github-deploy;
+        packages.default = self.packages.${system}.github-deploy;
         defaultPackage = github-deploy.defaultPackage;
+
+        checks.${name} = github-deploy.github-deploy;
       }
     );
 }
-