From 5ead27394d6adf7ea41497768ada6faee1bf1f88 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 9 Oct 2018 23:45:43 +0200 Subject: journaldriver: 1.0.0 -> 1.1.0 (#48106) Included changes: * upstream repository has moved, URLs changed accordingly * journaldriver bumped to new upstream release The new release includes an important workaround for an issue that could cause log-forwarding to fail after service restarts due to invalid journal cursors being persisted. --- pkgs/tools/misc/journaldriver/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 58c9ee770b7f..e97f4048f0ff 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { name = "journaldriver-${version}"; - version = "1.0.0"; - cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k"; + version = "1.1.0"; + cargoSha256 = "03rq96hzv97wh2gbzi8sz796bqgh6pbpvdn0zy6zgq2f2sgkavsl"; src = fetchFromGitHub { - owner = "aprilabank"; + owner = "tazjin"; repo = "journaldriver"; rev = "v${version}"; - sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc"; + sha256 = "0672iq6s9klb1p37hciyl7snbjgjw98kwrbfkypv07lplc5qcnrf"; }; buildInputs = [ openssl systemd ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Log forwarder from journald to Stackdriver Logging"; - homepage = "https://github.com/aprilabank/journaldriver"; + homepage = "https://github.com/tazjin/journaldriver"; license = licenses.gpl3; maintainers = [ maintainers.tazjin ]; platforms = platforms.linux; -- cgit 1.4.1 From 4e7c822dc6bad757f704e3f7a522f19eea8ea2c9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 10 Oct 2018 16:25:14 -0400 Subject: grub: fetch from HTTPS instead of FTP; update meta (#48137) HTTPS is unlikely to be worse and is often better than FTP. Aside from being faster, there are many networking setups where outgoing FTP traffic is blocked. --- pkgs/tools/misc/grub/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index f5ba8b7fe100..87e9814d8993 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}: +{ stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: -let -in stdenv.mkDerivation { name = "grub-0.97-73"; src = fetchurl { - url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; + url = https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; @@ -29,6 +27,8 @@ stdenv.mkDerivation { passthru.grubTarget = ""; meta = with stdenv.lib; { + homepage = https://www.gnu.org/software/grub; + description = "GRand Unified Bootloader"; license = licenses.gpl2; platforms = platforms.linux; }; -- cgit 1.4.1 From 6327ba8fbd475ad1f21e8d2f7d39dfd0cbff73ea Mon Sep 17 00:00:00 2001 From: Kim Burgess Date: Wed, 10 Oct 2018 00:41:28 +1000 Subject: teleconsole: init at 0.4.0 --- pkgs/tools/misc/teleconsole/default.nix | 34 +++++++++++++++++++++++++++++++++ pkgs/tools/misc/teleconsole/deps.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/tools/misc/teleconsole/default.nix create mode 100644 pkgs/tools/misc/teleconsole/deps.nix (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix new file mode 100644 index 000000000000..2d3eb91250a8 --- /dev/null +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "teleconsole-${version}"; + version = "0.4.0"; + + goPackagePath = "github.com/gravitational/teleconsole"; + + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleconsole"; + rev = version; + sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm"; + }; + + goDeps = ./deps.nix; + + CGO_ENABLED = 1; + buildFlags = "-ldflags"; + + meta = with stdenv.lib; { + homepage = "https://www.teleconsole.com/"; + description = "Share your terminal session with people you trust"; + license = licenses.asl20; + platforms = platforms.all; + # Builds for Aarch64 not possible in the current release due to + # incompatibilities further up the dependency chain. + # See: + # - https://github.com/gravitational/teleport/issues/679 + # - https://github.com/kr/pty/issues/27 + broken = stdenv.isAarch64; + maintainers = [ maintainers.kimburgess ]; + }; +} diff --git a/pkgs/tools/misc/teleconsole/deps.nix b/pkgs/tools/misc/teleconsole/deps.nix new file mode 100644 index 000000000000..f13529d4b25a --- /dev/null +++ b/pkgs/tools/misc/teleconsole/deps.nix @@ -0,0 +1,13 @@ +[ + # Teleport v2.0.0-alpha.4 required for build. + # See https://github.com/gravitational/teleconsole/blob/09591f227c2a8df4c68af8bc4adfadfc596f4ed2/Makefile#L8 + { + goPackagePath = "github.com/gravitational/teleport"; + fetch = { + type = "git"; + url = "https://github.com/gravitational/teleport"; + rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; + sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9978b2969c91..075c22c800be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5550,6 +5550,8 @@ with pkgs; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teleconsole = callPackage ../tools/misc/teleconsole { }; + telegraf = callPackage ../servers/monitoring/telegraf { }; teleport = callPackage ../servers/teleport {}; -- cgit 1.4.1 From 544051b0b0c0b7a78680f65a44e1e75ca0cfdffb Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 11 Oct 2018 19:09:22 +0000 Subject: coreutils-full: fix cross build --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 582f8d8f05f9..de971cc51ac4 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) '' rm $out/share/man/man1/* - cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 + cp ${if minimal then buildPackages.coreutils else buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 '' # du: 8.7 M locale + 0.4 M man pages + optionalString minimal '' -- cgit 1.4.1 From 60ae563293ec956d683e3b9a62dbdef46f71437e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 11 Oct 2018 15:04:37 -0500 Subject: yubikey-manager: 0.7.0 -> 1.0.0 --- pkgs/tools/misc/yubikey-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index c8c0ba706c36..140e322c862b 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -2,11 +2,11 @@ yubikey-personalization, libu2f-host, libusb1 }: pythonPackages.buildPythonPackage rec { - name = "yubikey-manager-0.7.0"; + name = "yubikey-manager-1.0.0"; srcs = fetchurl { url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; - sha256 = "13vvl3jc5wg6d4h5cpaf969apsbf72dxad560d02ly061ss856zr"; + sha256 = "1qdb2b3mv4wafghnmv3sxw4fh7cjc06hnkdimfnwmqcjafzvbawd"; }; propagatedBuildInputs = -- cgit 1.4.1 From 432c44f6f0f48978f891747b4a62f583f4cf3ae2 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 10:02:34 +0000 Subject: coreutils-full: fix cross build (@matthewbauer's version) --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index de971cc51ac4..fe8d1a8380fc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) '' rm $out/share/man/man1/* - cp ${if minimal then buildPackages.coreutils else buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 + cp ${buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 '' # du: 8.7 M locale + 0.4 M man pages + optionalString minimal '' -- cgit 1.4.1 From 7a65f2c43dc3580ad8bee54fb939b7015af93d36 Mon Sep 17 00:00:00 2001 From: edude03 Date: Tue, 9 Oct 2018 15:00:39 +0800 Subject: envdir: init at 1.0.0 --- pkgs/tools/misc/envdir-go/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/envdir-go/default.nix (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix new file mode 100644 index 000000000000..ea08608da01c --- /dev/null +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -0,0 +1,27 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "1.0.0"; + name = "envdir-${version}"; + + goPackagePath = "github.com/d10n/envdir"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "d10n"; + repo = "envdir"; + sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc"; + }; + + preBuild = '' + # TODO: is there a way to get the commit ref so we can set main.buildCommit? + buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") +''; + + meta = { + description = "A go rewrite of envdir"; + homepage = https://github.com/d10n/envdir; + maintainers = with stdenv.lib.maintainers; [ edude03 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3e54fa8d76d..b4c8612c53fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15075,6 +15075,8 @@ with pkgs; envypn-font = callPackage ../data/fonts/envypn-font { }; + envdir = callPackage ../tools/misc/envdir-go { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; -- cgit 1.4.1 From 4b17b8bba4507a322148bf901cfec387d5cd5e89 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 13:14:25 +0000 Subject: screen: fix cross-compiling --- pkgs/tools/misc/screen/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 1753f52ab1b6..fd641ea613d5 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { stripLen = 1; }); + postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) + # XXX: Awful hack to allow cross-compilation. + '' sed -i ./configure \ + -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' + ''; # " + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam ++ stdenv.lib.optional stdenv.isDarwin utmp; -- cgit 1.4.1 From c429b2b38952ea34808bac610b6f0065dbd03276 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 12 Oct 2018 19:01:51 +0200 Subject: cloc: 1.78 -> 1.80 --- pkgs/tools/misc/cloc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 0eff3f0c3916..5a69a6ae7ad2 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.78"; + version = "1.80"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = version; - sha256 = "030cnvl83hgynri3jimhhqp238375m1g6liqfiggl0habrnlbck2"; + rev = "v${version}"; + sha256 = "0zmkjpv4dbdr29x95j4i585wz4rxwlrkp6ldfr5wiw83h90n0ilp"; }; setSourceRoot = '' -- cgit 1.4.1