From d60be6564cd7ee64a8c35803902bcce031ea2d17 Mon Sep 17 00:00:00 2001 From: Jens Nolte <jens@nightmarestudio.de> Date: Sat, 22 Aug 2020 17:44:53 +0200 Subject: [PATCH] Add q package --- pkgs/default.nix | 2 ++ pkgs/q/default.nix | 11 +++++++++++ pkgs/q/repo.json | 11 +++++++++++ pkgs/q/update | 7 +++++++ 4 files changed, 31 insertions(+) create mode 100644 pkgs/q/default.nix create mode 100644 pkgs/q/repo.json create mode 100755 pkgs/q/update diff --git a/pkgs/default.nix b/pkgs/default.nix index 00a9773..ffc7815 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -16,6 +16,7 @@ let haskell = pkgs.haskell // { packageOverrides = self: super: { + q = self.callPackage ./q {}; qbar = self.callPackage ./qbar {}; }; }; @@ -30,6 +31,7 @@ let }; })); + q = haskellPackages.q; qbar = haskellPackages.qbar; }; diff --git a/pkgs/q/default.nix b/pkgs/q/default.nix new file mode 100644 index 0000000..2b989c9 --- /dev/null +++ b/pkgs/q/default.nix @@ -0,0 +1,11 @@ +{ haskell, fetchgit, callCabal2nix }: + +let + repo = with builtins; fromJSON ( readFile ./repo.json ); + src = fetchgit { + inherit (repo) url rev sha256; + }; +in +haskell.lib.generateOptparseApplicativeCompletion "q" ( + callCabal2nix "q" src {} +) diff --git a/pkgs/q/repo.json b/pkgs/q/repo.json new file mode 100644 index 0000000..58d01c9 --- /dev/null +++ b/pkgs/q/repo.json @@ -0,0 +1,11 @@ +{ + "ref": "refs/heads/master", + "url": "https://git.c3pb.de/jens/q.git", + "rev": "029d589c88c676c1e8a7e96f91f563a5a4eb5190", + "date": "2020-07-12T19:45:06+02:00", + "path": "/nix/store/1f3f7nwpcwf9yczfmam72mi65gmabbf5-q", + "sha256": "01j37vyjzjhs3a6661w20hhfwhacxsvfyl005zz49r9kv4618f81", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/q/update b/pkgs/q/update new file mode 100755 index 0000000..beea01e --- /dev/null +++ b/pkgs/q/update @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i sh -p nix-prefetch-git jq + +url="https://git.c3pb.de/jens/q.git" +ref="refs/heads/master" + +nix-prefetch-git --rev "$ref" --no-deepClone "$url" | jq --arg ref "$ref" '{ref: $ref} + .' > repo.json -- GitLab