diff options
-rw-r--r-- | default.nix | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/default.nix b/default.nix index 8ceee41..f509385 100644 --- a/default.nix +++ b/default.nix | |||
@@ -1,5 +1,6 @@ | |||
1 | with import <nixpkgs> {}; | 1 | with import <nixpkgs> {}; |
2 | let | 2 | let |
3 | mypkgs = {}; | ||
3 | nixpkgs = import <nixpkgs> {}; | 4 | nixpkgs = import <nixpkgs> {}; |
4 | postHook = '' | 5 | postHook = '' |
5 | header() { | 6 | header() { |
@@ -34,13 +35,13 @@ let | |||
34 | src = fetchgit json.git; | 35 | src = fetchgit json.git; |
35 | }; | 36 | }; |
36 | 37 | ||
37 | ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (_old: | 38 | mypkgs.ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (_old: |
38 | fetchedGithub ./fetched/ledger.json // { | 39 | fetchedGithub ./fetched/ledger.json // { |
39 | postInstall = ""; | 40 | postInstall = ""; |
40 | } | 41 | } |
41 | ); | 42 | ); |
42 | 43 | ||
43 | taskwarrior = nixpkgs.taskwarrior.overrideAttrs (old: rec { | 44 | mypkgs.taskwarrior = nixpkgs.taskwarrior.overrideAttrs (old: rec { |
44 | postInstall = ''${old.postInstall} | 45 | postInstall = ''${old.postInstall} |
45 | mkdir -p "$out/share/vim/vimfiles/ftdetect" | 46 | mkdir -p "$out/share/vim/vimfiles/ftdetect" |
46 | mkdir -p "$out/share/vim/vimfiles/syntax" | 47 | mkdir -p "$out/share/vim/vimfiles/syntax" |
@@ -51,20 +52,20 @@ let | |||
51 | ''; | 52 | ''; |
52 | }); | 53 | }); |
53 | 54 | ||
54 | vit = (nixpkgs.vit.override { inherit taskwarrior; }).overrideAttrs (old: | 55 | mypkgs.vit = (nixpkgs.vit.override { taskwarrior = mypkgs.taskwarrior; }).overrideAttrs (old: |
55 | fetchedGithub ./fetched/vit.json // { | 56 | fetchedGithub ./fetched/vit.json // { |
56 | buildInputs = old.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth]; | 57 | buildInputs = old.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth]; |
57 | } | 58 | } |
58 | ); | 59 | ); |
59 | 60 | ||
60 | weboob = pythonPackages.weboob.overrideAttrs (old: rec { | 61 | mypkgs.weboob = pythonPackages.weboob.overrideAttrs (old: rec { |
61 | postInstall = ''${old.postInstall or ""} | 62 | postInstall = ''${old.postInstall or ""} |
62 | mkdir -p $out/share/bash-completion/completions/ | 63 | mkdir -p $out/share/bash-completion/completions/ |
63 | cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob | 64 | cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob |
64 | ''; | 65 | ''; |
65 | }); | 66 | }); |
66 | 67 | ||
67 | slrn = nixpkgs.slrn.overrideAttrs (old: rec { | 68 | mypkgs.slrn = nixpkgs.slrn.overrideAttrs (old: rec { |
68 | version = "1.0.3a"; | 69 | version = "1.0.3a"; |
69 | name = "slrn-${version}"; | 70 | name = "slrn-${version}"; |
70 | src = fetchurl { | 71 | src = fetchurl { |
@@ -74,17 +75,17 @@ let | |||
74 | configureFlags = old.configureFlags ++ [ "--with-slrnpull" ]; | 75 | configureFlags = old.configureFlags ++ [ "--with-slrnpull" ]; |
75 | }); | 76 | }); |
76 | 77 | ||
77 | ldapvi = nixpkgs.ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json); | 78 | mypkgs.ldapvi = nixpkgs.ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json); |
78 | 79 | ||
79 | nixos = import ./nixos_tools.nix {}; | 80 | nixos = import ./nixos_tools.nix {}; |
80 | 81 | ||
81 | pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old: | 82 | mypkgs.pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old: |
82 | fetchedGit ./fetched/pass.json // { | 83 | fetchedGit ./fetched/pass.json // { |
83 | patches = old.patches ++ [ ./patches/pass-fix-pass-init.patch ]; | 84 | patches = old.patches ++ [ ./patches/pass-fix-pass-init.patch ]; |
84 | } | 85 | } |
85 | ); | 86 | ); |
86 | 87 | ||
87 | profanity = (nixpkgs.profanity.override { | 88 | mypkgs.profanity = (nixpkgs.profanity.override { |
88 | notifySupport = true; | 89 | notifySupport = true; |
89 | inherit libnotify gpgme gdk_pixbuf; | 90 | inherit libnotify gpgme gdk_pixbuf; |
90 | python = python3; | 91 | python = python3; |
@@ -92,7 +93,7 @@ let | |||
92 | configureFlags = old.configureFlags ++ [ "--enable-plugins" ]; | 93 | configureFlags = old.configureFlags ++ [ "--enable-plugins" ]; |
93 | }); | 94 | }); |
94 | 95 | ||
95 | weechat = nixpkgs.weechat.override { | 96 | mypkgs.weechat = nixpkgs.weechat.override { |
96 | configure = { availablePlugins, ... }: { | 97 | configure = { availablePlugins, ... }: { |
97 | plugins = with availablePlugins; [ | 98 | plugins = with availablePlugins; [ |
98 | (python.withPackages (ps: with ps; [websocket_client emoji])) | 99 | (python.withPackages (ps: with ps; [websocket_client emoji])) |
@@ -102,7 +103,7 @@ let | |||
102 | }; | 103 | }; |
103 | 104 | ||
104 | buildPerlPackage = callPackage <nixpkgs/pkgs/development/perl-modules/generic> { }; | 105 | buildPerlPackage = callPackage <nixpkgs/pkgs/development/perl-modules/generic> { }; |
105 | note = buildPerlPackage rec { | 106 | mypkgs.note = buildPerlPackage rec { |
106 | name = "note-1.3.26"; | 107 | name = "note-1.3.26"; |
107 | src = fetchurl { | 108 | src = fetchurl { |
108 | url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; | 109 | url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; |
@@ -119,7 +120,7 @@ let | |||
119 | }; | 120 | }; |
120 | }; | 121 | }; |
121 | 122 | ||
122 | terminal_velocity = with python2Packages; buildPythonApplication rec { | 123 | mypkgs.terminal_velocity = with python2Packages; buildPythonApplication rec { |
123 | pname = "terminal-velocity-git"; | 124 | pname = "terminal-velocity-git"; |
124 | version = "0.2.0"; | 125 | version = "0.2.0"; |
125 | 126 | ||
@@ -138,7 +139,7 @@ let | |||
138 | }; | 139 | }; |
139 | }; | 140 | }; |
140 | 141 | ||
141 | mtop = buildPerlPackage rec { | 142 | mypkgs.mtop = buildPerlPackage rec { |
142 | name = "mtop-${version}"; | 143 | name = "mtop-${version}"; |
143 | version = "0.6.6"; | 144 | version = "0.6.6"; |
144 | src = fetchurl { | 145 | src = fetchurl { |
@@ -161,7 +162,7 @@ let | |||
161 | }; | 162 | }; |
162 | }; | 163 | }; |
163 | 164 | ||
164 | tiv = buildPerlPackage rec { | 165 | mypkgs.tiv = buildPerlPackage rec { |
165 | name = "tiv-${version}"; | 166 | name = "tiv-${version}"; |
166 | version = "2015"; | 167 | version = "2015"; |
167 | src = fetchurl { | 168 | src = fetchurl { |
@@ -179,7 +180,7 @@ let | |||
179 | ''; | 180 | ''; |
180 | }; | 181 | }; |
181 | 182 | ||
182 | cnagios = stdenv.mkDerivation (fetchedGithub ./fetched/cnagios.json // rec { | 183 | mypkgs.cnagios = stdenv.mkDerivation (fetchedGithub ./fetched/cnagios.json // rec { |
183 | configureFlags = [ | 184 | configureFlags = [ |
184 | "--with-etc-dir=/etc/cnagios" | 185 | "--with-etc-dir=/etc/cnagios" |
185 | "--with-var-dir=/var/lib/naemon" | 186 | "--with-var-dir=/var/lib/naemon" |
@@ -200,13 +201,13 @@ let | |||
200 | propagatedBuildInputs = [ perl ncurses ]; | 201 | propagatedBuildInputs = [ perl ncurses ]; |
201 | }); | 202 | }); |
202 | 203 | ||
203 | nagios-cli = python2Packages.buildPythonApplication (fetchedGithub ./fetched/nagios-cli.json); | 204 | mypkgs.nagios-cli = python2Packages.buildPythonApplication (fetchedGithub ./fetched/nagios-cli.json); |
204 | 205 | ||
205 | pg_activity = with python2Packages; buildPythonApplication (fetchedGithub ./fetched/pg_activity.json // rec { | 206 | mypkgs.pg_activity = with python2Packages; buildPythonApplication (fetchedGithub ./fetched/pg_activity.json // rec { |
206 | propagatedBuildInputs = [ psycopg2 psutil ]; | 207 | propagatedBuildInputs = [ psycopg2 psutil ]; |
207 | }); | 208 | }); |
208 | 209 | ||
209 | pgloader = stdenv.mkDerivation (fetchedGithub ./fetched/pgloader.json // rec { | 210 | mypkgs.pgloader = stdenv.mkDerivation (fetchedGithub ./fetched/pgloader.json // rec { |
210 | buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ]; | 211 | buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ]; |
211 | LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; | 212 | LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; |
212 | buildPhase = '' | 213 | buildPhase = '' |
@@ -222,22 +223,18 @@ let | |||
222 | ''; | 223 | ''; |
223 | }); | 224 | }); |
224 | 225 | ||
225 | pelican = python3Packages.pelican.overrideAttrs(old: fetchedGithub ./fetched/pelican.json // rec { | 226 | mypkgs.pelican = python3Packages.pelican.overrideAttrs(old: fetchedGithub ./fetched/pelican.json // rec { |
226 | propagatedBuildInputs = old.propagatedBuildInputs ++ [ python3Packages.pyyaml ]; | 227 | propagatedBuildInputs = old.propagatedBuildInputs ++ [ python3Packages.pyyaml ]; |
227 | }); | 228 | }); |
228 | 229 | ||
229 | # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh | 230 | # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh |
230 | # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks | 231 | # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks |
231 | in | 232 | in |
232 | { | 233 | mypkgs // { |
233 | inherit nix-prefetch-scripts; | 234 | inherit nix-prefetch-scripts; |
234 | inherit nix-generate-from-cpan; | 235 | inherit nix-generate-from-cpan; |
235 | inherit ledger; | 236 | inherit timewarrior; |
236 | inherit taskwarrior vit timewarrior; | ||
237 | inherit weboob; | ||
238 | inherit slrn; | ||
239 | inherit sc-im; | 237 | inherit sc-im; |
240 | inherit ldapvi; | ||
241 | inherit pal; | 238 | inherit pal; |
242 | inherit duplicity duply; | 239 | inherit duplicity duply; |
243 | inherit pdftk; | 240 | inherit pdftk; |
@@ -248,18 +245,11 @@ in | |||
248 | inherit vcsh; | 245 | inherit vcsh; |
249 | inherit xmr-stak; | 246 | inherit xmr-stak; |
250 | inherit urlwatch; | 247 | inherit urlwatch; |
251 | inherit pass; | ||
252 | inherit ranger; | 248 | inherit ranger; |
253 | inherit profanity; | 249 | inherit irssi; |
254 | inherit weechat irssi; | ||
255 | inherit note terminal_velocity; | ||
256 | inherit mtop; | ||
257 | inherit tiv; | ||
258 | inherit cnagios nagios-cli; | ||
259 | inherit abook khard khal; | 250 | inherit abook khard khal; |
260 | inherit graphicsmagick; | 251 | inherit graphicsmagick; |
261 | inherit youtube-dl; | 252 | inherit youtube-dl; |
262 | inherit pg_activity pgloader; | ||
263 | inherit ncmpc; | 253 | inherit ncmpc; |
264 | inherit cadaver; | 254 | inherit cadaver; |
265 | inherit mairix notmuch; | 255 | inherit mairix notmuch; |
@@ -275,7 +265,6 @@ in | |||
275 | inherit iotop iperf; | 265 | inherit iotop iperf; |
276 | inherit keybase; | 266 | inherit keybase; |
277 | inherit bogofilter; | 267 | inherit bogofilter; |
278 | inherit pelican; | ||
279 | # todo: lx* ?, unrar, unzip, zeromq? | 268 | # todo: lx* ?, unrar, unzip, zeromq? |
280 | #inherit nextcloud-client; | 269 | #inherit nextcloud-client; |
281 | #inherit nixos; | 270 | #inherit nixos; |