git.iko.soy/prybar
on master help sign in
Try to improve the code and make things clearer
commit2eb279065f582149cebd4c8b62bd4535b49e3ade authorguillaume <guillaume@repl.it> dateWed 16 Jun 2021, 16:45 (5 years ago) parent0e6b39e
2 files changed+13−22
compare with master
unifiedsplit
build-prybar.nix+7−7 default.nix+6−15
build-prybar.nix+7−7
@@ -3,20 +3,20 @@
33{ lib, buildGoModule, fetchFromGitHub, bash, pkg-config, runCommand, git }:
44
55let
6− gitSrc = builtins.filterSource
7− (path: type: true)
8− ./.;
9−in
10−buildGoModule rec {
11− pname = "prybar-${language}";
6+ src = ./.;
127
8+ gitSrc = builtins.filterSource
9+ (path: type: true)
10+ ./.;
1311 revision = runCommand "get-rev" {
1412 nativeBuildInputs = [ git ];
1513 dummy = builtins.currentTime;
1614 } "GIT_DIR=${gitSrc}/.git git rev-parse --short HEAD | tr -d '\n' > $out";
15+in buildGoModule {
16+ pname = "prybar-${language}";
1717 version = builtins.readFile revision;
1818
19− src = ./.;
19+ inherit src;
2020
2121 inherit buildInputs;
2222 nativeBuildInputs = [ pkg-config ];
default.nix+6−15
@@ -1,15 +1,6 @@
11{ pkgs ? import <nixpkgs>{} } :
22let
3− callPackage = pkgs.callPackage;
4− python3 = pkgs.python3;
5− python2 = pkgs.python2;
6− lua5_1 = pkgs.lua5_1;
7− readline = pkgs.readline;
8− clojure = pkgs.clojure;
9− tcl = pkgs.tcl;
10−in
11−let
12− buildPrybar = attrs: callPackage(import ./build-prybar.nix attrs) {};
3+ buildPrybar = attrs: pkgs.callPackage(import ./build-prybar.nix attrs) {};
134in
145{
156 # TODO: These don't quite work yet
@@ -29,13 +20,13 @@ in
2920 # Untested, spidermonkey not supported on darwin. Feel free to test on linux.
3021 # prybar-spidermonkey = buildPrybar { language = "spidermonkey"; buildInputs = [ spidermonkey ]; };
3122
32− prybar-python2 = buildPrybar { language = "python2"; buildInputs = [ python2 ]; };
23+ prybar-python2 = buildPrybar { language = "python2"; buildInputs = [ pkgs.python2 ]; };
3324
34− prybar-python3 = buildPrybar { language = "python3"; buildInputs = [ python3 ]; };
25+ prybar-python3 = buildPrybar { language = "python3"; buildInputs = [ pkgs.python3 ]; };
3526
36− prybar-lua = buildPrybar { language = "lua"; buildInputs = [ lua5_1 readline ]; };
27+ prybar-lua = buildPrybar { language = "lua"; buildInputs = [ pkgs.lua5_1 pkgs.readline ]; };
3728
38− prybar-clojure = buildPrybar { language = "clojure"; buildInputs = [ clojure ]; };
29+ prybar-clojure = buildPrybar { language = "clojure"; buildInputs = [ pkgs.clojure ]; };
3930
4031 prybar-elisp = buildPrybar { language = "elisp"; };
4132
@@ -45,5 +36,5 @@ in
4536
4637 prybar-sqlite = buildPrybar { language = "sqlite"; };
4738
48− prybar-tcl = buildPrybar { language = "tcl"; buildInputs = [ tcl ]; };
39+ prybar-tcl = buildPrybar { language = "tcl"; buildInputs = [ pkgs.tcl ]; };
4940}