diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-12-22 15:10:08 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-12-22 15:10:08 +0100 |
commit | c7aeff7d9b0ebc3cbc79ae90b9b91c58065e82f5 (patch) | |
tree | b2016f6c5713023ccf218f38f7181eea872e30b3 | |
parent | dab1955fdaa364303e9184570b4ff6d88c8dbeed (diff) | |
download | Nix-c7aeff7d9b0ebc3cbc79ae90b9b91c58065e82f5.tar.gz Nix-c7aeff7d9b0ebc3cbc79ae90b9b91c58065e82f5.tar.zst Nix-c7aeff7d9b0ebc3cbc79ae90b9b91c58065e82f5.zip |
Rename oldAttrs param
-rw-r--r-- | default.nix | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/default.nix b/default.nix index 4e6657c..8ceee41 100644 --- a/default.nix +++ b/default.nix | |||
@@ -34,14 +34,14 @@ let | |||
34 | src = fetchgit json.git; | 34 | src = fetchgit json.git; |
35 | }; | 35 | }; |
36 | 36 | ||
37 | ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (oldAttrs: | 37 | ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (_old: |
38 | fetchedGithub ./fetched/ledger.json // { | 38 | fetchedGithub ./fetched/ledger.json // { |
39 | postInstall = ""; | 39 | postInstall = ""; |
40 | } | 40 | } |
41 | ); | 41 | ); |
42 | 42 | ||
43 | taskwarrior = nixpkgs.taskwarrior.overrideAttrs (oldAttrs: rec { | 43 | taskwarrior = nixpkgs.taskwarrior.overrideAttrs (old: rec { |
44 | postInstall = ''${oldAttrs.postInstall} | 44 | postInstall = ''${old.postInstall} |
45 | mkdir -p "$out/share/vim/vimfiles/ftdetect" | 45 | mkdir -p "$out/share/vim/vimfiles/ftdetect" |
46 | mkdir -p "$out/share/vim/vimfiles/syntax" | 46 | mkdir -p "$out/share/vim/vimfiles/syntax" |
47 | ln -s "../../../../share/doc/task/scripts/vim/ftdetect/task.vim" "$out/share/vim/vimfiles/ftdetect/" | 47 | ln -s "../../../../share/doc/task/scripts/vim/ftdetect/task.vim" "$out/share/vim/vimfiles/ftdetect/" |
@@ -51,36 +51,36 @@ let | |||
51 | ''; | 51 | ''; |
52 | }); | 52 | }); |
53 | 53 | ||
54 | vit = (nixpkgs.vit.override { inherit taskwarrior; }).overrideAttrs (oldAttrs: | 54 | vit = (nixpkgs.vit.override { inherit taskwarrior; }).overrideAttrs (old: |
55 | fetchedGithub ./fetched/vit.json // { | 55 | fetchedGithub ./fetched/vit.json // { |
56 | buildInputs = oldAttrs.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth]; | 56 | buildInputs = old.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth]; |
57 | } | 57 | } |
58 | ); | 58 | ); |
59 | 59 | ||
60 | weboob = pythonPackages.weboob.overrideAttrs (oldAttrs: rec { | 60 | weboob = pythonPackages.weboob.overrideAttrs (old: rec { |
61 | postInstall = ''${oldAttrs.postInstall or ""} | 61 | postInstall = ''${old.postInstall or ""} |
62 | mkdir -p $out/share/bash-completion/completions/ | 62 | mkdir -p $out/share/bash-completion/completions/ |
63 | cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob | 63 | cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob |
64 | ''; | 64 | ''; |
65 | }); | 65 | }); |
66 | 66 | ||
67 | slrn = nixpkgs.slrn.overrideAttrs (oldAttrs: rec { | 67 | slrn = nixpkgs.slrn.overrideAttrs (old: rec { |
68 | version = "1.0.3a"; | 68 | version = "1.0.3a"; |
69 | name = "slrn-${version}"; | 69 | name = "slrn-${version}"; |
70 | src = fetchurl { | 70 | src = fetchurl { |
71 | url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2"; | 71 | url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2"; |
72 | sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v"; | 72 | sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v"; |
73 | }; | 73 | }; |
74 | configureFlags = oldAttrs.configureFlags ++ [ "--with-slrnpull" ]; | 74 | configureFlags = old.configureFlags ++ [ "--with-slrnpull" ]; |
75 | }); | 75 | }); |
76 | 76 | ||
77 | ldapvi = nixpkgs.ldapvi.overrideAttrs (oldAttrs: fetchedGit ./fetched/ldapvi.json); | 77 | ldapvi = nixpkgs.ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json); |
78 | 78 | ||
79 | nixos = import ./nixos_tools.nix {}; | 79 | nixos = import ./nixos_tools.nix {}; |
80 | 80 | ||
81 | pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (oldAttrs: | 81 | pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old: |
82 | fetchedGit ./fetched/pass.json // { | 82 | fetchedGit ./fetched/pass.json // { |
83 | patches = oldAttrs.patches ++ [ ./patches/pass-fix-pass-init.patch ]; | 83 | patches = old.patches ++ [ ./patches/pass-fix-pass-init.patch ]; |
84 | } | 84 | } |
85 | ); | 85 | ); |
86 | 86 | ||
@@ -88,8 +88,8 @@ let | |||
88 | notifySupport = true; | 88 | notifySupport = true; |
89 | inherit libnotify gpgme gdk_pixbuf; | 89 | inherit libnotify gpgme gdk_pixbuf; |
90 | python = python3; | 90 | python = python3; |
91 | }).overrideAttrs (oldAttrs: rec { | 91 | }).overrideAttrs (old: rec { |
92 | configureFlags = oldAttrs.configureFlags ++ [ "--enable-plugins" ]; | 92 | configureFlags = old.configureFlags ++ [ "--enable-plugins" ]; |
93 | }); | 93 | }); |
94 | 94 | ||
95 | weechat = nixpkgs.weechat.override { | 95 | weechat = nixpkgs.weechat.override { |
@@ -276,5 +276,7 @@ in | |||
276 | inherit keybase; | 276 | inherit keybase; |
277 | inherit bogofilter; | 277 | inherit bogofilter; |
278 | inherit pelican; | 278 | inherit pelican; |
279 | # todo: lx* ?, unrar, unzip, zeromq? | ||
280 | #inherit nextcloud-client; | ||
279 | #inherit nixos; | 281 | #inherit nixos; |
280 | } | 282 | } |