diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 16:29:50 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 16:29:50 +0200 |
commit | b78f03a5856068362bb0256e364edf74acbeeb75 (patch) | |
tree | 06f1b512d1518835e414403f34e22143b0aebf19 | |
parent | c9f6ec9377de8967b6e5d4d313d745f7a3ce9b6c (diff) | |
download | nixos-b78f03a5856068362bb0256e364edf74acbeeb75.tar nixos-b78f03a5856068362bb0256e364edf74acbeeb75.tar.gz nixos-b78f03a5856068362bb0256e364edf74acbeeb75.tar.bz2 nixos-b78f03a5856068362bb0256e364edf74acbeeb75.tar.xz nixos-b78f03a5856068362bb0256e364edf74acbeeb75.zip |
…
-rw-r--r-- | ymir.nix | 39 |
1 files changed, 20 insertions, 19 deletions
@@ -60,11 +60,11 @@ in rec { | |||
60 | 60 | ||
61 | nixpkgs.config.allowUnfree = true; | 61 | nixpkgs.config.allowUnfree = true; |
62 | 62 | ||
63 | nixpkgs.config.packageOverrides = pkgs: | 63 | nixpkgs.config.overlays = [ |
64 | rec { | 64 | (self: super: { |
65 | vsftpd = pkgs.vsftpd.override { sslEnable = true; }; | 65 | vsftpd = super.vsftpd.override { sslEnable = true; }; |
66 | prosody = pkgs.callPackage ./customized/prosody.nix ({ | 66 | prosody = self.callPackage ./customized/prosody.nix ({ |
67 | inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib luasec; | 67 | inherit (self.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib luasec; |
68 | lua5 = pkgs.lua5_1; | 68 | lua5 = pkgs.lua5_1; |
69 | withCommunityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins" "mod_watchuntrusted"]; | 69 | withCommunityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins" "mod_watchuntrusted"]; |
70 | extraModules = [prosodyAuth]; | 70 | extraModules = [prosodyAuth]; |
@@ -85,30 +85,30 @@ in rec { | |||
85 | # }; | 85 | # }; |
86 | # plugins = []; | 86 | # plugins = []; |
87 | # }; | 87 | # }; |
88 | cgit = pkgs.stdenv.lib.overrideDerivation pkgs.cgit (oldAttrs : { | 88 | cgit = super.stdenv.lib.overrideDerivation super.cgit (oldAttrs : { |
89 | buildInputs = oldAttrs.buildInputs ++ [ | 89 | buildInputs = oldAttrs.buildInputs ++ [ |
90 | pkgs.perl | 90 | self.perl |
91 | pkgs.python3 | 91 | self.python3 |
92 | pkgs.makeWrapper | 92 | self.makeWrapper |
93 | ]; | 93 | ]; |
94 | postInstall = let | 94 | postInstall = let |
95 | pythonEnv = pkgs.python3.buildEnv.override { extraLibs = with pkgs.python3Packages; [ pygments markdown ]; }; | 95 | pythonEnv = self.python3.buildEnv.override { extraLibs = with self.python3Packages; [ pygments markdown ]; }; |
96 | in '' | 96 | in '' |
97 | wrapProgram $out/lib/cgit/filters/syntax-highlighting.py --prefix PYTHONPATH ':' ${pythonEnv}/lib/*/site-packages | 97 | wrapProgram $out/lib/cgit/filters/syntax-highlighting.py --prefix PYTHONPATH ':' ${pythonEnv}/lib/*/site-packages |
98 | wrapProgram $out/lib/cgit/filters/about-formatting.sh --prefix PATH ':' ${pkgs.coreutils}/bin | 98 | wrapProgram $out/lib/cgit/filters/about-formatting.sh --prefix PATH ':' ${self.coreutils}/bin |
99 | tmpFile=$(mktemp) | 99 | tmpFile=$(mktemp) |
100 | chmod +x $tmpFile | 100 | chmod +x $tmpFile |
101 | echo "#!${pythonEnv}/bin/python3" >$tmpFile | 101 | echo "#!${pythonEnv}/bin/python3" >$tmpFile |
102 | tail -n +2 $out/lib/cgit/filters/html-converters/md2html >>$tmpFile | 102 | tail -n +2 $out/lib/cgit/filters/html-converters/md2html >>$tmpFile |
103 | mv -v $tmpFile $out/lib/cgit/filters/html-converters/md2html | 103 | mv -v $tmpFile $out/lib/cgit/filters/html-converters/md2html |
104 | wrapProgram $out/lib/cgit/filters/html-converters/md2html --prefix PYTHONPATH ':' ${pythonEnv}/lib/*/site-packages | 104 | wrapProgram $out/lib/cgit/filters/html-converters/md2html --prefix PYTHONPATH ':' ${pythonEnv}/lib/*/site-packages |
105 | wrapProgram $out/lib/cgit/filters/html-converters/man2html --prefix PATH ':' ${pkgs.groff}/bin | 105 | wrapProgram $out/lib/cgit/filters/html-converters/man2html --prefix PATH ':' ${self.groff}/bin |
106 | ''; | 106 | ''; |
107 | }); | 107 | }); |
108 | push2bin = pkgs.writeScriptBin "push2bin" '' | 108 | push2bin = super.writeScriptBin "push2bin" '' |
109 | #!${pkgs.zsh}/bin/zsh | 109 | #!${self.zsh}/bin/zsh |
110 | 110 | ||
111 | PATH=${pkgs.coreutils}/bin:${pkgs.gawk}/bin | 111 | PATH=${self.coreutils}/bin:${self.gawk}/bin |
112 | 112 | ||
113 | baseDir=/srv/www/files | 113 | baseDir=/srv/www/files |
114 | baseUrl="https://f.141.li" | 114 | baseUrl="https://f.141.li" |
@@ -132,21 +132,22 @@ in rec { | |||
132 | 132 | ||
133 | printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}" | 133 | printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}" |
134 | ''; | 134 | ''; |
135 | pam_pwdfile = pkgs.stdenv.mkDerivation rec { | 135 | pam_pwdfile = super.stdenv.mkDerivation rec { |
136 | name = "pam-pwdfile-${version}"; | 136 | name = "pam-pwdfile-${version}"; |
137 | version = "1.0"; | 137 | version = "1.0"; |
138 | src = pkgs.fetchFromGitHub { | 138 | src = super.fetchFromGitHub { |
139 | owner = "tiwe-de"; | 139 | owner = "tiwe-de"; |
140 | repo = "libpam-pwdfile"; | 140 | repo = "libpam-pwdfile"; |
141 | rev = "v${version}"; | 141 | rev = "v${version}"; |
142 | sha256 = "0sjzwsnlf1g0xbingmjvb9gh8lnwzkkfzw10194ibnppdn4gy0zy"; | 142 | sha256 = "0sjzwsnlf1g0xbingmjvb9gh8lnwzkkfzw10194ibnppdn4gy0zy"; |
143 | }; | 143 | }; |
144 | 144 | ||
145 | buildInputs = with pkgs; [ pam ]; | 145 | buildInputs = with self; [ pam ]; |
146 | 146 | ||
147 | installFlags = [ "DESTDIR=$(out)" ]; | 147 | installFlags = [ "DESTDIR=$(out)" ]; |
148 | }; | 148 | }; |
149 | }; | 149 | }) |
150 | ]; | ||
150 | 151 | ||
151 | environment.systemPackages = with pkgs; [ | 152 | environment.systemPackages = with pkgs; [ |
152 | git | 153 | git |