From: Ismaƫl Bouya Date: Sun, 23 Feb 2020 13:11:52 +0000 (+0100) Subject: Add missing tools for dilion X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c566184e52e339d01c8a898c0f38e15c142444b7;p=perso%2FImmae%2FConfig%2FNix%2FNUR.git Add missing tools for dilion --- diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix index 787d3033..2cb624ae 100644 --- a/environments/immae-eu.nix +++ b/environments/immae-eu.nix @@ -17,7 +17,7 @@ let boinctui # cryptocurrencies - cardano cardano-cli sia monero + cardano cardano-cli sia monero_0_15_0_0 xmr-stak solc iota-cli-app @@ -36,11 +36,11 @@ let sieve-connect # git - vcsh gitRepo gitAndTools.stgit tig ripgrep + vcsh gitRepo gitAndTools.stgit tig ripgrep mr # graphical tools nextcloud-client firefox - dwm dmenu st + dwm dmenu st xorg.xauth tigervnc # images feh imagemagick tiv graphicsmagick qrcode @@ -74,7 +74,7 @@ let # (nixos {}).manual.manpages # note taking - note terminal-velocity jrnl + note terminal-velocity jrnl doing # office sc-im ranger @@ -85,6 +85,8 @@ let ldapvi fzf buku + vimPlugins.vim-plug + mailcap # password management pass apg pwgen @@ -94,10 +96,10 @@ let # programming pelican emacs26-nox ctags - wdiff patch + wdiff patch gnumake # security - keybase + keybase gnupg # todolist/time management taskwarrior vit timewarrior @@ -112,6 +114,7 @@ let # system tools telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc wget patchelf rename tmux (lib.meta.hiPrio nettools) + vlock mosh # other tools pgloader s3cmd lftp jq cpulimit libxslt gandi-cli diff --git a/pkgs/crypto/cardano/daedalus.json b/pkgs/crypto/cardano/daedalus.json index 5bb72f49..dcd14c5d 100644 --- a/pkgs/crypto/cardano/daedalus.json +++ b/pkgs/crypto/cardano/daedalus.json @@ -1,15 +1,15 @@ { - "tag": "0.12.1", + "tag": "0.15.1", "meta": { "name": "daedalus", "url": "https://github.com/input-output-hk/daedalus", - "branch": "refs/tags/0.12.1" + "branch": "refs/tags/0.15.1" }, "github": { "owner": "input-output-hk", "repo": "daedalus", - "rev": "1276852b9a766d9fd4cda10561254f1a8ddd33ed", - "sha256": "0jf6ibwf0r4587g1ixq6zvi40kzwy137jgay5136yfbg15xw14k2", + "rev": "998fd3189c9a54fac496dfef7a6224714c67bc80", + "sha256": "1r3gwfv6hn7lzp4h2s6849m7x12nxadsql358ss615krvdlnb6rr", "fetchSubmodules": true } } diff --git a/pkgs/crypto/sia/default.nix b/pkgs/crypto/sia/default.nix index 45908afb..27e40149 100644 --- a/pkgs/crypto/sia/default.nix +++ b/pkgs/crypto/sia/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchzip, autoPatchelfHook }: stdenv.mkDerivation rec { - version = "v1.3.7"; + version = "v1.4.3"; name = "Sia-${version}"; src = fetchzip { url = "https://sia.tech/static/releases/${name}-linux-amd64.zip"; - sha256 = "1ljzwrlkx4hc16r8siiyakn039afipp95dyr83c8yfq3r3bfasqd"; + sha256 = "1i67zjzk4cwfzb1dxaxc1m41fa44sz1d0mf6dmlyg6pm4cyqizki"; }; - phases = "installPhase"; + phases = "installPhase fixupPhase"; + nativeBuildInputs = [ + autoPatchelfHook + ]; installPhase = '' mkdir -p $out/share/doc mkdir -p $out/bin @@ -14,6 +17,5 @@ stdenv.mkDerivation rec { cp -a $src/doc $out/share/doc/sia cp -a $src/LICENSE $src/README.md $out/share/sia cp -a $src/{siac,siad} $out/bin - cp -a $src/{siac,siad}.sig $out/share/sia/ ''; } diff --git a/pkgs/default.nix b/pkgs/default.nix index b6f9eae1..3e77992e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -67,4 +67,10 @@ rec { dovecot_fts-xapian = callPackage ./dovecot/plugins/fts_xapian { inherit mylibs; }; + monero_0_15_0_0 = (import (builtins.fetchTarball { + name = "nixos-19.09"; + url = "https://releases.nixos.org/nixos/19.09/nixos-19.09.2145.c2c5dcc00b0/nixexprs.tar.xz"; + sha256 = "0dh8qc3lzrba5mxxxh57i1374wc7ha3c30h7wsmj5zr7bhc5zm4p"; + }) {}).monero; + }