diff --git a/.direnv/flake-profile b/.direnv/flake-profile index d91a070c7f80c5334d00f348b3603e05ac45b142..f329b977a421bd603c7029bd09ca2abd11d6d4a4 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-29-link \ No newline at end of file +flake-profile-30-link \ No newline at end of file diff --git a/.direnv/flake-profile-30-link b/.direnv/flake-profile-30-link new file mode 120000 index 0000000000000000000000000000000000000000..e2653f7fca56b1a6afcfadf2141f3f258851b72d --- /dev/null +++ b/.direnv/flake-profile-30-link @@ -0,0 +1 @@ +/nix/store/12arpillhz2dy9g6qxli8hrpa918zgdd-bob-0.6.0-env \ No newline at end of file diff --git a/.gitignore b/.gitignore index b17bdcadbfa2be48e0fe0397b04a840e096a0eca..6cfc7f11ab2f04ec596c185fa677fd978011fe7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ +result +result-* + # Makefile comes from update Makefile.example diff --git a/flake.nix b/flake.nix index 4e9c0e9b7597661b18d25d6558d22a64d710b169..890aa849f18e02594ab71ad5929bbd77fc5d7e11 100644 --- a/flake.nix +++ b/flake.nix @@ -51,9 +51,18 @@ #vendorSha256 = pkgs.lib.fakeSha256; vendorSha256 = "sha256-XdB+u94Rqsb29jVs4miyOq1NEYaVJHWFXg6QebFJzNQ="; - excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ]; + excludedPackages = [ "developemt" ]; doCheck = false; + + meta = with pkgs.lib; { + description = "Bob: The HTML and HTML fragment builder"; + homepage = "https://gitlab.schukai.com/oss/bob"; + license = licenses.mit; + maintainers = with maintainers; [ "schukai GmbH" ]; + }; + + }; }); @@ -64,175 +73,3 @@ }; } - -# -#{ -# description = "Bob: The HTML and HTML fragment builder"; -# -# inputs = { -# nixpkgs.url = "nixpkgs/nixos-unstable"; -# utils.url = "github:numtide/flake-utils"; -# }; -# -# outputs = { self, lib, nixpkgs, ... }@inputs: -# -# let -# -# lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101"; -# -# supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; -# -# forAllSystems = nixpkgs.lib.genAttrs supportedSystems; -# -# nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); -# -# -# in { -# -# bob = buildGoModule rec { -# pname = "bob"; -# version = "0.3.4"; -# -# src = ././application/source; -# -# vendorHash = lib.fakeSha256; -# -# meta = with lib; { -# description = "Bob: The HTML and HTML fragment builder"; -# homepage = "https://gitlab.schukai.com/oss/bob"; -# license = licenses.mit; -# maintainers = with maintainers; [ "schukai GmbH" ]; -# }; -# -# CGO_ENABLED = 0; -# -# }; - - - -# # Notice the reference to nixpkgs here. -# with import nixpkgs { system = "x86_64-linux"; }; -# stdenv.mkDerivation { -# name = "bob"; -# src = self; -# buildPhase = "env GOFLAGS= GOWORK=off GO111MODULE=on GOOS=$GOOS GOARCH=$GOARCH go build -o bob"; -# installPhase = "mkdir -p $out/bin; install -t $out/bin bob"; -# }; - -# -# }; -#} - -# outputs = { self, nixpkgs, flake-utils }: -# flake-utils.lib.eachDefaultSystem (system: -# let -# -# rootPath = ./.; -# releaseJson = builtins.fromJSON (builtins.readFile "${rootPath}/release.json"); -# currentVersion = releaseJson.version; -# -# overlay = (final: prev: { -# -# bob = final.buildGoModule rec { -# name = "bob"; -# src = bobSource; -# vendorHash = null; -# ldflags=''-X main.version=${currentVersion} -X main.build=${self.lastModifiedDate}''; -# }; -# }); -# -# pkgs = import nixpkgs { -# inherit system; -# overlays = [ overlay ]; -# }; -# -# in { -# packages = { bob = pkgs.bob; }; -# }); -#} -# - - - - -# let -# rootPath = ./.; -# releaseJson = builtins.fromJSON (builtins.readFile "${rootPath}/release.json"); -# currentVersion = releaseJson.version; -# -# gomod2nix = { -# url = "github:tweag/gomod2nix"; -# inputs.nixpkgs.follows = "nixpkgs"; -# inputs.utils.follows = "utils"; -# }; -# -# systems = [ "x86_64-linux" "aarch64-linux" ]; -# forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system); -## makePackage = system: -## let -## pkgs = import nixpkgs { inherit system; overlays = [ self.overlay ]; }; -## in -## pkgs.bob; -# -# everything = nixpkgs.buildGoApplication { -# pname = "xe-x-composite"; -# version = "1.0.0"; -# src = ./.; -# modules = ./gomod2nix.toml; -# -# buildInputs = with nixpkgs; [ pkg-config libaom libavif ]; -# }; -# -# copyFile = { pname, path ? pname }: -# nixpkgs.stdenv.mkDerivation { -# inherit pname; -# inherit (everything) version; -# src = everything; -# -# installPhase = '' -# mkdir -p $out/bin -# cp $src/bin/$pname $out/bin/$path -# ''; -# }; -# -# in -# { -# -# devShells.default = nixpkgs.mkShell { -# buildInputs = with nixpkgs; [ -# go -# gopls -# gotools -# go-tools -# gomod2nix.packages.${system}.default -# sqlite-interactive -# ]; -# }; -# -# overlay = final: prev: { -# bob = final.buildGoModule rec { -# name = "bob"; -# src = ././application/source; -# doCheck = true; -# vendorHash = null; -# nativeBuildInputs = [ final.jq ]; -# ldflags=''-X main.version=${currentVersion} -X main.build=${self.lastModifiedDate}''; -# installPhase = '' -# mkdir -p $out/bin -# -# ''; -# -# }; -# }; -# -# defaultPackage = forAllSystems makePackage; -# -# packages = forAllSystems (system: { -# bob = makePackage system; -# }); -# -# checks = { -# test = forAllSystems makePackage; -# }; -# }; -#} diff --git a/result b/result deleted file mode 120000 index e3ba6e5816d0fd0dad11d2189b29843bae3a4404..0000000000000000000000000000000000000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/njp5z2n7n9wg2jc30qaljb5lwxfk9s92-bob-0.6.0 \ No newline at end of file