diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:41:53 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:41:53 +0200 |
commit | 6e9bb30566a617613e607a3641fe12d040de3afb (patch) | |
tree | 0241cf4a29146f6fec8e61b1b02a32a72a48f03f /pkgs/development/tools | |
parent | c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67 (diff) | |
parent | f6482597318278cdc4d33b703effa4636d2875c6 (diff) | |
download | nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.gz nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.bz2 nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.lz nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.xz nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.zst nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.zip |
Merge branch 'master' into staging-next
In particular, this fixes ISO evaluation.
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/gore/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/tools/misc/tokei/default.nix | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix new file mode 100644 index 000000000000..92eeaeaeddbd --- /dev/null +++ b/pkgs/development/tools/gore/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gore"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "motemen"; + repo = pname; + rev = "v${version}"; + sha256 = "61Hn3Vs4BZtAX8WNJlUeodvEWvwLo+lXKsc8JxRwOE4="; + }; + + vendorSha256 = "3bq6sRKS5dq7WCPpKGm2q5gFajthR3zhrTFGve9zXhY="; + + meta = with stdenv.lib; { + description = "Yet another Go REPL that works nicely."; + homepage = "https://github.com/motemen/gore"; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index ca07a1d72676..dee4c910fb80 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.2.0"; + version = "11.2.1"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1nyv73bawmshzzp8hkbcac5bgq0yf8f51ps5hycdw0c5qhrsjwns"; + sha256 = "1bdq66si9vvvyf5nia8ww77imp0f8jas0yfcvq1rialwm9922dfl"; }; - cargoSha256 = "18a0rg3hgisjd6zh4dk6rflaipmrxxszpigqg8fa816rg0f4bdc7"; + cargoSha256 = "17666wh4sfzhgxngymd02892mqpkr8jm6a4w95wwsc9iinzbygrm"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security |