diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:06:42 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-11 12:06:42 +0100 |
commit | cf27abf534930ecb1657c4a4e7466ed15c4a2076 (patch) | |
tree | b9a0d69e1da02624fecc12c212c5421d6ef3e2af /pkgs/development/tools/misc | |
parent | 457e94d9008a55f0302100b00b77ea9ea478eaef (diff) | |
parent | 6e9743f120548a614cbba21ba1ff9fc06bca3a8b (diff) | |
download | nixlib-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar nixlib-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.gz nixlib-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.bz2 nixlib-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.lz nixlib-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.xz nixlib-cf27abf534930ecb1657c4a4e7466ed15c4a2076.tar.zst nixlib-cf27abf534930ecb1657c4a4e7466ed15c4a2076.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/editorconfig-checker/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/tools/misc/fsatrace/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/tools/misc/lttng-tools/default.nix | 4 |
3 files changed, 34 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix new file mode 100644 index 000000000000..cbb6a38f67a8 --- /dev/null +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "editorconfig-checker"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "editorconfig-checker"; + repo = "editorconfig-checker"; + rev = "${version}"; + sha256 = "0v2ml9r8b5admi3sv80wa1pwl9qnz03q2p84vgcmgg2nv1v6yxf3"; + }; + + modSha256 = "09b1v9gyh6827yqlfxxxq3lcqhd5snn3n7gdlbjmga3wyp2x4g2r"; + + meta = with lib; { + description = "A tool to verify that your files are in harmony with your .editorconfig"; + homepage = "https://editorconfig-checker.github.io/"; + license = licenses.mit; + maintainers = with maintainers; [ uri-canva ]; + }; +} diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index 152792dcee25..b8202f94ce9b 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -2,23 +2,26 @@ stdenv.mkDerivation rec { pname = "fsatrace"; - version = "0.0.1-160"; + version = "0.0.1-324"; src = fetchFromGitHub { owner = "jacereda"; repo = "fsatrace"; - rev = "2bf89d836e0156e68f121b0ffeedade7c9381f77"; - sha256 = "0bndfmm0y738azwzf6m6xg6gjnrwcqlfjsampk67vga40yylwkbw"; + rev = "41fbba17da580f81ababb32ec7e6e5fd49f11473"; + sha256 = "1ihm2v723idd6m0kc1z9v73hmfvh2v0vjs8wvx5w54jaxh3lmj1y"; }; - preConfigure = '' - mkdir -p $out/libexec/${pname}-${version} - export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version} + installDir = "libexec/${pname}-${version}"; + + makeFlags = [ "INSTALLDIR=$(out)/$(installDir)" ]; + + preInstall = '' + mkdir -p $out/$installDir ''; postInstall = '' mkdir -p $out/bin - ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/ + ln -s $out/$installDir/fsatrace $out/bin/fsatrace ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index a02bb2c9f2fe..815d5aac4069 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.10.8"; + version = "2.11.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "03dkwvmiqbr7dcnrk8hw8xd9i0vrx6xxz8wal56mfypxz52i2jk6"; + sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; }; nativeBuildInputs = [ pkgconfig ]; |