diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9d90652 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +.direnv +<<<<<<< HEAD +||||||| parent of 2ccfcd1 (fixup flake) +testgit +*.swp +======= +testgit +*.swp +result +>>>>>>> 2ccfcd1 (fixup flake) diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..efd85da --- /dev/null +++ b/flake.lock @@ -0,0 +1,39 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 0, + "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=", + "path": "/nix/store/yyddvwq452qsvpgb104mllpq0hkkmsqx-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..0dde919 --- /dev/null +++ b/flake.nix @@ -0,0 +1,29 @@ +{ + description = "Flake utils demo"; + + inputs.flake-utils.url = "github:numtide/flake-utils"; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; in + rec { + packages = flake-utils.lib.flattenTree { + hello = pkgs.callPackage ./nix { pkgs = pkgs; }; + gitAndTools = pkgs.gitAndTools; + }; + defaultPackage = packages.pad-archiver; + apps.pad-archiver = flake-utils.lib.mkApp { drv = packages.pad-archiver; }; + defaultApp = apps.pad-archiver; + devShell = pkgs.mkShell { + buildInputs = with pkgs; [ + go + gopls + gotools + go-tools + go-langserver + gopls + ]; + }; + } + ); +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..624065f --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module git.fginfo.tu-bs.de/fginfo/pad-archiver + +go 1.17 diff --git a/nix/default.nix b/nix/default.nix new file mode 100644 index 0000000..a02f5aa --- /dev/null +++ b/nix/default.nix @@ -0,0 +1,13 @@ +{ pkgs, lib, buildGoModule }: +buildGoModule { + pname = "pad-archiver"; + version = "0.0.1"; + src = ../.; + vendorSha256 = "sha256-e9I2mhSjLxMuCO9+g13XbDYI15Q879iG1AGZv6otuEA="; + meta = with lib; { + description = "Archives Etherpads with git"; + homepage = "https://git.fginfo.tu-bs.de/fginfo/pad-archiver"; + license = licenses.mit; + maintainers = [ "y0067212" ]; + }; +} diff --git a/pad-archiver b/pad-archiver new file mode 100755 index 0000000..d742661 Binary files /dev/null and b/pad-archiver differ