summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--environments/immae-eu.nix15
-rw-r--r--pkgs/crypto/cardano/daedalus.json8
-rw-r--r--pkgs/crypto/sia/default.nix12
-rw-r--r--pkgs/default.nix6
4 files changed, 26 insertions, 15 deletions
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
17 boinctui 17 boinctui
18 18
19 # cryptocurrencies 19 # cryptocurrencies
20 cardano cardano-cli sia monero 20 cardano cardano-cli sia monero_0_15_0_0
21 xmr-stak 21 xmr-stak
22 solc 22 solc
23 iota-cli-app 23 iota-cli-app
@@ -36,11 +36,11 @@ let
36 sieve-connect 36 sieve-connect
37 37
38 # git 38 # git
39 vcsh gitRepo gitAndTools.stgit tig ripgrep 39 vcsh gitRepo gitAndTools.stgit tig ripgrep mr
40 40
41 # graphical tools 41 # graphical tools
42 nextcloud-client firefox 42 nextcloud-client firefox
43 dwm dmenu st 43 dwm dmenu st xorg.xauth tigervnc
44 44
45 # images 45 # images
46 feh imagemagick tiv graphicsmagick qrcode 46 feh imagemagick tiv graphicsmagick qrcode
@@ -74,7 +74,7 @@ let
74 # (nixos {}).manual.manpages 74 # (nixos {}).manual.manpages
75 75
76 # note taking 76 # note taking
77 note terminal-velocity jrnl 77 note terminal-velocity jrnl doing
78 78
79 # office 79 # office
80 sc-im ranger 80 sc-im ranger
@@ -85,6 +85,8 @@ let
85 ldapvi 85 ldapvi
86 fzf 86 fzf
87 buku 87 buku
88 vimPlugins.vim-plug
89 mailcap
88 90
89 # password management 91 # password management
90 pass apg pwgen 92 pass apg pwgen
@@ -94,10 +96,10 @@ let
94 96
95 # programming 97 # programming
96 pelican emacs26-nox ctags 98 pelican emacs26-nox ctags
97 wdiff patch 99 wdiff patch gnumake
98 100
99 # security 101 # security
100 keybase 102 keybase gnupg
101 103
102 # todolist/time management 104 # todolist/time management
103 taskwarrior vit timewarrior 105 taskwarrior vit timewarrior
@@ -112,6 +114,7 @@ let
112 # system tools 114 # system tools
113 telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc 115 telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc
114 wget patchelf rename tmux (lib.meta.hiPrio nettools) 116 wget patchelf rename tmux (lib.meta.hiPrio nettools)
117 vlock mosh
115 118
116 # other tools 119 # other tools
117 pgloader s3cmd lftp jq cpulimit libxslt gandi-cli 120 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 @@
1{ 1{
2 "tag": "0.12.1", 2 "tag": "0.15.1",
3 "meta": { 3 "meta": {
4 "name": "daedalus", 4 "name": "daedalus",
5 "url": "https://github.com/input-output-hk/daedalus", 5 "url": "https://github.com/input-output-hk/daedalus",
6 "branch": "refs/tags/0.12.1" 6 "branch": "refs/tags/0.15.1"
7 }, 7 },
8 "github": { 8 "github": {
9 "owner": "input-output-hk", 9 "owner": "input-output-hk",
10 "repo": "daedalus", 10 "repo": "daedalus",
11 "rev": "1276852b9a766d9fd4cda10561254f1a8ddd33ed", 11 "rev": "998fd3189c9a54fac496dfef7a6224714c67bc80",
12 "sha256": "0jf6ibwf0r4587g1ixq6zvi40kzwy137jgay5136yfbg15xw14k2", 12 "sha256": "1r3gwfv6hn7lzp4h2s6849m7x12nxadsql358ss615krvdlnb6rr",
13 "fetchSubmodules": true 13 "fetchSubmodules": true
14 } 14 }
15} 15}
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 @@
1{ stdenv, fetchzip }: 1{ stdenv, fetchzip, autoPatchelfHook }:
2stdenv.mkDerivation rec { 2stdenv.mkDerivation rec {
3 version = "v1.3.7"; 3 version = "v1.4.3";
4 name = "Sia-${version}"; 4 name = "Sia-${version}";
5 src = fetchzip { 5 src = fetchzip {
6 url = "https://sia.tech/static/releases/${name}-linux-amd64.zip"; 6 url = "https://sia.tech/static/releases/${name}-linux-amd64.zip";
7 sha256 = "1ljzwrlkx4hc16r8siiyakn039afipp95dyr83c8yfq3r3bfasqd"; 7 sha256 = "1i67zjzk4cwfzb1dxaxc1m41fa44sz1d0mf6dmlyg6pm4cyqizki";
8 }; 8 };
9 phases = "installPhase"; 9 phases = "installPhase fixupPhase";
10 nativeBuildInputs = [
11 autoPatchelfHook
12 ];
10 installPhase = '' 13 installPhase = ''
11 mkdir -p $out/share/doc 14 mkdir -p $out/share/doc
12 mkdir -p $out/bin 15 mkdir -p $out/bin
@@ -14,6 +17,5 @@ stdenv.mkDerivation rec {
14 cp -a $src/doc $out/share/doc/sia 17 cp -a $src/doc $out/share/doc/sia
15 cp -a $src/LICENSE $src/README.md $out/share/sia 18 cp -a $src/LICENSE $src/README.md $out/share/sia
16 cp -a $src/{siac,siad} $out/bin 19 cp -a $src/{siac,siad} $out/bin
17 cp -a $src/{siac,siad}.sig $out/share/sia/
18 ''; 20 '';
19} 21}
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 {
67 dovecot_fts-xapian = callPackage ./dovecot/plugins/fts_xapian { 67 dovecot_fts-xapian = callPackage ./dovecot/plugins/fts_xapian {
68 inherit mylibs; 68 inherit mylibs;
69 }; 69 };
70 monero_0_15_0_0 = (import (builtins.fetchTarball {
71 name = "nixos-19.09";
72 url = "https://releases.nixos.org/nixos/19.09/nixos-19.09.2145.c2c5dcc00b0/nixexprs.tar.xz";
73 sha256 = "0dh8qc3lzrba5mxxxh57i1374wc7ha3c30h7wsmj5zr7bhc5zm4p";
74 }) {}).monero;
75
70} 76}