Skip to content

Commit 41458f7

Browse files
dezgegdezgeg
committedSep 13, 2017
Merge remote-tracking branch 'upstream/master' into staging
2 parents 720e88b + f5e0e94 commit 41458f7

File tree

35 files changed

+1904
-1214
lines changed

35 files changed

+1904
-1214
lines changed
 

Diff for: ‎.github/CODEOWNERS

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ doc/languages-frameworks/python.md @FRidh
2626
# Haskell
2727
pkgs/development/compilers/ghc @peti
2828
pkgs/development/haskell-modules @peti
29-
pkgs/development/haskell-modules/default.nix @Profpatsch @peti
30-
pkgs/development/haskell-modules/generic-builder.nix @Profpatsch @peti
31-
pkgs/development/haskell-modules/hoogle.nix @Profpatsch @peti
29+
pkgs/development/haskell-modules/default.nix @peti
30+
pkgs/development/haskell-modules/generic-builder.nix @peti
31+
pkgs/development/haskell-modules/hoogle.nix @peti
3232

3333
# R
3434
pkgs/applications/science/math/R @peti

Diff for: ‎nixos/modules/module-list.nix

+1
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@
430430
./services/networking/fakeroute.nix
431431
./services/networking/ferm.nix
432432
./services/networking/firefox/sync-server.nix
433+
./services/networking/fireqos.nix
433434
./services/networking/firewall.nix
434435
./services/networking/flannel.nix
435436
./services/networking/flashpolicyd.nix

Diff for: ‎nixos/modules/services/misc/redmine.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ in {
191191
192192
if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
193193
if ! test -e "${cfg.stateDir}/db-created"; then
194-
psql postgres -c "CREATE ROLE redmine WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
194+
psql postgres -c "CREATE ROLE redmine WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'"
195195
${config.services.postgresql.package}/bin/createdb --owner redmine redmine || true
196196
touch "${cfg.stateDir}/db-created"
197197
fi

Diff for: ‎nixos/modules/services/networking/fireqos.nix

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{ config, lib, pkgs, ... }:
2+
3+
with lib;
4+
5+
let
6+
cfg = config.services.fireqos;
7+
fireqosConfig = pkgs.writeText "fireqos.conf" "${cfg.config}";
8+
in {
9+
options.services.fireqos = {
10+
enable = mkOption {
11+
type = types.bool;
12+
default = false;
13+
description = ''
14+
If enabled, FireQOS will be launched with the specified
15+
configuration given in `config`.
16+
'';
17+
};
18+
19+
config = mkOption {
20+
type = types.str;
21+
default = "";
22+
example = ''
23+
interface wlp3s0 world-in input rate 10mbit ethernet
24+
class web commit 50kbit
25+
match tcp ports 80,443
26+
27+
interface wlp3s0 world-out input rate 10mbit ethernet
28+
class web commit 50kbit
29+
match tcp ports 80,443
30+
'';
31+
description = ''
32+
The FireQOS configuration goes here.
33+
'';
34+
};
35+
};
36+
37+
config = mkIf cfg.enable {
38+
systemd.services.fireqos = {
39+
description = "FireQOS";
40+
after = [ "network.target" ];
41+
serviceConfig = {
42+
Type = "oneshot";
43+
RemainAfterExit = true;
44+
ExecStart = "${pkgs.firehol}/bin/fireqos start ${fireqosConfig}";
45+
ExecStop = [
46+
"${pkgs.firehol}/bin/fireqos stop"
47+
"${pkgs.firehol}/bin/fireqos clear_all_qos"
48+
];
49+
};
50+
};
51+
};
52+
}

Diff for: ‎nixos/modules/services/web-apps/mattermost.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ in
185185
'' + lib.optionalString cfg.localDatabaseCreate ''
186186
if ! test -e "${cfg.statePath}/.db-created"; then
187187
${config.services.postgresql.package}/bin/psql postgres -c \
188-
"CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'"
188+
"CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'"
189189
${config.services.postgresql.package}/bin/createdb \
190190
--owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName}
191191
touch ${cfg.statePath}/.db-created

Diff for: ‎pkgs/applications/editors/atom/beta.nix

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
2+
3+
stdenv.mkDerivation rec {
4+
name = "atom-${version}";
5+
version = "1.21.0-beta0";
6+
7+
src = fetchurl {
8+
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
9+
sha256 = "1syxlyb62vp9hmjdiazhmvq8w52b90l8mvf502xkdav4vi3yxzfz";
10+
name = "${name}.deb";
11+
};
12+
13+
nativeBuildInputs = [ makeWrapper ];
14+
15+
buildCommand = ''
16+
mkdir -p $out/usr/
17+
ar p $src data.tar.xz | tar -C $out -xJ ./usr
18+
substituteInPlace $out/usr/share/applications/atom-beta.desktop \
19+
--replace /usr/share/atom-beta $out/bin
20+
mv $out/usr/* $out/
21+
rm -r $out/share/lintian
22+
rm -r $out/usr/
23+
sed -i "s/'atom-beta'/'.atom-beta-wrapped'/" $out/bin/atom-beta
24+
wrapProgram $out/bin/atom-beta \
25+
--prefix "PATH" : "${gvfs}/bin"
26+
27+
fixupPhase
28+
29+
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
30+
--set-rpath "${atomEnv.libPath}:$out/share/atom-beta" \
31+
$out/share/atom-beta/atom
32+
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
33+
--set-rpath "${atomEnv.libPath}" \
34+
$out/share/atom-beta/resources/app/apm/bin/node
35+
36+
#rm -f $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git
37+
#ln -s ${pkgs.git}/bin/git $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git
38+
39+
find $out/share/atom-beta -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" {} \;
40+
41+
paxmark m $out/share/atom-beta/atom
42+
paxmark m $out/share/atom-beta/resources/app/apm/bin/node
43+
'';
44+
45+
meta = with stdenv.lib; {
46+
description = "A hackable text editor for the 21st Century";
47+
homepage = https://atom.io/;
48+
license = licenses.mit;
49+
maintainers = [ maintainers.offline maintainers.nequissimus ];
50+
platforms = [ "x86_64-linux" ];
51+
};
52+
}

Diff for: ‎pkgs/applications/editors/emacs-modes/elpa-generated.nix

+37-11
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,19 @@
199199
license = lib.licenses.free;
200200
};
201201
}) {};
202+
auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
203+
pname = "auto-correct";
204+
version = "1.1";
205+
src = fetchurl {
206+
url = "https://elpa.gnu.org/packages/auto-correct-1.1.el";
207+
sha256 = "19i84dqqnxc5v36lsmj9zj8wbmg267c50jvq2i9bb66i9pzd0s53";
208+
};
209+
packageRequires = [];
210+
meta = {
211+
homepage = "https://elpa.gnu.org/packages/auto-correct.html";
212+
license = lib.licenses.free;
213+
};
214+
}) {};
202215
auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
203216
pname = "auto-overlays";
204217
version = "0.10.9";
@@ -266,6 +279,19 @@
266279
license = lib.licenses.free;
267280
};
268281
}) {};
282+
captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
283+
pname = "captain";
284+
version = "1.0.1";
285+
src = fetchurl {
286+
url = "https://elpa.gnu.org/packages/captain-1.0.1.el";
287+
sha256 = "1jqbgzcgq4kxpcsma9ia6w6rjy9sdn51lz2f4rfjjy3qgy4fqjx5";
288+
};
289+
packageRequires = [];
290+
meta = {
291+
homepage = "https://elpa.gnu.org/packages/captain.html";
292+
license = lib.licenses.free;
293+
};
294+
}) {};
269295
chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
270296
elpaBuild {
271297
pname = "chess";
@@ -919,10 +945,10 @@
919945
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
920946
elpaBuild {
921947
pname = "gnorb";
922-
version = "1.2.3";
948+
version = "1.2.4";
923949
src = fetchurl {
924-
url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar";
925-
sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7";
950+
url = "https://elpa.gnu.org/packages/gnorb-1.2.4.tar";
951+
sha256 = "013sdzpix9mc7d99mmpqv0r80zr50l1c7jld09p6767f86j6vahi";
926952
};
927953
packageRequires = [ cl-lib ];
928954
meta = {
@@ -1530,10 +1556,10 @@
15301556
}) {};
15311557
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
15321558
pname = "org";
1533-
version = "20170904";
1559+
version = "20170911";
15341560
src = fetchurl {
1535-
url = "https://elpa.gnu.org/packages/org-20170904.tar";
1536-
sha256 = "1nbdphd102lwkj0sg1lywydkc547fzc8p1n8y507xwvxdjazdnyb";
1561+
url = "https://elpa.gnu.org/packages/org-20170911.tar";
1562+
sha256 = "0w91f5lx64klwbpym0b73z919dagzakykkmx6g13iscsh7fflx06";
15371563
};
15381564
packageRequires = [];
15391565
meta = {
@@ -1893,14 +1919,14 @@
18931919
license = lib.licenses.free;
18941920
};
18951921
}) {};
1896-
sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
1922+
sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
18971923
pname = "sokoban";
1898-
version = "1.4.5";
1924+
version = "1.4.6";
18991925
src = fetchurl {
1900-
url = "https://elpa.gnu.org/packages/sokoban-1.4.5.tar";
1901-
sha256 = "1hh35g1p2f5al88jsbgiz35bvhn7iw5sf9zhsjimiig5isv7khip";
1926+
url = "https://elpa.gnu.org/packages/sokoban-1.4.6.tar";
1927+
sha256 = "112cl1l36zn5q9cw81rxi96zflf7ddp3by1h7fsz48yjfidpfbzn";
19021928
};
1903-
packageRequires = [];
1929+
packageRequires = [ emacs ];
19041930
meta = {
19051931
homepage = "https://elpa.gnu.org/packages/sokoban.html";
19061932
license = lib.licenses.free;

0 commit comments

Comments
 (0)
Please sign in to comment.