summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-01-18 21:13:46 +0100
committerlassulus <lassulus@lassul.us>2021-01-18 21:13:46 +0100
commitc5b36af49fdfac5934edd376c8de84a6947ebd4a (patch)
treed467593699cad09b06c779f60ce6164d55bf6f20 /krebs
parentdba3ca21f28dbb213d6dc44cfc301a958f87a623 (diff)
parentff6f5ef5e1cdbd27b2211c54643fa2754f888cbb (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/5pkgs/haskell/scanner.nix9
-rw-r--r--krebs/5pkgs/simple/TabFS/default.nix6
-rw-r--r--krebs/5pkgs/simple/TabFS/src.json10
-rw-r--r--krebs/5pkgs/simple/git-preview.nix17
4 files changed, 16 insertions, 26 deletions
diff --git a/krebs/5pkgs/haskell/scanner.nix b/krebs/5pkgs/haskell/scanner.nix
index 071fd757f..28f89b069 100644
--- a/krebs/5pkgs/haskell/scanner.nix
+++ b/krebs/5pkgs/haskell/scanner.nix
@@ -1,12 +1,13 @@
{ mkDerivation, base, fetchgit, stdenv }:
mkDerivation {
pname = "scanner";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchgit {
- url = http://cgit.ni.krebsco.de/scanner;
- rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
+ url = "http://cgit.ni.krebsco.de/scanner";
sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn";
+ rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
+ fetchSubmodules = true;
};
libraryHaskellDepends = [ base ];
- license = stdenv.lib.licenses.wtfpl;
+ license = stdenv.lib.licenses.mit;
}
diff --git a/krebs/5pkgs/simple/TabFS/default.nix b/krebs/5pkgs/simple/TabFS/default.nix
index 23fdf519d..69de919eb 100644
--- a/krebs/5pkgs/simple/TabFS/default.nix
+++ b/krebs/5pkgs/simple/TabFS/default.nix
@@ -3,11 +3,7 @@
stdenv.mkDerivation rec {
name = "TabFS";
- src = pkgs.fetchgit {
- url = https://cgit.krebsco.de/TabFS;
- rev = "1fc4845283a0e6aa46a8d8978f356d5ccdcedd13";
- sha256 = "0bsm5fhxrr6zwbnm9p10h9pwm85llr02g2ch97a62r62dhjjrc8h";
- };
+ src = pkgs.fetchgit (lib.importJSON ./src.json);
phases = [
"unpackPhase"
diff --git a/krebs/5pkgs/simple/TabFS/src.json b/krebs/5pkgs/simple/TabFS/src.json
new file mode 100644
index 000000000..24e36aef3
--- /dev/null
+++ b/krebs/5pkgs/simple/TabFS/src.json
@@ -0,0 +1,10 @@
+{
+ "url": "https://cgit.krebsco.de/TabFS",
+ "rev": "a6045e0e29b85e3e66c468f3561009ded1db6ec5",
+ "date": "2021-01-14T23:56:09+01:00",
+ "path": "/nix/store/mbcywm1yq5vr7awxqb533faz34minfax-TabFS",
+ "sha256": "1z0kj95zh0jl8laa0whra1jys8pws3199sy29vmlv2nxrkz13blv",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/krebs/5pkgs/simple/git-preview.nix b/krebs/5pkgs/simple/git-preview.nix
deleted file mode 100644
index d6c9579a7..000000000
--- a/krebs/5pkgs/simple/git-preview.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ coreutils, git, writeDashBin }:
-
-writeDashBin "git-preview" ''
- set -efu
- head_commit=$(${git}/bin/git log -1 --format=%H)
- merge_commit=$1; shift
- merge_message='Merge for git-preview'
- preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
- preview_branch=$(${coreutils}/bin/basename "$preview_dir")
- ${git}/bin/git worktree add -b "$preview_branch" "$preview_dir" >/dev/null
- ${git}/bin/git -C "$preview_dir" checkout "$head_commit"
- ${git}/bin/git -C "$preview_dir" merge -m "$merge_message" "$merge_commit"
- ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@" &
- ${git}/bin/git branch -fd "$preview_branch"
- ${coreutils}/bin/rm -fR "$preview_dir"
- wait
-''