diff options
Diffstat (limited to 'flakes/mypackages/overlays')
24 files changed, 1340 insertions, 0 deletions
diff --git a/flakes/mypackages/overlays/bitlbee-discord/default.nix b/flakes/mypackages/overlays/bitlbee-discord/default.nix new file mode 100644 index 0000000..4227677 --- /dev/null +++ b/flakes/mypackages/overlays/bitlbee-discord/default.nix | |||
@@ -0,0 +1,12 @@ | |||
1 | self: super: { | ||
2 | bitlbee-discord = super.bitlbee-discord.overrideAttrs(old: rec { | ||
3 | version = "master"; | ||
4 | name = "bitlbee-discord-${version}"; | ||
5 | src = self.fetchFromGitHub { | ||
6 | rev = "607f9887ca85f246e970778e3d40aa5c346365a7"; | ||
7 | owner = "sm00th"; | ||
8 | repo = "bitlbee-discord"; | ||
9 | sha256 = "0jkwhx2walx2ay0vc9x13q0j1qq4r5x30ss03a3j7ks28xvsnxc7"; | ||
10 | }; | ||
11 | }); | ||
12 | } | ||
diff --git a/flakes/mypackages/overlays/bitlbee/bitlbee_long_nicks.patch b/flakes/mypackages/overlays/bitlbee/bitlbee_long_nicks.patch new file mode 100644 index 0000000..70be092 --- /dev/null +++ b/flakes/mypackages/overlays/bitlbee/bitlbee_long_nicks.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | diff --git a/bitlbee.h b/bitlbee.h | ||
2 | index 17ab2979..5858277e 100644 | ||
3 | --- a/bitlbee.h | ||
4 | +++ b/bitlbee.h | ||
5 | @@ -121,7 +121,7 @@ extern "C" { | ||
6 | #define CONTROL_TOPIC "Welcome to the control channel. Type \2help\2 for help information." | ||
7 | #define IRCD_INFO PACKAGE " <http://www.bitlbee.org/>" | ||
8 | |||
9 | -#define MAX_NICK_LENGTH 24 | ||
10 | +#define MAX_NICK_LENGTH 99 | ||
11 | |||
12 | #define HELP_FILE VARDIR "help.txt" | ||
13 | #define CONF_FILE_DEF ETCDIR "bitlbee.conf" | ||
14 | diff --git a/tests/check_nick.c b/tests/check_nick.c | ||
15 | index ca5e5111..909fdcc9 100644 | ||
16 | --- a/tests/check_nick.c | ||
17 | +++ b/tests/check_nick.c | ||
18 | @@ -11,16 +11,16 @@ | ||
19 | START_TEST(test_nick_strip){ | ||
20 | int i; | ||
21 | const char *get[] = { "test:", "test", "test\n", | ||
22 | - "thisisaveryveryveryverylongnick", | ||
23 | - "thisisave:ryveryveryverylongnick", | ||
24 | + "thisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnick", | ||
25 | + "thisis:averyveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnick", | ||
26 | "t::::est", | ||
27 | "test123", | ||
28 | "123test", | ||
29 | "123", | ||
30 | NULL }; | ||
31 | const char *expected[] = { "test", "test", "test", | ||
32 | - "thisisaveryveryveryveryl", | ||
33 | - "thisisaveryveryveryveryl", | ||
34 | + "thisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryve", | ||
35 | + "thisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryve", | ||
36 | "test", | ||
37 | "test123", | ||
38 | "_123test", | ||
39 | @@ -28,7 +28,7 @@ START_TEST(test_nick_strip){ | ||
40 | NULL }; | ||
41 | |||
42 | for (i = 0; get[i]; i++) { | ||
43 | - char copy[60]; | ||
44 | + char copy[260]; | ||
45 | strcpy(copy, get[i]); | ||
46 | nick_strip(NULL, copy); | ||
47 | fail_unless(strcmp(copy, expected[i]) == 0, | ||
48 | @@ -53,7 +53,7 @@ END_TEST | ||
49 | |||
50 | START_TEST(test_nick_ok_notok) | ||
51 | { | ||
52 | - const char *nicks[] = { "thisisaveryveryveryveryveryveryverylongnick", | ||
53 | + const char *nicks[] = { "thisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnick", | ||
54 | "\nillegalchar", "", "nick%", "123test", NULL }; | ||
55 | int i; | ||
56 | |||
diff --git a/flakes/mypackages/overlays/bitlbee/default.nix b/flakes/mypackages/overlays/bitlbee/default.nix new file mode 100644 index 0000000..5183d01 --- /dev/null +++ b/flakes/mypackages/overlays/bitlbee/default.nix | |||
@@ -0,0 +1,5 @@ | |||
1 | self: super: { | ||
2 | bitlbee = super.bitlbee.overrideAttrs(old: { | ||
3 | patches = (old.patches or []) ++ [ ./bitlbee_long_nicks.patch ]; | ||
4 | }); | ||
5 | } | ||
diff --git a/flakes/mypackages/overlays/databases/mysql/default.nix b/flakes/mypackages/overlays/databases/mysql/default.nix new file mode 100644 index 0000000..45dc468 --- /dev/null +++ b/flakes/mypackages/overlays/databases/mysql/default.nix | |||
@@ -0,0 +1,28 @@ | |||
1 | self: super: rec { | ||
2 | #mariadb = super.mariadb_106.overrideAttrs(old: { | ||
3 | # passthru = old.passthru // { mysqlVersion = "5.7"; }; | ||
4 | #}); | ||
5 | #mariadb_pam = super.mariadb_106.overrideAttrs(old: { | ||
6 | # cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; | ||
7 | # buildInputs = old.buildInputs ++ [ self.pam ]; | ||
8 | # outputs = old.outputs ++ [ "dev" ]; | ||
9 | # passthru = old.passthru // { mysqlVersion = "5.7"; }; | ||
10 | # postInstall = '' | ||
11 | # mkdir -p $dev $dev/lib $dev/share | ||
12 | # cp -a $out/include $dev | ||
13 | # cp -a $out/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} $dev/lib | ||
14 | # cp -a $out/lib/pkgconfig $dev/lib | ||
15 | # cp -a $out/share/aclocal $dev/share | ||
16 | # '' + old.postInstall; | ||
17 | #}); | ||
18 | ## This patched version includes C headers from the server part (see | ||
19 | ## above). It seems to be required to build pam support in clients. | ||
20 | #libmysqlclient_pam = super.libmysqlclient.overrideAttrs(old: { | ||
21 | # prePatch = old.prePatch or "" + '' | ||
22 | # sed -i -e '/define INCLUDE/s|"$| -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql/server -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql/server/private"|' mariadb_config/mariadb_config.c.in | ||
23 | # ''; | ||
24 | # postInstall = old.postInstall or "" + '' | ||
25 | # cp -a ${mariadb_pam.dev}/include/* $out/include/mariadb | ||
26 | # ''; | ||
27 | #}); | ||
28 | } | ||
diff --git a/flakes/mypackages/overlays/databases/postgresql/default.nix b/flakes/mypackages/overlays/databases/postgresql/default.nix new file mode 100644 index 0000000..9ada29c --- /dev/null +++ b/flakes/mypackages/overlays/databases/postgresql/default.nix | |||
@@ -0,0 +1,8 @@ | |||
1 | self: super: rec { | ||
2 | postgresql_pam = super.postgresql_11.overrideAttrs(old: { | ||
3 | # datadir in /var/lib/postgresql is named after psqlSchema | ||
4 | passthru = old.passthru // { psqlSchema = "11.0"; }; | ||
5 | configureFlags = old.configureFlags ++ [ "--with-pam" ]; | ||
6 | buildInputs = (old.buildInputs or []) ++ [ self.pam ]; | ||
7 | }); | ||
8 | } | ||
diff --git a/flakes/mypackages/overlays/default.nix b/flakes/mypackages/overlays/default.nix new file mode 100644 index 0000000..e91d6a1 --- /dev/null +++ b/flakes/mypackages/overlays/default.nix | |||
@@ -0,0 +1,25 @@ | |||
1 | { sources, mylibs }: | ||
2 | { | ||
3 | mylibs = self: super: { inherit mylibs; }; | ||
4 | mypkgs = final: prev: import ../pkgs/default.nix { pkgs = final; inherit mylibs sources; }; | ||
5 | |||
6 | bitlbee = import ./bitlbee; | ||
7 | bitlbee-discord = import ./bitlbee-discord; | ||
8 | gitweb = import ./gitweb; | ||
9 | gitolite = import ./gitolite; | ||
10 | goaccess = import ./goaccess; | ||
11 | kanboard = import ./kanboard; | ||
12 | mysql = import ./databases/mysql; | ||
13 | postfix = import ./postfix; | ||
14 | postgresql = import ./databases/postgresql; | ||
15 | ympd = import ./ympd; | ||
16 | morph = import ./morph; | ||
17 | cron = self: super: { | ||
18 | cron = super.cron.overrideAttrs(old: { | ||
19 | # Allow "+" char in MAILTO | ||
20 | patchPhase = '' | ||
21 | sed -i -e "/static const char safe_delim/s/@/@+/" do_command.c | ||
22 | ''; | ||
23 | }); | ||
24 | }; | ||
25 | } | ||
diff --git a/flakes/mypackages/overlays/gitolite/default.nix b/flakes/mypackages/overlays/gitolite/default.nix new file mode 100644 index 0000000..7f8f007 --- /dev/null +++ b/flakes/mypackages/overlays/gitolite/default.nix | |||
@@ -0,0 +1,8 @@ | |||
1 | self: super: { | ||
2 | gitolite = super.gitolite.overrideAttrs(old: { | ||
3 | postPatch = old.postPatch + '' | ||
4 | sed -i -e "s@/bin/rm@rm@" src/commands/sskm | ||
5 | cp ${./invite} src/commands/invite | ||
6 | ''; | ||
7 | }); | ||
8 | } | ||
diff --git a/flakes/mypackages/overlays/gitolite/invite b/flakes/mypackages/overlays/gitolite/invite new file mode 100755 index 0000000..3cc2dbd --- /dev/null +++ b/flakes/mypackages/overlays/gitolite/invite | |||
@@ -0,0 +1,172 @@ | |||
1 | #!/usr/bin/perl | ||
2 | use strict; | ||
3 | use warnings; | ||
4 | |||
5 | use lib $ENV{GL_LIBDIR}; | ||
6 | use Gitolite::Rc; | ||
7 | use Gitolite::Common; | ||
8 | |||
9 | =for usage | ||
10 | Please see usage at https://www.immae.eu/docs/forge-logicielle/gitolite.html#inviter-des-collaborateurs | ||
11 | =cut | ||
12 | |||
13 | usage() if @ARGV and ($ARGV[0] eq '-h' or $ARGV[0] eq '--help'); | ||
14 | |||
15 | my $rb = $rc{GL_REPO_BASE}; | ||
16 | my $ab = $rc{GL_ADMIN_BASE}; | ||
17 | # get to the keydir | ||
18 | _chdir("$ab/keydir"); | ||
19 | |||
20 | # save arguments for later | ||
21 | my $operation = shift || 'list'; | ||
22 | my $invitekeyid = shift || ''; | ||
23 | $invitekeyid and $invitekeyid !~ /^[-0-9a-z_]+@[-0-9a-z_]+$/i and die "invalid keyid $invitekeyid\n"; | ||
24 | my ($invited, $keyid) = split /@/, $invitekeyid; | ||
25 | |||
26 | # get the actual userid and keytype | ||
27 | my $gl_user = $ENV{GL_USER}; | ||
28 | die "This function is reserved for actual users" if $gl_user =~ s/-invite-(.*)$//; | ||
29 | |||
30 | # ---- | ||
31 | # first collect the keys | ||
32 | |||
33 | my ( @invited_keys ); | ||
34 | |||
35 | for my $pubkey (`find . -type f -name "*.pub" | sort`) { | ||
36 | chomp($pubkey); | ||
37 | $pubkey =~ s(^./)(); # artifact of the find command | ||
38 | |||
39 | my $user = $pubkey; | ||
40 | $user =~ s(.*/)(); # foo/bar/baz.pub -> baz.pub | ||
41 | $user =~ s/(\@[^.]+)?\.pub$//; # baz.pub, baz@home.pub -> baz | ||
42 | |||
43 | if ( $user =~ m(^(zzz-marked-for-...-)?$gl_user-invite-) ) { | ||
44 | push @invited_keys, $pubkey; | ||
45 | } | ||
46 | } | ||
47 | |||
48 | # ---- | ||
49 | # list mode; just do it and exit | ||
50 | sub print_keylist { | ||
51 | my ( $message, @list ) = @_; | ||
52 | return unless @list; | ||
53 | print "== $message ==\n"; | ||
54 | my $count = 1; | ||
55 | for (@list) { | ||
56 | my $fp = fingerprint($_); | ||
57 | s/(zzz-marked-for-...-)?$gl_user-invite-//g; | ||
58 | s/\.pub$//; | ||
59 | s(.*/)(); | ||
60 | print $count++ . ": $fp : $_\n"; | ||
61 | } | ||
62 | } | ||
63 | if ( $operation eq 'list' ) { | ||
64 | print "you have the following invited keys:\n"; | ||
65 | print_keylist( "keys for invited persons", @invited_keys ); | ||
66 | print "\n\n"; | ||
67 | exit; | ||
68 | } | ||
69 | |||
70 | # ---- | ||
71 | # please see docs for details on how a user interacts with this | ||
72 | |||
73 | die "valid operations: add, del\n" unless $operation =~ /^(add|del)$/; | ||
74 | |||
75 | if ( $operation eq 'add' ) { | ||
76 | print STDERR "please supply the new key on STDIN. (I recommend you | ||
77 | don't try to do this interactively, but use a pipe)\n"; | ||
78 | kf_add( $gl_user, $invited, $keyid, safe_stdin() ); | ||
79 | } elsif ( $operation eq 'del' ) { | ||
80 | kf_del( $gl_user, $invited, $keyid ); | ||
81 | } | ||
82 | |||
83 | exit; | ||
84 | |||
85 | # ---- | ||
86 | |||
87 | # make a temp clone and switch to it | ||
88 | our $TEMPDIR; | ||
89 | BEGIN { $TEMPDIR = `mktemp -d -t tmp.XXXXXXXXXX`; } | ||
90 | END { `rm -rf $TEMPDIR`; } | ||
91 | |||
92 | sub cd_temp_clone { | ||
93 | chomp($TEMPDIR); | ||
94 | hushed_git( "clone", "$rb/gitolite-admin.git", "$TEMPDIR" ); | ||
95 | chdir($TEMPDIR); | ||
96 | my $hostname = `hostname`; chomp($hostname); | ||
97 | hushed_git( "config", "--get", "user.email" ) and hushed_git( "config", "user.email", $ENV{USER} . "@" . $hostname ); | ||
98 | hushed_git( "config", "--get", "user.name" ) and hushed_git( "config", "user.name", "$ENV{USER} on $hostname" ); | ||
99 | } | ||
100 | |||
101 | sub fingerprint { | ||
102 | my ($fp, $output) = ssh_fingerprint_file(shift); | ||
103 | # Do not print the output of $output to an untrusted destination. | ||
104 | die "does not seem to be a valid pubkey\n" unless $fp; | ||
105 | return $fp; | ||
106 | } | ||
107 | |||
108 | sub safe_stdin { | ||
109 | # read one line from STDIN | ||
110 | my $data; | ||
111 | my $ret = read STDIN, $data, 4096; | ||
112 | # current pubkeys are approx 400 bytes so we go a little overboard | ||
113 | die "could not read pubkey data" . ( defined($ret) ? "" : ": $!" ) . "\n" unless $ret; | ||
114 | die "pubkey data seems to have more than one line\n" if $data =~ /\n./; | ||
115 | return $data; | ||
116 | } | ||
117 | |||
118 | sub hushed_git { | ||
119 | local (*STDOUT) = \*STDOUT; | ||
120 | local (*STDERR) = \*STDERR; | ||
121 | open( STDOUT, ">", "/dev/null" ); | ||
122 | open( STDERR, ">", "/dev/null" ); | ||
123 | system( "git", @_ ); | ||
124 | } | ||
125 | |||
126 | sub highlander { | ||
127 | # there can be only one | ||
128 | my ( $keyid, $die_if_empty, @a ) = @_; | ||
129 | # too many? | ||
130 | if ( @a > 1 ) { | ||
131 | print STDERR " | ||
132 | more than one key satisfies this condition, and I can't deal with that! | ||
133 | The keys are: | ||
134 | |||
135 | "; | ||
136 | print STDERR "\t" . join( "\n\t", @a ), "\n\n"; | ||
137 | exit 1; | ||
138 | } | ||
139 | # too few? | ||
140 | die "no keys with " . ( $keyid || "empty" ) . " keyid found\n" if $die_if_empty and not @a; | ||
141 | |||
142 | return @a; | ||
143 | } | ||
144 | |||
145 | sub kf_add { | ||
146 | my ( $gl_user, $invited, $keyid, $keymaterial ) = @_; | ||
147 | |||
148 | # add a new "invited" key for $gl_user. | ||
149 | cd_temp_clone(); | ||
150 | chdir("keydir"); | ||
151 | |||
152 | mkdir("invited"); | ||
153 | _print( "invited/$gl_user-invite-$invited\@$keyid.pub", $keymaterial ); | ||
154 | hushed_git( "add", "." ) and die "git add failed\n"; | ||
155 | my $fp = fingerprint("invited/$gl_user-invite-$invited\@$keyid.pub"); | ||
156 | hushed_git( "commit", "-m", "invite add $gl_user-invite-$invited\@$keyid ($fp)" ) and die "git commit failed\n"; | ||
157 | system("gitolite push >/dev/null 2>/dev/null") and die "git push failed\n"; | ||
158 | } | ||
159 | |||
160 | sub kf_del { | ||
161 | my ( $gl_user, $invited, $keyid ) = @_; | ||
162 | |||
163 | cd_temp_clone(); | ||
164 | chdir("keydir"); | ||
165 | |||
166 | my @pk = highlander( $keyid, 1, grep { m(^(.*/)?(zzz-marked-for-...-)?$gl_user-invite-$invited\@$keyid.pub$) } @invited_keys ); | ||
167 | |||
168 | my $fp = fingerprint( $pk[0] ); | ||
169 | hushed_git( "rm", $pk[0]) and die "git mv failed\n"; | ||
170 | hushed_git( "commit", "-m", "invite del $pk[0] ($fp)" ) and die "git commit failed\n"; | ||
171 | system("gitolite push >/dev/null 2>/dev/null") and die "git push failed\n"; | ||
172 | } | ||
diff --git a/flakes/mypackages/overlays/gitweb/default.nix b/flakes/mypackages/overlays/gitweb/default.nix new file mode 100644 index 0000000..27a1152 --- /dev/null +++ b/flakes/mypackages/overlays/gitweb/default.nix | |||
@@ -0,0 +1,7 @@ | |||
1 | self: super: { | ||
2 | gitweb = super.gitweb.overrideAttrs(old: { | ||
3 | postBuild = old.postBuild or "" + '' | ||
4 | cp -r ${./theme} $out/gitweb-theme; | ||
5 | ''; | ||
6 | }); | ||
7 | } | ||
diff --git a/flakes/mypackages/overlays/gitweb/theme/git-favicon.png b/flakes/mypackages/overlays/gitweb/theme/git-favicon.png new file mode 100644 index 0000000..4fa44bb --- /dev/null +++ b/flakes/mypackages/overlays/gitweb/theme/git-favicon.png | |||
Binary files differ | |||
diff --git a/flakes/mypackages/overlays/gitweb/theme/git-logo.png b/flakes/mypackages/overlays/gitweb/theme/git-logo.png new file mode 100644 index 0000000..fdaf7b7 --- /dev/null +++ b/flakes/mypackages/overlays/gitweb/theme/git-logo.png | |||
Binary files differ | |||
diff --git a/flakes/mypackages/overlays/gitweb/theme/gitweb.css b/flakes/mypackages/overlays/gitweb/theme/gitweb.css new file mode 100644 index 0000000..83e0742 --- /dev/null +++ b/flakes/mypackages/overlays/gitweb/theme/gitweb.css | |||
@@ -0,0 +1,783 @@ | |||
1 | /* Reset | ||
2 | ------------------------------------------------------------------------- */ | ||
3 | |||
4 | /* Based on http://meyerweb.com/eric/tools/css/reset/ */ | ||
5 | /* v1.0 | 20080212 */ | ||
6 | |||
7 | html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, | ||
8 | blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, | ||
9 | font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, | ||
10 | u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, | ||
11 | caption, tbody, tfoot, thead, tr, th, td { | ||
12 | margin: 0; | ||
13 | padding: 0; | ||
14 | border: 0; | ||
15 | outline: 0; | ||
16 | font-size: 100%; | ||
17 | vertical-align: baseline; | ||
18 | background: transparent; | ||
19 | } | ||
20 | |||
21 | ol, ul { list-style: none; } | ||
22 | |||
23 | blockquote, q { quotes: none; } | ||
24 | |||
25 | blockquote:before, blockquote:after, | ||
26 | q:before, q:after { | ||
27 | content: ''; | ||
28 | content: none; | ||
29 | } | ||
30 | |||
31 | :focus { outline: 0; } | ||
32 | |||
33 | ins { text-decoration: none; } | ||
34 | |||
35 | del { text-decoration: line-through; } | ||
36 | |||
37 | table { | ||
38 | border-collapse: collapse; | ||
39 | border-spacing: 0; | ||
40 | } | ||
41 | |||
42 | a { outline: none; } | ||
43 | |||
44 | /* General | ||
45 | ---------------------------------------------------------------------------- */ | ||
46 | |||
47 | html { | ||
48 | position: relative; | ||
49 | min-height: 100%; | ||
50 | } | ||
51 | |||
52 | body { | ||
53 | font: 13px Helvetica,arial,freesans,clean,sans-serif; | ||
54 | line-height: 1.4; | ||
55 | margin: 0 0 105px; | ||
56 | background-color: #fff; | ||
57 | color: #000000; | ||
58 | } | ||
59 | |||
60 | /* Monospaced Fonts */ | ||
61 | .sha1, .mode, .diff_tree .list, .pre, .diff, .patchset { | ||
62 | font-family: 'Consolas','Bitstream Vera Sans Mono',monospace; | ||
63 | } | ||
64 | |||
65 | a:link, a:visited { | ||
66 | color: #4183C4; | ||
67 | text-decoration: none; | ||
68 | } | ||
69 | |||
70 | a:hover { | ||
71 | text-decoration: underline; | ||
72 | } | ||
73 | |||
74 | td.list a[href*='tree'], td.list a[href*='blob'] { | ||
75 | padding-left: 20px; | ||
76 | display: block; | ||
77 | float: left; | ||
78 | height: 16px; | ||
79 | line-height: 16px; | ||
80 | } | ||
81 | |||
82 | td.list a[href*='tree'] { | ||
83 | background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABq0lEQVQ4y8WTu4oUQRSGv+rtGVuxhwVFdFEEE2c3d0HYTEMTn8DEVxADQTDUF9DMwMxQMBMx8AEWzRQ3cBHd9TI91+2urjq/QbczY2IygSep4nD+79yqnCRWsYQVbWVACvDh5ZXdrLe15dwyT1TjT/sxFFeB6i+VA2B6+cb7kAI4Jf0LO087zjlQI8Y5Qvnj0sHug321XoC1bk+K9eHk6+s7wPMUgKAS88eqb4+Jfg2SHs7lZBvX2Nh+2EUCDGSAcMnJsx9f7NxfAGqXyDzRd5EJO/pMPT1gcviGTnYOVIN5pAAE8v7dLrKL8xnglFk4ws9Afko9HpH3b5Gd2mwb/lOBmgrSdYhJugDUCenxM6xv3p4HCsP8F0LxCsUhCkMURihOyM7fg0osASTFEpu9a4LjGIUCqwcoDiEUrX+E4hRUQb20RiokC1j9vckUhygU7X3QZh7NAVKYL7YBeMkRUfjVCotF2XGIwnghtrJpMywB5G0QZj9P1JNujuWJ1AHLQadRrACPkuZ0SSSWpeStWgDK6tHek5vbiOs48n++XQHurcf0rFng//6NvwG+iB9/4duaTgAAAABJRU5ErkJgggo=) center left no-repeat; | ||
84 | } | ||
85 | |||
86 | td.list a[href*='blob'] { | ||
87 | background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAA6ElEQVQoFQXBMW5TQRgGwNnHnoE0QbiCjoIooUmTU3AuS1BwIoTSUdJBigg3GCWOg9/++zHTop078wIAsPMrE4SL5/1aIyMjIyMjz/m0tbFECFdrPeaQQw75mz/5nZH7fN7aWILmauSYfznmmIfss8vIUx7zZWsTTXM5vpWvTk5Wq9VHQP/gtgOLa0Qpw940vAQdaG6thpOhlOkG0AEuAVGmEkAH+G4YSikxXQM6wDsAMRFAB/ihDNNUmN4DOsAbBAEAdICfpmmaAt4COoj2GgCASbIkZh1NAACznhQt2itnFgAAlF3u/gMDtJXPzQxoswAAAABJRU5ErkJgggo=) center left no-repeat; | ||
88 | } | ||
89 | |||
90 | i { | ||
91 | font-style: normal; | ||
92 | } | ||
93 | |||
94 | td, th { | ||
95 | padding: 5px; | ||
96 | } | ||
97 | |||
98 | .page_nav br { | ||
99 | display: none; | ||
100 | } | ||
101 | |||
102 | /* Page Header | ||
103 | ---------------------------------------------------------------------------- */ | ||
104 | |||
105 | .page_header { | ||
106 | height: 50px; | ||
107 | line-height: 50px; | ||
108 | position: relative; | ||
109 | padding: 0 27px; | ||
110 | margin-bottom: 20px; | ||
111 | font-size: 20px; | ||
112 | font-family: Helvetica, Arial, Freesans, Clean, sans-serif; | ||
113 | background: #FFFFFF; /* old browsers */ | ||
114 | background: -moz-linear-gradient(top, #FFFFFF 0%, #F5F5F5 100%); /* firefox */ | ||
115 | background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(100%,#F5F5F5)); /* webkit */ | ||
116 | filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#F5F5F5',GradientType=0 ); /* ie */ | ||
117 | background: -o-linear-gradient(top, #FFFFFF 0%, #F5F5F5 100%); | ||
118 | border-bottom: 1px solid #dfdfdf; | ||
119 | } | ||
120 | |||
121 | .page_header a:link, .page_header a:visited { | ||
122 | color: #4183C4; | ||
123 | text-decoration: none; | ||
124 | padding: 3px; | ||
125 | font-weight: bold; | ||
126 | } | ||
127 | |||
128 | .page_header a:hover { | ||
129 | font-weight: bold; | ||
130 | padding: 3px; | ||
131 | text-decoration: underline; | ||
132 | } | ||
133 | |||
134 | .page_header a:first-child { | ||
135 | background: transparent; | ||
136 | } | ||
137 | |||
138 | .page_header img.logo { | ||
139 | position: relative; | ||
140 | top: 7px; | ||
141 | margin-right: 5px; | ||
142 | } | ||
143 | |||
144 | /* Page Footer | ||
145 | ---------------------------------------------------------------------------- */ | ||
146 | |||
147 | .page_footer { | ||
148 | position: absolute; | ||
149 | left: 0; | ||
150 | bottom: 0; | ||
151 | width: 100%; | ||
152 | height: 80px; | ||
153 | line-height: 80px; | ||
154 | margin-top: 15px; | ||
155 | background: #f1f1f1; | ||
156 | border-top: 2px solid #ddd; | ||
157 | border-bottom: 1px solid #ddd; | ||
158 | } | ||
159 | |||
160 | .page_footer_text { | ||
161 | color: #666; | ||
162 | display: inline; | ||
163 | float: left; | ||
164 | margin-left: 25px; | ||
165 | width: 80%; | ||
166 | overflow: hidden; | ||
167 | white-space: nowrap; | ||
168 | text-overflow: ellipsis; | ||
169 | } | ||
170 | |||
171 | a.rss_logo { | ||
172 | float: right; | ||
173 | padding: 3px 1px; | ||
174 | width: 35px; | ||
175 | line-height: 10px; | ||
176 | border: 1px solid; | ||
177 | border-color: #fcc7a5 #7d3302 #3e1a01 #ff954e; | ||
178 | color: #ffffff; | ||
179 | background-color: #ff6600; | ||
180 | font-weight: bold; | ||
181 | font-family: sans-serif; | ||
182 | font-size: 80%; | ||
183 | text-align: center; | ||
184 | text-decoration: none; | ||
185 | margin-top: 30px; | ||
186 | margin-left: 5px; | ||
187 | } | ||
188 | |||
189 | a.rss_logo:hover { | ||
190 | background-color: #ee5500; | ||
191 | } | ||
192 | |||
193 | .rss_logo { | ||
194 | margin-right: 25px; | ||
195 | background: yellow; | ||
196 | } | ||
197 | |||
198 | .rss_logo:last-child { | ||
199 | margin-right: 5px; | ||
200 | } | ||
201 | |||
202 | /* Index include | ||
203 | ---------------------------------------------------------------------------- */ | ||
204 | |||
205 | .index_include { | ||
206 | width: 95%; | ||
207 | margin: 0 auto 15px; | ||
208 | background: -moz-linear-gradient(center top , #FFFFFF 0%, #F5F5F5 100%) repeat scroll 0 0 transparent; | ||
209 | border: 1px solid #DFDFDF; | ||
210 | padding: 8px; | ||
211 | -webkit-box-sizing: border-box; | ||
212 | -moz-box-sizing: border-box; | ||
213 | box-sizing: border-box; | ||
214 | } | ||
215 | |||
216 | /* Elements | ||
217 | ---------------------------------------------------------------------------- */ | ||
218 | |||
219 | .project_list, | ||
220 | .shortlog, | ||
221 | .tree, | ||
222 | .commit_search, | ||
223 | .history { | ||
224 | width: 95%; | ||
225 | margin: 0 auto 15px auto; | ||
226 | border: 1px solid #d8d8d8; | ||
227 | -moz-box-shadow: 0 0 3px rgba(0,0,0,0.2); | ||
228 | -webkit-box-shadow: 0 0 3px rgba(0,0,0,0.2); | ||
229 | box-shadow: 0 0 3px rgba(0,0,0,0.2); | ||
230 | } | ||
231 | |||
232 | .project_list th, | ||
233 | .shortlog th, | ||
234 | .tree th, | ||
235 | .commit_search th { | ||
236 | color: #afafaf; | ||
237 | font-weight: normal; | ||
238 | } | ||
239 | |||
240 | .project_list th { | ||
241 | font-weight: bold; | ||
242 | } | ||
243 | |||
244 | .project_list tr, | ||
245 | .shortlog tr, | ||
246 | .tree tr, | ||
247 | .commit_search tr { | ||
248 | background: #eaeaea; | ||
249 | height: 2.5em; | ||
250 | text-align: left; | ||
251 | color: #545454; | ||
252 | } | ||
253 | |||
254 | .project_list tr.dark, .project_list tr.light, | ||
255 | .shortlog tr.dark, .shortlog tr.light, | ||
256 | .tree tr.dark, .tree tr.light, | ||
257 | .commit_search tr.dark, .commit_search tr.light, | ||
258 | .history tr.dark, .history tr.light, | ||
259 | .heads tr.dark, .heads tr.light { | ||
260 | background: #F9F9F9; /* old browsers */ | ||
261 | background: -moz-linear-gradient(top, #F9F9F9 0%, #EFEFEF 100%); /* firefox */ | ||
262 | background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F9F9F9), color-stop(100%,#EFEFEF)); /* webkit */ | ||
263 | filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F9F9F9', endColorstr='#EFEFEF',GradientType=0 ); /* ie */ | ||
264 | background: -o-linear-gradient(top, #F9F9F9 0%, #EFEFEF 100%); | ||
265 | height: 2.5em; | ||
266 | border-bottom: 1px solid #e1e1e1; | ||
267 | } | ||
268 | |||
269 | th .header { | ||
270 | background: transparent; | ||
271 | border: 0; | ||
272 | padding: 0; | ||
273 | font-weight: bold; | ||
274 | } | ||
275 | |||
276 | .tree { | ||
277 | width: 100%; | ||
278 | margin: 0; | ||
279 | } | ||
280 | |||
281 | .projsearch { | ||
282 | position: absolute; | ||
283 | right: 4%; | ||
284 | top: 15px; | ||
285 | } | ||
286 | |||
287 | .projsearch a { | ||
288 | display: none; | ||
289 | } | ||
290 | |||
291 | .commit_search { | ||
292 | background: #eaeaea; | ||
293 | } | ||
294 | |||
295 | .page_nav, | ||
296 | .list_head, | ||
297 | .page_path, | ||
298 | .search { | ||
299 | width: 94%; | ||
300 | background: #eaeaea; | ||
301 | color: #545454; | ||
302 | border: 1px solid #d8d8d8; | ||
303 | padding: 5px; | ||
304 | margin: 0 auto 15px auto; | ||
305 | } | ||
306 | |||
307 | .history { | ||
308 | background: #eaeaea; | ||
309 | } | ||
310 | |||
311 | .title { | ||
312 | margin: 0 auto 15px auto; | ||
313 | padding: 5px; | ||
314 | width: 95%; | ||
315 | } | ||
316 | |||
317 | .readme { | ||
318 | background: #eaf2f5; | ||
319 | border: 1px solid #bedce7; | ||
320 | -moz-box-sizing: border-box; | ||
321 | -webkit-box-sizing: border-box; | ||
322 | box-sizing: border-box; | ||
323 | margin: 0 auto 15px auto; | ||
324 | padding: 15px; | ||
325 | width: 95%; | ||
326 | } | ||
327 | |||
328 | .readme h1 { | ||
329 | display: block; | ||
330 | font-size: 2em; | ||
331 | font-weight: bold; | ||
332 | margin-bottom: 0.67em; | ||
333 | margin-top: 0; | ||
334 | } | ||
335 | |||
336 | .readme h2 { | ||
337 | font-size: 1.5em; | ||
338 | font-weight: bold; | ||
339 | margin-bottom: 0.83em; | ||
340 | } | ||
341 | |||
342 | |||
343 | .readme h3 { | ||
344 | font-size: 1.17em; | ||
345 | font-weight: bold; | ||
346 | margin-bottom: 1em; | ||
347 | } | ||
348 | |||
349 | .readme p { | ||
350 | margin-bottom: 1em; | ||
351 | } | ||
352 | |||
353 | .readme ul { | ||
354 | list-style: disc; | ||
355 | margin-bottom: 1em; | ||
356 | margin-left: 1.5em; | ||
357 | } | ||
358 | |||
359 | .readme ul ul { | ||
360 | margin-bottom: 0; | ||
361 | } | ||
362 | |||
363 | .readme ol { | ||
364 | list-style: decimal; | ||
365 | margin-bottom: 1em; | ||
366 | margin-left: 1.5em; | ||
367 | } | ||
368 | |||
369 | .readme ol ol { | ||
370 | margin-bottom: 0; | ||
371 | } | ||
372 | |||
373 | .readme pre { | ||
374 | font-family: monospace; | ||
375 | margin: 1em 0; | ||
376 | white-space: pre; | ||
377 | } | ||
378 | |||
379 | .readme tt, .readme code, .readme kbd, .readme samp { | ||
380 | font-family: monospace; | ||
381 | } | ||
382 | |||
383 | .readme blockquote { | ||
384 | margin: 1em; | ||
385 | } | ||
386 | |||
387 | .projects_list, | ||
388 | .tags { | ||
389 | width: 95%; | ||
390 | background: #f0f0f0; | ||
391 | color: #545454; | ||
392 | border: 1px solid #d8d8d8; | ||
393 | padding: 5px; | ||
394 | margin: 0 auto 15px auto; | ||
395 | } | ||
396 | |||
397 | .heads { | ||
398 | width: 95%; | ||
399 | color: #545454; | ||
400 | border: 1px solid #d8d8d8; | ||
401 | padding: 5px; | ||
402 | margin: 0 auto 15px auto; | ||
403 | } | ||
404 | |||
405 | .header { | ||
406 | width: 94%; | ||
407 | margin: 0 auto 15px auto; | ||
408 | background: #eaf2f5; | ||
409 | border: 1px solid #bedce7; | ||
410 | padding: 5px; | ||
411 | } | ||
412 | |||
413 | .header .age { | ||
414 | float: left; | ||
415 | color: #000; | ||
416 | font-weight: bold; | ||
417 | width: 10em; | ||
418 | } | ||
419 | |||
420 | .title_text { | ||
421 | width: 94%; | ||
422 | background: #eaf2f5; | ||
423 | border: 1px solid #bedce7; | ||
424 | padding: 5px; | ||
425 | margin: 0 auto 0 auto; | ||
426 | } | ||
427 | |||
428 | .log_body { | ||
429 | width: 94%; | ||
430 | background: #eaf2f5; | ||
431 | border: 1px solid #bedce7; | ||
432 | border-top: 0; | ||
433 | padding: 5px; | ||
434 | margin: 0 auto 15px auto; | ||
435 | } | ||
436 | |||
437 | .page_body { | ||
438 | line-height: 1.4em; | ||
439 | width: 94%; | ||
440 | background: #f8f8f8; | ||
441 | border: 1px solid #d8d8d8; | ||
442 | padding: 5px; | ||
443 | margin: 15px auto 15px auto; | ||
444 | } | ||
445 | |||
446 | .diff_tree { | ||
447 | width: 95%; | ||
448 | background: #f0f0f0; | ||
449 | border: 1px solid #d8d8d8; | ||
450 | padding: 5px; | ||
451 | margin: 0 auto 15px auto; | ||
452 | } | ||
453 | |||
454 | .page_body > .list_head { | ||
455 | width: 98.5%; | ||
456 | } | ||
457 | |||
458 | .page_body > .diff_tree { | ||
459 | width: 99.5%; | ||
460 | } | ||
461 | |||
462 | .patch > .header { | ||
463 | width: 99%; | ||
464 | } | ||
465 | |||
466 | .author .avatar, | ||
467 | .author_date .avatar { | ||
468 | position: relative; | ||
469 | top: 3px; | ||
470 | } | ||
471 | |||
472 | .object_header .avatar { | ||
473 | border: 1px solid #D8D8D8; | ||
474 | float: right; | ||
475 | } | ||
476 | |||
477 | .object_header td, | ||
478 | .object_header th { | ||
479 | vertical-align: top; | ||
480 | } | ||
481 | |||
482 | /* Refs | ||
483 | ---------------------------------------------------------------------------- */ | ||
484 | |||
485 | span.refs span { | ||
486 | color: #707070; | ||
487 | display: inline-block; | ||
488 | margin: 0; | ||
489 | background-color: #eee; | ||
490 | border: 1px solid #ccc; | ||
491 | border-radius: 3px; | ||
492 | height: 18px; | ||
493 | padding: 0 6px; | ||
494 | text-overflow: ellipsis; | ||
495 | } | ||
496 | |||
497 | span.refs span.ref { | ||
498 | color: #707070; | ||
499 | display: inline-block; | ||
500 | margin: 0; | ||
501 | background-color: #c4c4ff; | ||
502 | border: 1px solid #7878ff; | ||
503 | border-radius: 3px; | ||
504 | height: 18px; | ||
505 | padding: 0 6px; | ||
506 | text-overflow: ellipsis; | ||
507 | background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIKFSUnpolg7AAAAHJQTFRFAAAAVVWqZmbMVVXVYGDgbW3td3fuc3PzdHT0cHD1d3f6dHT6dnb7dHT7dnb8dnb8dnb9d3f9dnb+eHj+d3f+eHj+d3f+d3f+d3f+eHj+d3f+eHj+d3f+eHj+d3f+d3f+eHj+d3f+d3f+d3f+eHj/////V9oQhQAAACR0Uk5TAAIEBQcNDhMVGCotNTZAT217i5CgobvExtjZ4eLr7vP09ff7uqQ6cgAAAAFiS0dEJcMByQ8AAABUSURBVBjTpc43AoAwDENRh95bgNBM1f3PyOpslD++RSJ61YgH5M2IbIkn4GocSR1MZVBL4t2n4FgkbaxI8Sqph041WknZCWAIrcmEUbpf3lNe0N9u59YFYHnZ78gAAAAASUVORK5CYII=); | ||
508 | background-repeat: no-repeat; | ||
509 | padding-left: 18px; | ||
510 | } | ||
511 | |||
512 | span.refs span.tag { | ||
513 | color: #707070; | ||
514 | display: inline-block; | ||
515 | margin: 0; | ||
516 | background-color: #ffffab; | ||
517 | border: 1px solid #d9d93b; | ||
518 | border-radius: 3px; | ||
519 | height: 18px; | ||
520 | padding: 0 6px; | ||
521 | text-overflow: ellipsis; | ||
522 | background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIKFSUZZ+h9RwAAAGZQTFRFAAAAtrYkwMBAwMBAx8c4yso11NQ71NQ51dU52Ng71tY519c719c719c62Ng719c719c62Ng72dk62Ng62Ng72Ng72dk62Ng72Ng62dk62dk72dk62Ng62dk72Ng72Ng72dk7////ou/AnQAAACB0Uk5TAAYHCxESLjRCWWlqa4uNkpissbrO19jc3ufs8vf6/f7atAU2AAAAAWJLR0QhxGwNFgAAAF1JREFUGFeNy0cOgCAABVGw94rY5d//lC7omhhn+ZIh5Gf1xPk0Zi5dAABROIQjSU/fsAXhDkCUljAv8jW2wlQpaixpo4Nj+dtatVpjkSJjLNaizRVpvhBCu/4h391jzw1lU12Z7wAAAABJRU5ErkJggg==); | ||
523 | background-repeat: no-repeat; | ||
524 | padding-left: 18px; | ||
525 | } | ||
526 | |||
527 | span.refs span.head { | ||
528 | color: #707070; | ||
529 | display: inline-block; | ||
530 | margin: 0; | ||
531 | background-color: #c4ffc4; | ||
532 | border: 1px solid #78ff78; | ||
533 | border-radius: 3px; | ||
534 | height: 18px; | ||
535 | padding: 0 6px; | ||
536 | text-overflow: ellipsis; | ||
537 | background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIKFSYDsafX/gAAAUpJREFUOMvVkjFLA0EQhd/s7l06MSCihbV/wC5/QBDEIFYWprRIIQQJFqKFQi4kUbBQsFSwtrUQLQULUTBFLCzVIgimCXe7z0q5yIWcqfRVwzDzMTNvgL8mSUqWw3JOtFQJdsIwLDYyjdYgkEmkazl2oVtQWk36nn8AYBYASmFpxmizGtnoqO7Vb+M9KglEkASdpWU872nvVCiPRpuTnz2JIHGyqX3d0kZfR1G0Ht+g/do+FIhOBbLW3n/FNb/28D0puZ+dyL44ur1UoH5yzt2JyIj6UGdDgwrPhYzSagNEszJaeU/lWlylbmnaeGZZICsAppxzi6nt73HK85oQCMknOuarpno+FIjglVjZDXaCS2yDv3rIHlCb88FY0BlUl3hs7ektkhckb5DFWhoz+n12zr7ZPLpYUqLm0oBMn8NUzLhpAgjpWMS/1CcSJ3ykD7Rk1QAAAABJRU5ErkJggg==); | ||
538 | background-repeat: no-repeat; | ||
539 | padding-left: 18px; | ||
540 | } | ||
541 | |||
542 | span.refs a { | ||
543 | color: #4e4e4e; | ||
544 | font: 11px "Bitstream Vera Sans Mono", "DejaVu Sans Mono", Monaco, monospace; | ||
545 | line-height: 18px; | ||
546 | } | ||
547 | |||
548 | /* Diffs | ||
549 | ---------------------------------------------------------------------------- */ | ||
550 | |||
551 | div.diff.to_file a.path, | ||
552 | div.diff.to_file { | ||
553 | color: #007000; | ||
554 | } | ||
555 | |||
556 | div.diff.from_file a.path, | ||
557 | div.diff.from_file { | ||
558 | color: #aa0000; | ||
559 | } | ||
560 | |||
561 | .patch .header { | ||
562 | margin: 0; | ||
563 | } | ||
564 | |||
565 | .patchset { | ||
566 | overflow-x: auto; | ||
567 | overflow-y: hidden; | ||
568 | } | ||
569 | |||
570 | .chunk_header { | ||
571 | background: #eaf2f5; | ||
572 | color: #999; | ||
573 | } | ||
574 | |||
575 | .rem { | ||
576 | background: #ffdddd; | ||
577 | } | ||
578 | .rem .marked { | ||
579 | background: #ffaaaa; | ||
580 | } | ||
581 | .add { | ||
582 | background: #ddffdd; | ||
583 | } | ||
584 | .add .marked { | ||
585 | background: #7dff7d; | ||
586 | } | ||
587 | |||
588 | .extended_header { | ||
589 | width: 99.5%; | ||
590 | } | ||
591 | |||
592 | div.chunk_block { | ||
593 | overflow: hidden; | ||
594 | } | ||
595 | |||
596 | div.chunk_block div.old { | ||
597 | float: left; | ||
598 | width: 50%; | ||
599 | overflow: hidden; | ||
600 | border-right: 5px solid #EAF2F5; | ||
601 | } | ||
602 | |||
603 | div.chunk_block.rem, | ||
604 | div.chunk_block.add { | ||
605 | background: transparent; | ||
606 | } | ||
607 | |||
608 | div.chunk_block div.old .add, | ||
609 | div.chunk_block div.old .rem { | ||
610 | padding-right: 3px; | ||
611 | } | ||
612 | |||
613 | div.chunk_block div.new .add, | ||
614 | div.chunk_block div.new .rem { | ||
615 | padding-left: 3px; | ||
616 | } | ||
617 | |||
618 | div.chunk_block div.new { | ||
619 | margin-left: 50%; | ||
620 | width: 50%; | ||
621 | border-left: 5px solid #EAF2F5; | ||
622 | } | ||
623 | |||
624 | /* Category | ||
625 | ---------------------------------------------------------------------------- */ | ||
626 | |||
627 | td.category { | ||
628 | background: #E6F1F6; /* old browsers */ | ||
629 | background: -moz-linear-gradient(top, #C8D8E7 0%, #E6F1F3 100%); /* firefox */ | ||
630 | background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#C8D8E7), color-stop(100%,#E6F1F3)); /* webkit */ | ||
631 | filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C8D8E7', endColorstr='#E6F1F3',GradientType=0 ); /* ie */ | ||
632 | background: -o-linear-gradient(top, #C8D8E7 0%, #E6F1F3 100%); | ||
633 | font-weight: bold; | ||
634 | border-bottom: 1px solid #D1D1D1; | ||
635 | border-top: 1px solid #D1D1D1; | ||
636 | } | ||
637 | |||
638 | /* Age | ||
639 | ---------------------------------------------------------------------------- */ | ||
640 | |||
641 | /* noage: "No commits" */ | ||
642 | .project_list td.noage { | ||
643 | color: #cdcdcd; | ||
644 | } | ||
645 | |||
646 | /* age2: 60*60*24*2 <= age */ | ||
647 | .project_list td.age2, .blame td.age2 { | ||
648 | color: #545454; | ||
649 | } | ||
650 | |||
651 | /* age1: 60*60*2 <= age < 60*60*24*2 */ | ||
652 | .project_list td.age1 { | ||
653 | color: #009900; | ||
654 | } | ||
655 | |||
656 | /* age0: age < 60*60*2 */ | ||
657 | .project_list td.age0 { | ||
658 | color: #009900; | ||
659 | font-weight: bold; | ||
660 | } | ||
661 | |||
662 | /* File status | ||
663 | ---------------------------------------------------------------------------- */ | ||
664 | |||
665 | .diff_tree span.file_status.new { | ||
666 | color: #008000; | ||
667 | } | ||
668 | |||
669 | table.diff_tree span.file_status.deleted { | ||
670 | color: #c00000; | ||
671 | } | ||
672 | |||
673 | table.diff_tree span.file_status.moved, | ||
674 | table.diff_tree span.file_status.mode_chnge { | ||
675 | color: #545454; | ||
676 | } | ||
677 | |||
678 | table.diff_tree span.file_status.copied { | ||
679 | color: #70a070; | ||
680 | } | ||
681 | |||
682 | span.cntrl { | ||
683 | border: dashed #aaaaaa; | ||
684 | border-width: 1px; | ||
685 | padding: 0px 2px 0px 2px; | ||
686 | margin: 0px 2px 0px 2px; | ||
687 | } | ||
688 | |||
689 | span.match { | ||
690 | background: #aaffaa; | ||
691 | color: #000; | ||
692 | } | ||
693 | |||
694 | td.error { | ||
695 | color: red; | ||
696 | background: yellow; | ||
697 | } | ||
698 | |||
699 | /* blob view */ | ||
700 | |||
701 | td.pre, div.pre, div.diff { | ||
702 | white-space: pre-wrap; | ||
703 | } | ||
704 | |||
705 | /* JavaScript-based timezone manipulation */ | ||
706 | |||
707 | .popup { /* timezone selection UI */ | ||
708 | position: absolute; | ||
709 | /* "top: 0; right: 0;" would be better, if not for bugs in browsers */ | ||
710 | top: 0; left: 0; | ||
711 | border: 1px solid #d8d8d8; | ||
712 | padding: 2px; | ||
713 | background-color: #f0f0f0; | ||
714 | font-style: normal; | ||
715 | color: #545454; | ||
716 | cursor: auto; | ||
717 | } | ||
718 | |||
719 | .close-button { /* close timezone selection UI without selecting */ | ||
720 | /* float doesn't work within absolutely positioned container, | ||
721 | * if width of container is not set explicitly */ | ||
722 | /* float: right; */ | ||
723 | position: absolute; | ||
724 | top: 0px; right: 0px; | ||
725 | border: 1px solid #ffaaaa; | ||
726 | margin: 1px 1px 1px 1px; | ||
727 | padding-bottom: 2px; | ||
728 | width: 12px; | ||
729 | height: 10px; | ||
730 | font-size: 9px; | ||
731 | font-weight: bold; | ||
732 | text-align: center; | ||
733 | background-color: #ffdddd; | ||
734 | cursor: pointer; | ||
735 | } | ||
736 | |||
737 | /* Style definition generated by highlight 2.4.5, http://www.andre-simon.de/ */ | ||
738 | |||
739 | /* Highlighting theme definition: */ | ||
740 | |||
741 | .num { color:#6ecf36; } | ||
742 | .esc { color:#ff00ff; } | ||
743 | .str { color:#ff00d3; background-color: #edc9ec } | ||
744 | .dstr { color:#818100; } | ||
745 | .slc { color:#838183; font-style:italic; } | ||
746 | .com { color:#838183; font-style:italic; } | ||
747 | .dir { color:#008200; } | ||
748 | .sym { color:#000000; } | ||
749 | .line { color:#555555; } | ||
750 | .kwa { color:#666666; font-weight:bold; } | ||
751 | .kwb { color:#6b3099; } | ||
752 | .kwc { color:#d4663d; } | ||
753 | .kwd { color:#2928ff; } | ||
754 | |||
755 | /**** Styles supplémentaires *****/ | ||
756 | |||
757 | .readme div.toc { | ||
758 | float: right; | ||
759 | border: 1px solid black; | ||
760 | background-color: white; | ||
761 | } | ||
762 | .readme div.toc span.toctitle { | ||
763 | display: inline-block; | ||
764 | width: 100%; | ||
765 | text-align: center; | ||
766 | font-weight: bold; | ||
767 | } | ||
768 | |||
769 | .readme table { | ||
770 | background-color: white; | ||
771 | } | ||
772 | |||
773 | .readme table thead tr { | ||
774 | background-color: #ccc; | ||
775 | } | ||
776 | |||
777 | .readme table tbody tr:nth-child(2n) { | ||
778 | background-color: #f8f8f8; | ||
779 | } | ||
780 | |||
781 | .readme table td, .readme table th { | ||
782 | border: 1px solid black; | ||
783 | } | ||
diff --git a/flakes/mypackages/overlays/gitweb/theme/gitweb.js b/flakes/mypackages/overlays/gitweb/theme/gitweb.js new file mode 100644 index 0000000..72f3cfa --- /dev/null +++ b/flakes/mypackages/overlays/gitweb/theme/gitweb.js | |||
@@ -0,0 +1,27 @@ | |||
1 | function include(filename, onload) { | ||
2 | var head = document.getElementsByTagName('head')[0]; | ||
3 | var script = document.createElement('script'); | ||
4 | script.src = filename; | ||
5 | script.type = 'text/javascript'; | ||
6 | script.onload = script.onreadystatechange = function() { | ||
7 | if (script.readyState) { | ||
8 | if (script.readyState === 'complete' || script.readyState === 'loaded') { | ||
9 | script.onreadystatechange = null; | ||
10 | onload(); | ||
11 | } | ||
12 | } | ||
13 | else { | ||
14 | onload(); | ||
15 | } | ||
16 | } | ||
17 | head.appendChild(script); | ||
18 | } | ||
19 | |||
20 | include('static/gitweb.js', function() {}); | ||
21 | include('//code.jquery.com/jquery-3.1.0.min.js', function() { | ||
22 | $("div.title").each(function(index, element) { | ||
23 | if ($(element).text() === "readme" || $(element).text() === "Â ") { | ||
24 | $(element).hide(); | ||
25 | } | ||
26 | }); | ||
27 | }); | ||
diff --git a/flakes/mypackages/overlays/goaccess/default.nix b/flakes/mypackages/overlays/goaccess/default.nix new file mode 100644 index 0000000..6b9758b --- /dev/null +++ b/flakes/mypackages/overlays/goaccess/default.nix | |||
@@ -0,0 +1,13 @@ | |||
1 | self: super: { | ||
2 | goaccess = super.goaccess.overrideAttrs(old: rec { | ||
3 | name = "goaccess-${version}"; | ||
4 | version = "1.4"; | ||
5 | src = self.fetchurl { | ||
6 | url = "https://tar.goaccess.io/${name}.tar.gz"; | ||
7 | sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8"; | ||
8 | }; | ||
9 | configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; | ||
10 | buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ]; | ||
11 | }); | ||
12 | |||
13 | } | ||
diff --git a/flakes/mypackages/overlays/kanboard/default.nix b/flakes/mypackages/overlays/kanboard/default.nix new file mode 100644 index 0000000..2a0d41b --- /dev/null +++ b/flakes/mypackages/overlays/kanboard/default.nix | |||
@@ -0,0 +1,19 @@ | |||
1 | self: super: { | ||
2 | kanboard = self.stdenv.mkDerivation rec { | ||
3 | name = "kanboard-${version}"; | ||
4 | version = "1.2.21"; | ||
5 | src = self.fetchFromGitHub { | ||
6 | owner = "kanboard"; | ||
7 | repo = "kanboard"; | ||
8 | rev = "ee18479b7e019e6415d7b095da629932ee1b3fd5"; | ||
9 | sha256 = "00pnpq5qgxpb2f9la58ycvx5kx3pmcvpssh6lwgpcdk04yciw8nh"; | ||
10 | }; | ||
11 | |||
12 | dontBuild = true; | ||
13 | |||
14 | installPhase = '' | ||
15 | cp -a . $out | ||
16 | mv $out/data $out/dataold | ||
17 | ''; | ||
18 | }; | ||
19 | } | ||
diff --git a/flakes/mypackages/overlays/morph/default.nix b/flakes/mypackages/overlays/morph/default.nix new file mode 100644 index 0000000..b316d70 --- /dev/null +++ b/flakes/mypackages/overlays/morph/default.nix | |||
@@ -0,0 +1,27 @@ | |||
1 | self: super: { | ||
2 | morph = super.morph.overrideAttrs(old: rec { | ||
3 | version = "1.6.0-30-g5b85237"; | ||
4 | src = self.fetchFromGitHub { | ||
5 | owner = "dbcdk"; | ||
6 | repo = "morph"; | ||
7 | rev = "5b852370d8054a895b5ba79b5ef017c3afbb3a3c"; | ||
8 | sha256 = "166dwibbpb90bdy8dvhlinh6gc509f8pq8wn345h01pilf7fc8fh"; | ||
9 | }; | ||
10 | |||
11 | ldflags = [ | ||
12 | "-X main.version=${version}" | ||
13 | ]; | ||
14 | preBuild = '' | ||
15 | ldflags+=" -X main.assetRoot=$lib" | ||
16 | ''; | ||
17 | postInstall = '' | ||
18 | mkdir -p $lib | ||
19 | cp -v ./data/*.nix $lib | ||
20 | ''; | ||
21 | |||
22 | outputs = [ "out" "lib" ]; | ||
23 | vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9"; | ||
24 | |||
25 | patches = (old.patches or []) ++ [ ./dry-run.patch ]; | ||
26 | }); | ||
27 | } | ||
diff --git a/flakes/mypackages/overlays/morph/dry-run.patch b/flakes/mypackages/overlays/morph/dry-run.patch new file mode 100644 index 0000000..2ff099e --- /dev/null +++ b/flakes/mypackages/overlays/morph/dry-run.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | diff --git a/morph.go b/morph.go | ||
2 | index a88414b..e5894df 100644 | ||
3 | --- a/morph.go | ||
4 | +++ b/morph.go | ||
5 | @@ -542,6 +542,7 @@ func getNixContext() *nix.NixContext { | ||
6 | return &nix.NixContext{ | ||
7 | EvalMachines: filepath.Join(assetRoot, assets.Friendly, "eval-machines.nix"), | ||
8 | ShowTrace: showTrace, | ||
9 | + DryRun: *dryRun, | ||
10 | KeepGCRoot: *keepGCRoot, | ||
11 | AllowBuildShell: *allowBuildShell, | ||
12 | } | ||
13 | @@ -574,8 +575,10 @@ func buildHosts(hosts []nix.Host) (resultPath string, err error) { | ||
14 | return | ||
15 | } | ||
16 | |||
17 | - fmt.Fprintln(os.Stderr, "nix result path: ") | ||
18 | - fmt.Println(resultPath) | ||
19 | + if resultPath != "" { | ||
20 | + fmt.Fprintln(os.Stderr, "nix result path: ") | ||
21 | + fmt.Println(resultPath) | ||
22 | + } | ||
23 | return | ||
24 | } | ||
25 | |||
26 | diff --git a/nix/nix.go b/nix/nix.go | ||
27 | index 6a9cfd5..0f7884b 100644 | ||
28 | --- a/nix/nix.go | ||
29 | +++ b/nix/nix.go | ||
30 | @@ -49,6 +49,7 @@ type Deployment struct { | ||
31 | type NixContext struct { | ||
32 | EvalMachines string | ||
33 | ShowTrace bool | ||
34 | + DryRun bool | ||
35 | KeepGCRoot bool | ||
36 | AllowBuildShell bool | ||
37 | } | ||
38 | @@ -269,6 +270,10 @@ func (ctx *NixContext) BuildMachines(deploymentPath string, hosts []Host, nixArg | ||
39 | args = append(args, "--show-trace") | ||
40 | } | ||
41 | |||
42 | + if ctx.DryRun { | ||
43 | + args = append(args, "--dry-run") | ||
44 | + } | ||
45 | + | ||
46 | if nixBuildTargets != "" { | ||
47 | args = append(args, | ||
48 | "--arg", "buildTargets", nixBuildTargets) | ||
49 | @@ -308,6 +313,10 @@ func (ctx *NixContext) BuildMachines(deploymentPath string, hosts []Host, nixArg | ||
50 | return resultPath, errors.New(errorMessage) | ||
51 | } | ||
52 | |||
53 | + if ctx.DryRun { | ||
54 | + return "", err | ||
55 | + } | ||
56 | + | ||
57 | resultPath, err = os.Readlink(resultLinkPath) | ||
58 | if err != nil { | ||
59 | return "", err | ||
diff --git a/flakes/mypackages/overlays/morph/verbose_nix.patch b/flakes/mypackages/overlays/morph/verbose_nix.patch new file mode 100644 index 0000000..389a79c --- /dev/null +++ b/flakes/mypackages/overlays/morph/verbose_nix.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | diff --git a/nix/nix.go b/nix/nix.go | ||
2 | index bb63870..7fe04aa 100644 | ||
3 | --- a/nix/nix.go | ||
4 | +++ b/nix/nix.go | ||
5 | @@ -347,6 +347,7 @@ func Push(ctx *ssh.SSHContext, host Host, paths ...string) (err error) { | ||
6 | options := mkOptions(host) | ||
7 | for _, path := range paths { | ||
8 | args := []string{ | ||
9 | + "-v", | ||
10 | "copy", | ||
11 | path, | ||
12 | "--to", "ssh://" + userArg + host.TargetHost + keyArg, | ||
diff --git a/flakes/mypackages/overlays/php-packages/mysqli_patch.patch b/flakes/mypackages/overlays/php-packages/mysqli_patch.patch new file mode 100644 index 0000000..a8f03e3 --- /dev/null +++ b/flakes/mypackages/overlays/php-packages/mysqli_patch.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- a/ext/mysqli/mysqli_nonapi.c | ||
2 | +++ b/ext/mysqli/mysqli_nonapi.c | ||
3 | @@ -263,7 +263,7 @@ void mysqli_common_connect(INTERNAL_FUNC | ||
4 | php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); | ||
5 | |||
6 | #if !defined(MYSQLI_USE_MYSQLND) | ||
7 | - mysql->mysql->reconnect = MyG(reconnect); | ||
8 | + mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (my_bool *)&MyG(reconnect)); | ||
9 | #endif | ||
10 | |||
11 | mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&MyG(allow_local_infile)); | ||
diff --git a/flakes/mypackages/overlays/postfix/default.nix b/flakes/mypackages/overlays/postfix/default.nix new file mode 100644 index 0000000..c77e4cf --- /dev/null +++ b/flakes/mypackages/overlays/postfix/default.nix | |||
@@ -0,0 +1,3 @@ | |||
1 | self: super: { | ||
2 | postfix = super.postfix.override { withMySQL = true; withPgSQL = true; }; | ||
3 | } | ||
diff --git a/flakes/mypackages/overlays/taskwarrior/TW-1778_patch.diff b/flakes/mypackages/overlays/taskwarrior/TW-1778_patch.diff new file mode 100644 index 0000000..6d7e376 --- /dev/null +++ b/flakes/mypackages/overlays/taskwarrior/TW-1778_patch.diff | |||
@@ -0,0 +1,12 @@ | |||
1 | --- a/src/text.cpp 2016-02-24 23:18:11.000000000 +0100 | ||
2 | +++ b/src/text.cpp 2020-02-26 18:53:15.869331031 +0100 | ||
3 | @@ -248,7 +248,7 @@ | ||
4 | // Premature EOL. | ||
5 | if (character == '\n') | ||
6 | { | ||
7 | - line = text.substr (offset, line_length); | ||
8 | + line = text.substr (offset, prior_cursor-offset); | ||
9 | offset = cursor; | ||
10 | return true; | ||
11 | } | ||
12 | |||
diff --git a/flakes/mypackages/overlays/taskwarrior/default.nix b/flakes/mypackages/overlays/taskwarrior/default.nix new file mode 100644 index 0000000..9ca52b8 --- /dev/null +++ b/flakes/mypackages/overlays/taskwarrior/default.nix | |||
@@ -0,0 +1,16 @@ | |||
1 | self: super: | ||
2 | { | ||
3 | taskwarrior = super.taskwarrior.overrideAttrs (old: { | ||
4 | patches = old.patches or [] ++ [ | ||
5 | ./TW-1778_patch.diff | ||
6 | ]; | ||
7 | postInstall = ''${old.postInstall} | ||
8 | mkdir -p "$out/share/vim/vimfiles/ftdetect" | ||
9 | mkdir -p "$out/share/vim/vimfiles/syntax" | ||
10 | ln -s "../../../../share/doc/task/scripts/vim/ftdetect/task.vim" "$out/share/vim/vimfiles/ftdetect/" | ||
11 | ln -s "../../../../share/doc/task/scripts/vim/syntax/taskrc.vim" "$out/share/vim/vimfiles/syntax/" | ||
12 | ln -s "../../../../share/doc/task/scripts/vim/syntax/taskdata.vim" "$out/share/vim/vimfiles/syntax/" | ||
13 | ln -s "../../../../share/doc/task/scripts/vim/syntax/taskedit.vim" "$out/share/vim/vimfiles/syntax/" | ||
14 | ''; | ||
15 | }); | ||
16 | } | ||
diff --git a/flakes/mypackages/overlays/ympd/default.nix b/flakes/mypackages/overlays/ympd/default.nix new file mode 100644 index 0000000..648403f --- /dev/null +++ b/flakes/mypackages/overlays/ympd/default.nix | |||
@@ -0,0 +1,14 @@ | |||
1 | self: super: { | ||
2 | ympd = super.ympd.overrideAttrs(old: { | ||
3 | pname = "ympd"; | ||
4 | version = "612f8fc-master"; | ||
5 | src = self.fetchFromGitHub { | ||
6 | owner = "notandy"; | ||
7 | repo = "ympd"; | ||
8 | rev = "612f8fc0b2c47fc89d403e4a044541c6b2b238c8"; | ||
9 | sha256 = "01hnj10zl103mrn82vyd42fvq7w5az3jf1qz18889zv67kn73ll9"; | ||
10 | fetchSubmodules = true; | ||
11 | }; | ||
12 | patches = (old.patches or []) ++ [ ./ympd-password-env.patch ]; | ||
13 | }); | ||
14 | } | ||
diff --git a/flakes/mypackages/overlays/ympd/ympd-password-env.patch b/flakes/mypackages/overlays/ympd/ympd-password-env.patch new file mode 100644 index 0000000..2bbe188 --- /dev/null +++ b/flakes/mypackages/overlays/ympd/ympd-password-env.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | diff --git a/src/ympd.c b/src/ympd.c | ||
2 | index 3aed7e6..b3b6fda 100644 | ||
3 | --- a/src/ympd.c | ||
4 | +++ b/src/ympd.c | ||
5 | @@ -71,6 +71,7 @@ int main(int argc, char **argv) | ||
6 | char *run_as_user = NULL; | ||
7 | char const *error_msg = NULL; | ||
8 | char *webport = "8080"; | ||
9 | + const char *s; | ||
10 | |||
11 | atexit(bye); | ||
12 | #ifdef WITH_DYNAMIC_ASSETS | ||
13 | @@ -92,6 +93,10 @@ int main(int argc, char **argv) | ||
14 | {0, 0, 0, 0 } | ||
15 | }; | ||
16 | |||
17 | + if ((s = getenv("MPD_PASSWORD")) != NULL) { | ||
18 | + mpd.password = strdup(s); | ||
19 | + } | ||
20 | + | ||
21 | while((n = getopt_long(argc, argv, "h:p:w:u:vm:", | ||
22 | long_options, &option_index)) != -1) { | ||
23 | switch (n) { | ||