ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 18:37:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2017-09-13 22:59:04 +03:00
commit 41458f74a4
35 changed files with 1904 additions and 1214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/CODEOWNERS vendored
View File

@ -26,9 +26,9 @@ doc/languages-frameworks/python.md @FRidh
# Haskell # Haskell
pkgs/development/compilers/ghc @peti pkgs/development/compilers/ghc @peti
pkgs/development/haskell-modules @peti pkgs/development/haskell-modules @peti
pkgs/development/haskell-modules/default.nix @Profpatsch @peti pkgs/development/haskell-modules/default.nix @peti
pkgs/development/haskell-modules/generic-builder.nix @Profpatsch @peti pkgs/development/haskell-modules/generic-builder.nix @peti
pkgs/development/haskell-modules/hoogle.nix @Profpatsch @peti pkgs/development/haskell-modules/hoogle.nix @peti
# R # R
pkgs/applications/science/math/R @peti pkgs/applications/science/math/R @peti

1
nixos/modules/module-list.nix
View File

@ -430,6 +430,7 @@
./services/networking/fakeroute.nix ./services/networking/fakeroute.nix
./services/networking/ferm.nix ./services/networking/ferm.nix
./services/networking/firefox/sync-server.nix ./services/networking/firefox/sync-server.nix
./services/networking/fireqos.nix
./services/networking/firewall.nix ./services/networking/firewall.nix
./services/networking/flannel.nix ./services/networking/flannel.nix
./services/networking/flashpolicyd.nix ./services/networking/flashpolicyd.nix

2
nixos/modules/services/misc/redmine.nix
View File

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

52
nixos/modules/services/networking/fireqos.nix Normal file
View File

@ -0,0 +1,52 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.fireqos;
fireqosConfig = pkgs.writeText "fireqos.conf" "${cfg.config}";
in {
options.services.fireqos = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
If enabled, FireQOS will be launched with the specified
configuration given in `config`.
'';
};
config = mkOption {
type = types.str;
default = "";
example = ''
interface wlp3s0 world-in input rate 10mbit ethernet
class web commit 50kbit
match tcp ports 80,443
interface wlp3s0 world-out input rate 10mbit ethernet
class web commit 50kbit
match tcp ports 80,443
'';
description = ''
The FireQOS configuration goes here.
'';
};
};
config = mkIf cfg.enable {
systemd.services.fireqos = {
description = "FireQOS";
after = [ "network.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${pkgs.firehol}/bin/fireqos start ${fireqosConfig}";
ExecStop = [
"${pkgs.firehol}/bin/fireqos stop"
"${pkgs.firehol}/bin/fireqos clear_all_qos"
];
};
};
};
}

2
nixos/modules/services/web-apps/mattermost.nix
View File

@ -185,7 +185,7 @@ in
'' + lib.optionalString cfg.localDatabaseCreate '' '' + lib.optionalString cfg.localDatabaseCreate ''
if ! test -e "${cfg.statePath}/.db-created"; then if ! test -e "${cfg.statePath}/.db-created"; then
${config.services.postgresql.package}/bin/psql postgres -c \ ${config.services.postgresql.package}/bin/psql postgres -c \
"CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'" "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'"
${config.services.postgresql.package}/bin/createdb \ ${config.services.postgresql.package}/bin/createdb \
--owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName} --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName}
touch ${cfg.statePath}/.db-created touch ${cfg.statePath}/.db-created

52
pkgs/applications/editors/atom/beta.nix Normal file
View File

@ -0,0 +1,52 @@
{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
stdenv.mkDerivation rec {
name = "atom-${version}";
version = "1.21.0-beta0";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "1syxlyb62vp9hmjdiazhmvq8w52b90l8mvf502xkdav4vi3yxzfz";
name = "${name}.deb";
};
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/usr/
ar p $src data.tar.xz | tar -C $out -xJ ./usr
substituteInPlace $out/usr/share/applications/atom-beta.desktop \
--replace /usr/share/atom-beta $out/bin
mv $out/usr/* $out/
rm -r $out/share/lintian
rm -r $out/usr/
sed -i "s/'atom-beta'/'.atom-beta-wrapped'/" $out/bin/atom-beta
wrapProgram $out/bin/atom-beta \
--prefix "PATH" : "${gvfs}/bin"
fixupPhase
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/share/atom-beta" \
$out/share/atom-beta/atom
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}" \
$out/share/atom-beta/resources/app/apm/bin/node
#rm -f $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git
#ln -s ${pkgs.git}/bin/git $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git
find $out/share/atom-beta -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" {} \;
paxmark m $out/share/atom-beta/atom
paxmark m $out/share/atom-beta/resources/app/apm/bin/node
'';
meta = with stdenv.lib; {
description = "A hackable text editor for the 21st Century";
homepage = https://atom.io/;
license = licenses.mit;
maintainers = [ maintainers.offline maintainers.nequissimus ];
platforms = [ "x86_64-linux" ];
};
}

48
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -199,6 +199,19 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auto-correct";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auto-correct-1.1.el";
sha256 = "19i84dqqnxc5v36lsmj9zj8wbmg267c50jvq2i9bb66i9pzd0s53";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/auto-correct.html";
license = lib.licenses.free;
};
}) {};
auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auto-overlays"; pname = "auto-overlays";
version = "0.10.9"; version = "0.10.9";
@ -266,6 +279,19 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "captain";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/captain-1.0.1.el";
sha256 = "1jqbgzcgq4kxpcsma9ia6w6rjy9sdn51lz2f4rfjjy3qgy4fqjx5";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/captain.html";
license = lib.licenses.free;
};
}) {};
chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "chess"; pname = "chess";
@ -919,10 +945,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "gnorb"; pname = "gnorb";
version = "1.2.3"; version = "1.2.4";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar"; url = "https://elpa.gnu.org/packages/gnorb-1.2.4.tar";
sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7"; sha256 = "013sdzpix9mc7d99mmpqv0r80zr50l1c7jld09p6767f86j6vahi";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {
@ -1530,10 +1556,10 @@
}) {}; }) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20170904"; version = "20170911";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20170904.tar"; url = "https://elpa.gnu.org/packages/org-20170911.tar";
sha256 = "1nbdphd102lwkj0sg1lywydkc547fzc8p1n8y507xwvxdjazdnyb"; sha256 = "0w91f5lx64klwbpym0b73z919dagzakykkmx6g13iscsh7fflx06";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -1893,14 +1919,14 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "sokoban"; pname = "sokoban";
version = "1.4.5"; version = "1.4.6";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/sokoban-1.4.5.tar"; url = "https://elpa.gnu.org/packages/sokoban-1.4.6.tar";
sha256 = "1hh35g1p2f5al88jsbgiz35bvhn7iw5sf9zhsjimiig5isv7khip"; sha256 = "112cl1l36zn5q9cw81rxi96zflf7ddp3by1h7fsz48yjfidpfbzn";
}; };
packageRequires = []; packageRequires = [ emacs ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/sokoban.html"; homepage = "https://elpa.gnu.org/packages/sokoban.html";
license = lib.licenses.free; license = lib.licenses.free;

1499
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

540
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

File diff suppressed because it is too large Load Diff

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View File

@ -1,10 +1,10 @@
{ callPackage }: { { callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20170904"; version = "20170911";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-20170904.tar"; url = "http://orgmode.org/elpa/org-20170911.tar";
sha256 = "1d0w3mmxdsfiwvpbc2ip21jxqlag0gk05214h86w52y9ymj0jbll"; sha256 = "16d69g1qnfcj7d2q9ni5dz5wh9pid9mzhwyfg4z93s9xizzlnw64";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -14,10 +14,10 @@
}) {}; }) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib"; pname = "org-plus-contrib";
version = "20170904"; version = "20170911";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20170904.tar"; url = "http://orgmode.org/elpa/org-plus-contrib-20170911.tar";
sha256 = "1iz0xk5s5d6gpfxb3k2fz3xbrn5rhxnvkq69c5dbrfdk67rm7q4k"; sha256 = "0bgrsccar4v9viq99w2h4rjavql14zgdwkwaa1bprga3af78jr82";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

11
pkgs/applications/misc/buku/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, python3, fetchFromGitHub }: { stdenv, python3, fetchFromGitHub }:
with python3.pkgs; buildPythonApplication rec { with python3.pkgs; buildPythonApplication rec {
version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck version = "3.3.1";
name = "buku-${version}"; name = "buku-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jarun"; owner = "jarun";
repo = "buku"; repo = "buku";
rev = "v${version}"; rev = "v${version}";
sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax"; sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -16,6 +16,8 @@ with python3.pkgs; buildPythonApplication rec {
pytest-catchlog pytest-catchlog
hypothesis hypothesis
pytest pytest
pylint
flake8
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -29,11 +31,6 @@ with python3.pkgs; buildPythonApplication rec {
# Fixes two tests for wrong encoding # Fixes two tests for wrong encoding
export PYTHONIOENCODING=utf-8 export PYTHONIOENCODING=utf-8
### Remove this for 3.1 ###
# See https://github.com/jarun/Buku/pull/167 (merged)
substituteInPlace setup.py \
--replace "hypothesis==3.7.0" "hypothesis>=3.7.0"
# Disables a test which requires internet # Disables a test which requires internet
substituteInPlace tests/test_bukuDb.py \ substituteInPlace tests/test_bukuDb.py \
--replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')"

12
pkgs/applications/misc/ctodo/default.nix
View File

@ -1,17 +1,15 @@
{ stdenv, cmake, fetchurl, ncurses }: { stdenv, cmake, fetchurl, ncurses, readline }:
let stdenv.mkDerivation rec {
version = "1.2";
in
stdenv.mkDerivation {
name = "ctodo-${version}"; name = "ctodo-${version}";
version = "1.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz"; url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz";
sha256 = "0kjd84q8aw238z09yz9n1p732fh08vijaf8bk1xqlx544cgyfcjm"; sha256 = "1k3raigcgpwa0h8zkv5x9rycnn2iqkb9qim4q9ydqy9wbv3m32jb";
}; };
buildInputs = [ stdenv cmake ncurses ]; buildInputs = [ stdenv cmake ncurses readline ];
configurePhase = '' configurePhase = ''
cmake -DCMAKE_INSTALL_PREFIX=$out . cmake -DCMAKE_INSTALL_PREFIX=$out .

4
pkgs/applications/misc/mdp/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ncurses }: { stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.9"; version = "1.0.10";
name = "mdp-${version}"; name = "mdp-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "visit1985"; owner = "visit1985";
repo = "mdp"; repo = "mdp";
rev = version; rev = version;
sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd"; sha256 = "1swp1hqryai84c8dpzsvjpgg5rz2vnn2vrp0dhwy8r0qgpmby2nn";
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

7
pkgs/applications/misc/rtv/default.nix
View File

@ -2,16 +2,19 @@
with pythonPackages; with pythonPackages;
buildPythonApplication rec { buildPythonApplication rec {
version = "1.15.1"; version = "1.18.0";
name = "rtv-${version}"; name = "rtv-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "michael-lazar"; owner = "michael-lazar";
repo = "rtv"; repo = "rtv";
rev = "v${version}"; rev = "v${version}";
sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya"; sha256 = "00d2s29sp68hw8ljjmzn5dc5ly2s3c7qf0azwizgd3b40zlfgzcg";
}; };
# Tests try to access network
doCheck = false;
checkPhase = '' checkPhase = ''
py.test py.test
''; '';

4
pkgs/applications/misc/toot/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pythonPackages }: { stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
version = "0.13.0"; version = "0.15.0";
name = "toot-${version}"; name = "toot-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ihabunek"; owner = "ihabunek";
repo = "toot"; repo = "toot";
rev = "${version}"; rev = "${version}";
sha256 = "0gbsq43qv5qg4avx7czs57k40m8lzh8f1z5yizqqc7r02p2sacnc"; sha256 = "08k913gw0ip2q686z9k63bcn1n5s4w6b7jj6jmmamm427xmibkph";
}; };
checkInputs = with pythonPackages; [ pytest ]; checkInputs = with pythonPackages; [ pytest ];

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -94,12 +94,12 @@ let
flash = stdenv.mkDerivation rec { flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}"; name = "flashplayer-ppapi-${version}";
version = "26.0.0.151"; version = "27.0.0.130";
src = fetchzip { src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "0l15k2ws3256zyvbfx66j8p1liqv4k2m8hhw2jz8nzza7q6il35p"; sha256 = "005sxx3ll18c6idy1db2gb47chd9c5mf83qac0vyvljsrlc7430c";
stripRoot = false; stripRoot = false;
}; };

12
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -73,25 +73,25 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flashplayer-${version}"; name = "flashplayer-${version}";
version = "26.0.0.151"; version = "27.0.0.130";
src = fetchurl { src = fetchurl {
url = url =
if debug then if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_npapi_linux_debug.${arch}.tar.gz" "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_npapi_linux_debug.${arch}.tar.gz"
else else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 = sha256 =
if debug then if debug then
if arch == "x86_64" then if arch == "x86_64" then
"0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8" "1sj06x4kfwxi9cnc8adjkxk6p81acl39l2idnyqb429l2s84d1d9"
else else
"0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d" "0f9vzdn523m408sw76r32zqf7d86l2mhcfsszbfh2bixg8p2cxzz"
else else
if arch == "x86_64" then if arch == "x86_64" then
"1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l" "0qkdabcnqfpbfsbs8ssms9xk2pqvps6fbasvcyvhnywclra25ggc"
else else
"1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp"; "0qkwkc6s4ganja4b2jsz4yff0bziirvbzxg0wyf648hqlb3bw5a6";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -55,19 +55,19 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}"; name = "flashplayer-standalone-${version}";
version = "26.0.0.151"; version = "27.0.0.130";
src = fetchurl { src = fetchurl {
url = url =
if debug then if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz" "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux_debug.x86_64.tar.gz"
else else
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz";
sha256 = sha256 =
if debug then if debug then
"0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb" "0gqm90j8czjnzar3ia65msd18kydjhgq5l9iv1difgm8lqji5ii0"
else else
"0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8"; "1agplangzlrp326dhz3xcvi6i325a644ggrh8g0cmgq9nfcpssnb";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

79
pkgs/applications/networking/firehol/default.nix Normal file
View File

@ -0,0 +1,79 @@
{ stdenv, lib, fetchFromGitHub, pkgs
, autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils
, kmod, nettools, procps, tcpdump, traceroute, utillinux, whois
# Just install FireQOS without FireHOL
, onlyQOS ? true
}:
stdenv.mkDerivation rec {
name = "firehol-${version}";
version = "3.1.4";
src = fetchFromGitHub {
owner = "firehol";
repo = "firehol";
rev = "v${version}";
sha256 = "121kjq5149r11k58lr9mkqns2k8jbdbjg2k93v8v7axhng6js7s9";
};
patches = [
# configure tries to determine if `ping6` or the newer, combined
# `ping` is installed by using `ping -6` which would fail.
(pkgs.writeText "firehol-ping6.patch"
''
--- a/m4/ax_check_ping_ipv6.m4
+++ b/m4/ax_check_ping_ipv6.m4
@@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6],
AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt],
[
- ac_cv_ping_6_opt=no
- if test -n "$PING"; then
- echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD
- $PING -6 -c 1 ::1 > conftest.out 2>&1
- if test "$?" = 0; then
- ac_cv_ping_6_opt=yes
- fi
- cat conftest.out >&AS_MESSAGE_LOG_FD
- rm -f conftest.out
- fi
+ ac_cv_ping_6_opt=yes
+ #if test -n "$PING"; then
+ # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD
+ # $PING -6 -c 1 ::1 > conftest.out 2>&1
+ # if test "$?" = 0; then
+ # ac_cv_ping_6_opt=yes
+ # fi
+ # cat conftest.out >&AS_MESSAGE_LOG_FD
+ # rm -f conftest.out
+ #fi
])
AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[
'')
];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
curl iprange iproute ipset iptables iputils kmod
nettools procps tcpdump traceroute utillinux whois
];
preConfigure = "./autogen.sh";
configureFlags = [ "--localstatedir=/var"
"--disable-doc" "--disable-man" ] ++
lib.optional onlyQOS [ "--disable-firehol" ];
meta = with stdenv.lib; {
description = "A firewall for humans";
longDescription = ''
FireHOL, an iptables stateful packet filtering firewall for humans!
FireQOS, a TC based bandwidth shaper for humans!
'';
homepage = http://firehol.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ geistesk ];
platforms = platforms.linux;
};
}

18
pkgs/applications/networking/firehol/iprange.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "iprange-${version}";
version = "1.0.3";
src = fetchurl {
url = "https://github.com/firehol/iprange/releases/download/v${version}/iprange-${version}.tar.xz";
sha256 = "0lwgl5ybrhsv43llq3kgdjpvgyfl43f3nxm0g8a8cd7zmn754bg2";
};
meta = with stdenv.lib; {
description = "manage IP ranges";
homepage = https://github.com/firehol/iprange;
license = licenses.gpl2;
maintainers = with maintainers; [ geistesk ];
};
}

6
pkgs/applications/office/beancount/bean-add.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, python3Packages }: { stdenv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bean-add-2017-04-06"; name = "bean-add-2017-09-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simon-v"; owner = "simon-v";
repo = "bean-add"; repo = "bean-add";
rev = "67c3cd345dc370f8cd967a31549c1d0b86b07024"; rev = "035f07a9e48a9dd23b49a27ba9c070ee9ddc4cc7";
sha256 = "0902lvwmf7k1h6gn3ilwzk20pxphbxsa3rn68jfhhfqpr6xpqf93"; sha256 = "0lj8940bn2h8541am4x0sfqpfk5xfnyfdnf3jpajfgx6wyjm2frg";
}; };
propagatedBuildInputs = with python3Packages; [ python ]; propagatedBuildInputs = with python3Packages; [ python ];

4
pkgs/applications/science/logic/proverif/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "proverif-${version}"; name = "proverif-${version}";
version = "1.95"; version = "1.97pl1";
src = fetchurl { src = fetchurl {
url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz";
sha256 = "01viwi6sccdxk723ycy1shklz8g29j5i3wj2mcwb3j7advvqmws2"; sha256 = "1b0ji68crdli40a4z62gdq6fnygj3z2j63iaq4jki7wfc3nn3vgq";
}; };
buildInputs = [ ocaml ]; buildInputs = [ ocaml ];

35
pkgs/applications/video/bombono/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
enca, pkgconfig }:
stdenv.mkDerivation rec {
name = "bombono-${version}";
version = "1.2.4";
src = fetchFromGitHub {
owner = "muravjov";
repo = "bombono-dvd";
rev = version;
sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9";
};
nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
buildInputs = [
gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools
libxmlxx ffmpeg enca
];
buildPhase = ''
scons PREFIX=$out
'';
installPhase = ''
scons install
'';
meta = {
description = "a DVD authoring program for personal computers";
homepage = "http://www.bombono.org/";
license = stdenv.lib.licenses.gpl2;
};
}

2
pkgs/development/libraries/kde-frameworks/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.38/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/frameworks/5.37/ -A '*.tar.xz' )

4
pkgs/development/libraries/kde-frameworks/ktexteditor.nix
View File

@ -2,7 +2,7 @@
mkDerivation, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, perl, extra-cmake-modules, perl,
karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols qtscript, qtxmlpatterns, sonnet, syntax-highlighting
}: }:
mkDerivation { mkDerivation {
@ -11,7 +11,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules perl ]; nativeBuildInputs = [ extra-cmake-modules perl ];
buildInputs = [ buildInputs = [
karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript
qtxmlpatterns sonnet syntax-highlighting qtquickcontrols qtxmlpatterns sonnet syntax-highlighting
]; ];
propagatedBuildInputs = [ kparts ]; propagatedBuildInputs = [ kparts ];
} }

600
pkgs/development/libraries/kde-frameworks/srcs.nix
View File

@ -3,603 +3,603 @@
{ {
attica = { attica = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/attica-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/attica-5.37.0.tar.xz";
sha256 = "12smdcd7lcyjqiw0bsk3lwivrl6cvmiqv5cqaw0gz8flhvk29w96"; sha256 = "13jqk4w9crh8pca6n9334l1gb8bmwf86pa36k0mfh5j19dq72g2p";
name = "attica-5.38.0.tar.xz"; name = "attica-5.37.0.tar.xz";
}; };
}; };
baloo = { baloo = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/baloo-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/baloo-5.37.0.tar.xz";
sha256 = "14522akyxg36lclfblp65xai95i9hiydqjhkmfkadjbq82wm9s9i"; sha256 = "19sl07lhjrri40vfi8wl6azgmg08lgfb98xx110j6spjbbbnww79";
name = "baloo-5.38.0.tar.xz"; name = "baloo-5.37.0.tar.xz";
}; };
}; };
bluez-qt = { bluez-qt = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/bluez-qt-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/bluez-qt-5.37.0.tar.xz";
sha256 = "0hanmygp4smbvczxn4dj997z3bln32p017z0r26z89m2p0b2ylwv"; sha256 = "1x6nj7vsn0sp9rckzkcbl6fwm7qzj5w98w2qys1fndb1spl7av8s";
name = "bluez-qt-5.38.0.tar.xz"; name = "bluez-qt-5.37.0.tar.xz";
}; };
}; };
breeze-icons = { breeze-icons = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/breeze-icons-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/breeze-icons-5.37.0.tar.xz";
sha256 = "09afi6c4h31ycs6aa85lqbmn392zi532zf8fp7ll43xxjv9isac9"; sha256 = "17nr2phd0nxyx49igvl170ksikapgc4365z26pw0dmmw41llcbxw";
name = "breeze-icons-5.38.0.tar.xz"; name = "breeze-icons-5.37.0.tar.xz";
}; };
}; };
extra-cmake-modules = { extra-cmake-modules = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/extra-cmake-modules-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/extra-cmake-modules-5.37.0.tar.xz";
sha256 = "0ci3vdzdbcrbnxpqvf4hcwcrzz1ijhifp8b99wh3k53rinnai231"; sha256 = "1jr7nmhh4kyz1g454qkldfhimfjvvylqa19zna5iak08bkq8q696";
name = "extra-cmake-modules-5.38.0.tar.xz"; name = "extra-cmake-modules-5.37.0.tar.xz";
}; };
}; };
frameworkintegration = { frameworkintegration = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/frameworkintegration-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/frameworkintegration-5.37.0.tar.xz";
sha256 = "0w1n3czgsnnmaqwypy3mpci8s4ppv9030zxw7ka7rsvwgkpqijq8"; sha256 = "0pcy3hjqbahbx65yxz5bl0h2ah4y3fb7mq3pj1rrp2cpp92s135a";
name = "frameworkintegration-5.38.0.tar.xz"; name = "frameworkintegration-5.37.0.tar.xz";
}; };
}; };
kactivities = { kactivities = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kactivities-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kactivities-5.37.0.tar.xz";
sha256 = "0grm0cilc80g5ih2hqhwgwm35mlfnrs343j6ixkd9s0mflv2b798"; sha256 = "005xvzp10kvwcsl2w6ghcqgqnr2rdvv9w61i4y44y25vcb85g26v";
name = "kactivities-5.38.0.tar.xz"; name = "kactivities-5.37.0.tar.xz";
}; };
}; };
kactivities-stats = { kactivities-stats = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kactivities-stats-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kactivities-stats-5.37.0.tar.xz";
sha256 = "0s57iz04n3m4fpqrqflda6vpk4l1mnf0nyz1iyza382fb375afd2"; sha256 = "09zsdzf77palmww7x3dzinl0hxrm4z0q0yc2fmf0d7z6cfl695y2";
name = "kactivities-stats-5.38.0.tar.xz"; name = "kactivities-stats-5.37.0.tar.xz";
}; };
}; };
kapidox = { kapidox = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kapidox-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kapidox-5.37.0.tar.xz";
sha256 = "1j4k75lhqdnsxmgyvblla0627qvgabxivw6limfdb3rdpmqdxj76"; sha256 = "1xwkaamifxjghv158rwslndfd9z70rm9ixnp1mmkgw8radwsqg5v";
name = "kapidox-5.38.0.tar.xz"; name = "kapidox-5.37.0.tar.xz";
}; };
}; };
karchive = { karchive = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/karchive-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/karchive-5.37.0.tar.xz";
sha256 = "0n5nxd3v9ljjff0r6k4xrvy5hj057b7c7jzcq258harl359d8m4k"; sha256 = "1599lql0kcx705313bfvbazr7rayr6vsiwrpiq6iwljzc7lli1im";
name = "karchive-5.38.0.tar.xz"; name = "karchive-5.37.0.tar.xz";
}; };
}; };
kauth = { kauth = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kauth-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kauth-5.37.0.tar.xz";
sha256 = "12nyfbilz4v4b2i5x191iph3jj4lcpw7z1rh0xrv5y1v7dczk6i7"; sha256 = "0ciz28bvbvxlv0iz0cgs31x2m1czkki21ypzqj8rg2ix8jw2p65w";
name = "kauth-5.38.0.tar.xz"; name = "kauth-5.37.0.tar.xz";
}; };
}; };
kbookmarks = { kbookmarks = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kbookmarks-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kbookmarks-5.37.0.tar.xz";
sha256 = "0s230mcwmrg0qpz42sg804m96j2xpnwj4bdp0mfv08x3jasqpbrq"; sha256 = "0l6rkj0b7hk2wg6dypj1dkl8pcd1vx89gaiixbhkd3vf7jp46n41";
name = "kbookmarks-5.38.0.tar.xz"; name = "kbookmarks-5.37.0.tar.xz";
}; };
}; };
kcmutils = { kcmutils = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kcmutils-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kcmutils-5.37.0.tar.xz";
sha256 = "0n6f2xvl5v8fwfxpdl6la1hb01dh4h1pcdrf05nn60v0rqg9f58b"; sha256 = "1ik1505f16swsmvrv62dacis33f1ccnmkw3zbhb84vbrbqyskvzx";
name = "kcmutils-5.38.0.tar.xz"; name = "kcmutils-5.37.0.tar.xz";
}; };
}; };
kcodecs = { kcodecs = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kcodecs-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kcodecs-5.37.0.tar.xz";
sha256 = "0cnxhaj5jk7f3j9q4hzphc3nm3vdaqwy9xab5d4nvn1kv8vjv8ii"; sha256 = "0kmk97b5vbnyb3xjxwmg3l47aka8mkf50g4p7wvr096qwplffbva";
name = "kcodecs-5.38.0.tar.xz"; name = "kcodecs-5.37.0.tar.xz";
}; };
}; };
kcompletion = { kcompletion = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kcompletion-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kcompletion-5.37.0.tar.xz";
sha256 = "0f955w67wrk15rdmglrk7k0xc5i6kah12bpb078xhzlyfackg52w"; sha256 = "0qhjkqmd1jjy50hlzsdxwgnjwpfdrz3njl5n88h3nzp83yjv1ljz";
name = "kcompletion-5.38.0.tar.xz"; name = "kcompletion-5.37.0.tar.xz";
}; };
}; };
kconfig = { kconfig = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kconfig-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kconfig-5.37.0.tar.xz";
sha256 = "0fi428dsr6qpa9336wcfic6hyix6l2p9s135w00qzdwhdkr4lx3r"; sha256 = "1f0y2gmwy05b17clr7vg1zp18l1z0fd757v02ha7cwd64yznyr5d";
name = "kconfig-5.38.0.tar.xz"; name = "kconfig-5.37.0.tar.xz";
}; };
}; };
kconfigwidgets = { kconfigwidgets = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kconfigwidgets-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kconfigwidgets-5.37.0.tar.xz";
sha256 = "0w319d94wxn90dbbdfw5zrn2ddnv9vb7wldkpvvycq7yxrhsfw0x"; sha256 = "001d1nj8q6xpl71rwm15rnvy5ajyxpvknvf4ic7p5pbik3021bs6";
name = "kconfigwidgets-5.38.0.tar.xz"; name = "kconfigwidgets-5.37.0.tar.xz";
}; };
}; };
kcoreaddons = { kcoreaddons = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kcoreaddons-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kcoreaddons-5.37.0.tar.xz";
sha256 = "1m3mn9fhllwcidzji2l26k5yxzrqkbyjdly04nh3s5rf823dvqwv"; sha256 = "0a45sz11d7b2d8sbr9z57mv337nbhd94fiqk3issw470n0y46g3y";
name = "kcoreaddons-5.38.0.tar.xz"; name = "kcoreaddons-5.37.0.tar.xz";
}; };
}; };
kcrash = { kcrash = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kcrash-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kcrash-5.37.0.tar.xz";
sha256 = "1a8hvyhwa112wx4ldadlrxpyda6qpial387j07dr1jq1cnzr0p11"; sha256 = "16k2pwf3s3adgayd9vq7kk8c5gnq9g6wra4psrvs3a3c5k5am5y0";
name = "kcrash-5.38.0.tar.xz"; name = "kcrash-5.37.0.tar.xz";
}; };
}; };
kdbusaddons = { kdbusaddons = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kdbusaddons-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kdbusaddons-5.37.0.tar.xz";
sha256 = "1mw9sl82y2aj7l2xj1skrbxbyv55br60h6f61r4f1mqcaxaqj7qw"; sha256 = "0745arkp4wnpwyhjq02h7lfac049cmlg5qwhf96i7ss0w54vch4i";
name = "kdbusaddons-5.38.0.tar.xz"; name = "kdbusaddons-5.37.0.tar.xz";
}; };
}; };
kdeclarative = { kdeclarative = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kdeclarative-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kdeclarative-5.37.0.tar.xz";
sha256 = "1966sxzhdkzi2lwg5ixhrx0yg10plbvn9lsjgnj9crghaajsnf4b"; sha256 = "1ish46m2dpnpqjnf8g660clcg7ky65w11cbk2m79pwyhqvhxgggj";
name = "kdeclarative-5.38.0.tar.xz"; name = "kdeclarative-5.37.0.tar.xz";
}; };
}; };
kded = { kded = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kded-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kded-5.37.0.tar.xz";
sha256 = "0xsjzj5jx4wsrq5fnbv6raqlr11shz20p2mvypf5wfvq2c1vb5lb"; sha256 = "162s5qx2qb0bi889f8jjvd3ci31azd8iwp25i04vwi0lzglwb8gy";
name = "kded-5.38.0.tar.xz"; name = "kded-5.37.0.tar.xz";
}; };
}; };
kdelibs4support = { kdelibs4support = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/portingAids/kdelibs4support-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/portingAids/kdelibs4support-5.37.0.tar.xz";
sha256 = "06vlgziy212pwm4z9r8rbfa9ziwx3nkihy9b25m13gbh60baqapp"; sha256 = "1zz100m1sqfmg3ni7023b99qn79jhdd2ryw6534axl5zgn0sglh9";
name = "kdelibs4support-5.38.0.tar.xz"; name = "kdelibs4support-5.37.0.tar.xz";
}; };
}; };
kdesignerplugin = { kdesignerplugin = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kdesignerplugin-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kdesignerplugin-5.37.0.tar.xz";
sha256 = "0rivjxgsxvsgk24lnzsqpzqr7m1i1faqnbby3rnkw2059z28l0y6"; sha256 = "1197003bqcdpsyn6faasr2nhaadh7ryg92vjpqim78af3vwinsdw";
name = "kdesignerplugin-5.38.0.tar.xz"; name = "kdesignerplugin-5.37.0.tar.xz";
}; };
}; };
kdesu = { kdesu = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kdesu-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kdesu-5.37.0.tar.xz";
sha256 = "1c9j2zih7r0jph41kzxnxpri9snphm1k4w4rs1q6zawwz8a5kcr5"; sha256 = "1qfhkzk6l9rfdyiad8y6k30zlhziz3q2dxvxkmnghxmkg98yhdza";
name = "kdesu-5.38.0.tar.xz"; name = "kdesu-5.37.0.tar.xz";
}; };
}; };
kdewebkit = { kdewebkit = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kdewebkit-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kdewebkit-5.37.0.tar.xz";
sha256 = "1cncbjkgrbrnvwx3izjqh9hqiw9bg6aqaq09f8bdryvr8537b0zf"; sha256 = "1ph3a50wix42hmsbc9jbfxla172aihjx9yzp9rza09j1a7va3hg1";
name = "kdewebkit-5.38.0.tar.xz"; name = "kdewebkit-5.37.0.tar.xz";
}; };
}; };
kdnssd = { kdnssd = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kdnssd-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kdnssd-5.37.0.tar.xz";
sha256 = "101gygxrq2m3yfz6j0ldspib3pm3jjvqz505j3h15zj59qcwqw0x"; sha256 = "03rd6znn2qwndn4m3bb03slwyic06ry535rawgyh06lfps0fcc5z";
name = "kdnssd-5.38.0.tar.xz"; name = "kdnssd-5.37.0.tar.xz";
}; };
}; };
kdoctools = { kdoctools = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kdoctools-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kdoctools-5.37.0.tar.xz";
sha256 = "0fbv7i1930rl496psny7nfiixvsnaq535h1zggwkwv6i9dh7wpy9"; sha256 = "0gbc5qqim6262hvkl9pf6rynnblxb3hsw3c4ars03ip7n761y0zl";
name = "kdoctools-5.38.0.tar.xz"; name = "kdoctools-5.37.0.tar.xz";
}; };
}; };
kemoticons = { kemoticons = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kemoticons-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kemoticons-5.37.0.tar.xz";
sha256 = "1c0991yd8jx2diy5ynl11h5qqyapn1dsir2gy04y8m90h944vdd5"; sha256 = "1cx978s1dm3v1jh4aymncxs44iizdqp174dqg9m5mf043fcvvinq";
name = "kemoticons-5.38.0.tar.xz"; name = "kemoticons-5.37.0.tar.xz";
}; };
}; };
kfilemetadata = { kfilemetadata = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kfilemetadata-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kfilemetadata-5.37.0.tar.xz";
sha256 = "1815r9lx99h9kzbk67bfk41jya3y2hsi112fsgpv3m4mg028pklm"; sha256 = "17mbm6pdi6ac61kj2qzxf7y3rbxhxg9rwqr7qy766gh3img2vq8p";
name = "kfilemetadata-5.38.0.tar.xz"; name = "kfilemetadata-5.37.0.tar.xz";
}; };
}; };
kglobalaccel = { kglobalaccel = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kglobalaccel-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kglobalaccel-5.37.0.tar.xz";
sha256 = "1rxmghm302ndn6qgrdgl1fccyi57bq8a0273p6wy8vs5pn2902ms"; sha256 = "1d84q3r6q5n2lclym9a9m1brfqnq3p3dykfpzvhcba3bjxh3cdsb";
name = "kglobalaccel-5.38.0.tar.xz"; name = "kglobalaccel-5.37.0.tar.xz";
}; };
}; };
kguiaddons = { kguiaddons = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kguiaddons-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kguiaddons-5.37.0.tar.xz";
sha256 = "1jks0hwn665hlypl0qfhi5r0prqzrg1gv4skc88zp1kgx05kb9h1"; sha256 = "13g6nlw8fk135i6z3f8ichy8whxd6v4rycg80dlvm25h66rg6vn5";
name = "kguiaddons-5.38.0.tar.xz"; name = "kguiaddons-5.37.0.tar.xz";
}; };
}; };
khtml = { khtml = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/portingAids/khtml-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/portingAids/khtml-5.37.0.tar.xz";
sha256 = "0fa61va3dbwml40y4scxks223swlb8vf5730wr7rijl91lz1adgy"; sha256 = "1n0mx2xy9n5ffhvh58z3kn61aa7dhppsrwgxk697pybqy1h45ah2";
name = "khtml-5.38.0.tar.xz"; name = "khtml-5.37.0.tar.xz";
}; };
}; };
ki18n = { ki18n = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/ki18n-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/ki18n-5.37.0.tar.xz";
sha256 = "0z9arj2s4fn04vavl6ad3avl1p5yr3mgr2n802lmvy2wlqicy314"; sha256 = "1c1sy4pbhlwsajs2972brdmma5val72gkil6k0a0f58nfvvg952d";
name = "ki18n-5.38.0.tar.xz"; name = "ki18n-5.37.0.tar.xz";
}; };
}; };
kiconthemes = { kiconthemes = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kiconthemes-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kiconthemes-5.37.0.tar.xz";
sha256 = "01xa30r2cx312vbmz2c3x8vvna1cqb6fx91cjp4aivp9q4jwaz9a"; sha256 = "1j7mgfsvxa24nf1d9xyn2jv9y9j523vghsvsm73x8d3ijibchfxq";
name = "kiconthemes-5.38.0.tar.xz"; name = "kiconthemes-5.37.0.tar.xz";
}; };
}; };
kidletime = { kidletime = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kidletime-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kidletime-5.37.0.tar.xz";
sha256 = "1i91w9hcb2k5n9qz8q7k2z44z9ss7r9i2zsg9vnl8am7dqqhmlsv"; sha256 = "01m4q3l2yq83f2dpbv6jry7cjkj6bqdgfpy5b8byaf1gf9w2firs";
name = "kidletime-5.38.0.tar.xz"; name = "kidletime-5.37.0.tar.xz";
}; };
}; };
kimageformats = { kimageformats = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kimageformats-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kimageformats-5.37.0.tar.xz";
sha256 = "0q78shcwgczdm5ylhbp9fnq70w3hqzkbynp2vpyyg5pjaam8xjlp"; sha256 = "1knha6wjzjs0vnkljwpfinzg3hg2jyh9c07ifqvd47cprl96ickg";
name = "kimageformats-5.38.0.tar.xz"; name = "kimageformats-5.37.0.tar.xz";
}; };
}; };
kinit = { kinit = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kinit-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kinit-5.37.0.tar.xz";
sha256 = "0k4i0zrwkz088vjkk7d7whwhkrjvqqhdigspzf58d1laryiy0jdf"; sha256 = "0b7dyy4hqyf6wk7gg2l23ldnji2zl8vzyj5wd5qh4yi7rdl6js5r";
name = "kinit-5.38.0.tar.xz"; name = "kinit-5.37.0.tar.xz";
}; };
}; };
kio = { kio = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kio-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kio-5.37.0.tar.xz";
sha256 = "15qmr2ghrj7pgqxrgpvhdp9g5vaap9mzlmry6ayph75m1afb4fpl"; sha256 = "0nxchbhs8p2d4243dyp7qa65g1p6r3ic2h6dz7w0aa0qzsy8wi29";
name = "kio-5.38.0.tar.xz"; name = "kio-5.37.0.tar.xz";
}; };
}; };
kirigami2 = { kirigami2 = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kirigami2-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kirigami2-5.37.0.tar.xz";
sha256 = "18k41j5ijmgmzgl2rv4ac0bnxlax3505zi1nmqm8bkdpznhfr13c"; sha256 = "1z42rsi8nzshrbv8m8vxkay4dq46kggglhgxbbgg2q00y8gjq9dd";
name = "kirigami2-5.38.0.tar.xz"; name = "kirigami2-5.37.0.tar.xz";
}; };
}; };
kitemmodels = { kitemmodels = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kitemmodels-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kitemmodels-5.37.0.tar.xz";
sha256 = "0s20in4jjd2pvv9bn79lvgqqlf806hw014icp51f5hfknrhpdyjc"; sha256 = "1nlpzzp4m0ghfz1p2hrwn4lbhjhxc8b8q8kbzqbh9hmwmimbzzrr";
name = "kitemmodels-5.38.0.tar.xz"; name = "kitemmodels-5.37.0.tar.xz";
}; };
}; };
kitemviews = { kitemviews = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kitemviews-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kitemviews-5.37.0.tar.xz";
sha256 = "0ldi8qzs2sbhz8l57nshjrnwhjl9mhw90kcqw71cldp41wm0pps6"; sha256 = "17r7vnlyiiifhrz4gb4fifshn1jb4c67lhadczi8d301rzk7wwsm";
name = "kitemviews-5.38.0.tar.xz"; name = "kitemviews-5.37.0.tar.xz";
}; };
}; };
kjobwidgets = { kjobwidgets = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kjobwidgets-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kjobwidgets-5.37.0.tar.xz";
sha256 = "0vp6nc73c9788nrib742k9nzqbx4m8m77ipqh9dnnkx4ggrhsd55"; sha256 = "1162dxhpspd7p1735npp0amrxr5b0j467f5651k2rv6mvqfmqr4b";
name = "kjobwidgets-5.38.0.tar.xz"; name = "kjobwidgets-5.37.0.tar.xz";
}; };
}; };
kjs = { kjs = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/portingAids/kjs-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/portingAids/kjs-5.37.0.tar.xz";
sha256 = "0diw580k5kyv60bqhnxhqinlrn0b3p3n89iy0kdgjgnr6197fwy1"; sha256 = "046hy8ji4i6p2xp5gnqa8dk82sv6sbh4xg67y79i82bbi97dvq9b";
name = "kjs-5.38.0.tar.xz"; name = "kjs-5.37.0.tar.xz";
}; };
}; };
kjsembed = { kjsembed = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/portingAids/kjsembed-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/portingAids/kjsembed-5.37.0.tar.xz";
sha256 = "0nb07n54208gnmag7h3dhc8hri2s83ln1c9wq6c0xw7jchaz9z8a"; sha256 = "0w2wk5azf1b45db58qj0cdc1l056x9s1xcd09ibavx5xmdvq6br0";
name = "kjsembed-5.38.0.tar.xz"; name = "kjsembed-5.37.0.tar.xz";
}; };
}; };
kmediaplayer = { kmediaplayer = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/portingAids/kmediaplayer-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/portingAids/kmediaplayer-5.37.0.tar.xz";
sha256 = "1qb2g8j871gf38i2dk2j9ags848fa3kqdjl3l4924hf28az0g736"; sha256 = "0fqxrkcwwzg11zsax9q169lisnfp9jsqg4ccd6xvv8kpkz3g04jp";
name = "kmediaplayer-5.38.0.tar.xz"; name = "kmediaplayer-5.37.0.tar.xz";
}; };
}; };
knewstuff = { knewstuff = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/knewstuff-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/knewstuff-5.37.0.tar.xz";
sha256 = "1l4cmfcsljg7v5l6341fxcp7c7i615l8351l941dwcmw4yng0lj0"; sha256 = "1scnxhxx4g8j4wml6x8i5v00rpaxyzzcm7vqbra2axbql5d8g8ny";
name = "knewstuff-5.38.0.tar.xz"; name = "knewstuff-5.37.0.tar.xz";
}; };
}; };
knotifications = { knotifications = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/knotifications-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/knotifications-5.37.0.tar.xz";
sha256 = "1jvmv2hi3dbf0bd2b61l9s5lb1dx2rjl9z7pw1fb5j20910k6zgd"; sha256 = "0gvv6jal7n4m3y30ragjlyhghq3y2782d422im9klxqzlgdgvkb6";
name = "knotifications-5.38.0.tar.xz"; name = "knotifications-5.37.0.tar.xz";
}; };
}; };
knotifyconfig = { knotifyconfig = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/knotifyconfig-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/knotifyconfig-5.37.0.tar.xz";
sha256 = "05hgglm6ypbaplxr43632zh5fmgsz6543110169k9fbjnczyhcyk"; sha256 = "14kjckynszv8015p17j578l3knmkmw25d8r8ks4wavgj3db9bik5";
name = "knotifyconfig-5.38.0.tar.xz"; name = "knotifyconfig-5.37.0.tar.xz";
}; };
}; };
kpackage = { kpackage = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kpackage-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kpackage-5.37.0.tar.xz";
sha256 = "0v4j3kqgg52rlmdxmd98aqw0hk7i2xqsw9mhhxfs9c7vm1x05sxn"; sha256 = "1ikf55q2pk8vm70pqm7rmakja309zjh9z1lg0xqslq1pqd6xki7s";
name = "kpackage-5.38.0.tar.xz"; name = "kpackage-5.37.0.tar.xz";
}; };
}; };
kparts = { kparts = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kparts-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kparts-5.37.0.tar.xz";
sha256 = "19ba749pwnb7xvmr7lryn6z53zb49hqn0xq4j9fmbic95nh039zp"; sha256 = "0jrd8idkz8nhkda2rwgf8rysqngiv4r5ajmrzp2kfz1pr91a6l5h";
name = "kparts-5.38.0.tar.xz"; name = "kparts-5.37.0.tar.xz";
}; };
}; };
kpeople = { kpeople = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kpeople-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kpeople-5.37.0.tar.xz";
sha256 = "0yd29436bgfw6jjjr9n38hx8561mrlgl5vynci6ng9bx1jflay0x"; sha256 = "1qgp4wqp985ac1m9wakpsvk3c2driwkwrjkc3aic7dyr1p456qsf";
name = "kpeople-5.38.0.tar.xz"; name = "kpeople-5.37.0.tar.xz";
}; };
}; };
kplotting = { kplotting = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kplotting-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kplotting-5.37.0.tar.xz";
sha256 = "1hvfqm6i5fsyssb51w3yybsil8h9cbqgd2n8k0wnz99m8xifzn72"; sha256 = "0k4s0qvhjm9h1bmg16l32g4bsdrp2jrcila4dgzvrb56447px0zw";
name = "kplotting-5.38.0.tar.xz"; name = "kplotting-5.37.0.tar.xz";
}; };
}; };
kpty = { kpty = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kpty-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kpty-5.37.0.tar.xz";
sha256 = "0cgh8hixrplgc280652jlvk8ibcddmjvflwb0gjawd9iq7lcb66y"; sha256 = "0wb873r1ycgi11s0qx3lhvz54703yz5sax6fb6wdmri5c05gzd5a";
name = "kpty-5.38.0.tar.xz"; name = "kpty-5.37.0.tar.xz";
}; };
}; };
kross = { kross = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/portingAids/kross-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/portingAids/kross-5.37.0.tar.xz";
sha256 = "1dccg214cqpyn3nninalpknglfmchz2k1fk4rlgq53wf4n6w23b7"; sha256 = "06pk6f6v82pd7x9rsmkhkp5r9sgcbrc503lqckl8d7argbb7j4k1";
name = "kross-5.38.0.tar.xz"; name = "kross-5.37.0.tar.xz";
}; };
}; };
krunner = { krunner = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/krunner-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/krunner-5.37.0.tar.xz";
sha256 = "16fhl5zm8scyxk83mpkavvzkn23qgzcblg315jy6klr5bz9jxgcm"; sha256 = "171qbhr1yszl2gcffm47p5wiwj71w9yhvk6srhvfpiwfyh61a4ld";
name = "krunner-5.38.0.tar.xz"; name = "krunner-5.37.0.tar.xz";
}; };
}; };
kservice = { kservice = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kservice-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kservice-5.37.0.tar.xz";
sha256 = "0zaamvxhfx4xdy2m8spyhi0hdv6p0fn5hqn9pyi5l8xdixnwjc9d"; sha256 = "1zxs5yzd3rmy33vsip4c4igk9g38kzaggw8c29sxmgr8vgdrnvhr";
name = "kservice-5.38.0.tar.xz"; name = "kservice-5.37.0.tar.xz";
}; };
}; };
ktexteditor = { ktexteditor = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/ktexteditor-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/ktexteditor-5.37.0.tar.xz";
sha256 = "195ygv1j4wfvly31g22wxz9sshhqyi1yyf2mv1v63d9ci88v7rri"; sha256 = "0y04s1nwkf0np6iymjxf0jssin28qw2901kpb3iw8gd52ni5rrks";
name = "ktexteditor-5.38.0.tar.xz"; name = "ktexteditor-5.37.0.tar.xz";
}; };
}; };
ktextwidgets = { ktextwidgets = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/ktextwidgets-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/ktextwidgets-5.37.0.tar.xz";
sha256 = "120jxab8w1vhqcckda51r0x2pmfb2qd2h6inhivl72c4m5x89w7f"; sha256 = "1p8ns75sbnapm6ds16hx36q9vlnz9phgy28rx0gm1ckxqvm4yzr5";
name = "ktextwidgets-5.38.0.tar.xz"; name = "ktextwidgets-5.37.0.tar.xz";
}; };
}; };
kunitconversion = { kunitconversion = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kunitconversion-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kunitconversion-5.37.0.tar.xz";
sha256 = "10k0xfb11r7l1bdnlanqgdwwx8wrs8bmnswb2y85xxr7wwsqnlvc"; sha256 = "1qvq61sbv9naj5ndi5xjwx7ami0xa6bqiajr912kbbbp2257cjsi";
name = "kunitconversion-5.38.0.tar.xz"; name = "kunitconversion-5.37.0.tar.xz";
}; };
}; };
kwallet = { kwallet = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kwallet-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kwallet-5.37.0.tar.xz";
sha256 = "1qysdj4nmkxywj7bzqdc78ifnqjnkrz9qbp4a49acpng2y4zw1nw"; sha256 = "1l7jl3y0rzx2whnbp6w5p6kg71vwyccp2nwxxgcxr6541m0nihsz";
name = "kwallet-5.38.0.tar.xz"; name = "kwallet-5.37.0.tar.xz";
}; };
}; };
kwayland = { kwayland = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kwayland-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kwayland-5.37.0.tar.xz";
sha256 = "0gd58nvyc39waj7vv2c68r59qqpv0jppm95548j2p924w48syjj0"; sha256 = "0d4c8l8k38pgj73kzlf1hsq52w31wy9wgpwph1bv0cq5yn2rjiyr";
name = "kwayland-5.38.0.tar.xz"; name = "kwayland-5.37.0.tar.xz";
}; };
}; };
kwidgetsaddons = { kwidgetsaddons = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kwidgetsaddons-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kwidgetsaddons-5.37.0.tar.xz";
sha256 = "1yh48qxdqz3rk020wr897vkzsi4nhh37lxbg6211xrlirn0lzvj5"; sha256 = "1jmk377r1h4is2il7chh6bq8wbj21psf4b1yiw84iivg38vlpid4";
name = "kwidgetsaddons-5.38.0.tar.xz"; name = "kwidgetsaddons-5.37.0.tar.xz";
}; };
}; };
kwindowsystem = { kwindowsystem = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kwindowsystem-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kwindowsystem-5.37.0.tar.xz";
sha256 = "02xrin8lshvqkw12d0692z40h3g61f4crh28jcmi5zqlaxiyn5ic"; sha256 = "0pd2n0j5pdv1x7wf4mwcpimnah73g6l0xidhqbpg37p829jix2k2";
name = "kwindowsystem-5.38.0.tar.xz"; name = "kwindowsystem-5.37.0.tar.xz";
}; };
}; };
kxmlgui = { kxmlgui = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kxmlgui-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kxmlgui-5.37.0.tar.xz";
sha256 = "12cmyhm05nkr9xj7cpnqihrlndfqn1kjkzhcn1ywj20y1gd3mxv4"; sha256 = "0jrvjlxkg9knj61b2gj2w6l96jlmww9kn4ij808ir35365x3cdg2";
name = "kxmlgui-5.38.0.tar.xz"; name = "kxmlgui-5.37.0.tar.xz";
}; };
}; };
kxmlrpcclient = { kxmlrpcclient = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/kxmlrpcclient-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/kxmlrpcclient-5.37.0.tar.xz";
sha256 = "0g9ah59h8vq68yg4pfdbqx44xrs856wrr181rsdbsizj0qj3hyaa"; sha256 = "1jn9v86dpfx43qcdcsp6lpnga9q6aa5vxjkkg4wg0wbxmw4w9gvq";
name = "kxmlrpcclient-5.38.0.tar.xz"; name = "kxmlrpcclient-5.37.0.tar.xz";
}; };
}; };
modemmanager-qt = { modemmanager-qt = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/modemmanager-qt-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/modemmanager-qt-5.37.0.tar.xz";
sha256 = "18ham8lrxblywc634n49237js5y5k6qgjf5zrjc8gzapn934l89w"; sha256 = "1fqf43kvj1v1mcdlbfxbh6sh3ycvg35aml2ywh2a684iz4qzq1aq";
name = "modemmanager-qt-5.38.0.tar.xz"; name = "modemmanager-qt-5.37.0.tar.xz";
}; };
}; };
networkmanager-qt = { networkmanager-qt = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/networkmanager-qt-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/networkmanager-qt-5.37.0.tar.xz";
sha256 = "10d28nrkppmmfl9pwq2hkrvi461acf29djdzala4l37mp4dwvbf8"; sha256 = "01px9n97gyvyyfg3dp1k7dik9fprgx9i28hg8wjr2rb5dlr99jd1";
name = "networkmanager-qt-5.38.0.tar.xz"; name = "networkmanager-qt-5.37.0.tar.xz";
}; };
}; };
oxygen-icons5 = { oxygen-icons5 = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/oxygen-icons5-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/oxygen-icons5-5.37.0.tar.xz";
sha256 = "0fk97r3br5myqpnfalz67l5hkamxc5vc5swa68wpg1xih6jc3iid"; sha256 = "1rns7n93f83qp5q11a7r5y87y0hvc0q95ar57cqy0fxsqrg4614h";
name = "oxygen-icons5-5.38.0.tar.xz"; name = "oxygen-icons5-5.37.0.tar.xz";
}; };
}; };
plasma-framework = { plasma-framework = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/plasma-framework-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/plasma-framework-5.37.0.tar.xz";
sha256 = "1dvhqfi34v44h0wj0m68k477hmx53x9zsf4mh03xq164w1yz68sg"; sha256 = "0kamvxfzrbx3msn0cp3k20clqchz9jg5wlazz3h6p6zmrk5v16bh";
name = "plasma-framework-5.38.0.tar.xz"; name = "plasma-framework-5.37.0.tar.xz";
}; };
}; };
prison = { prison = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/prison-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/prison-5.37.0.tar.xz";
sha256 = "0prj3z6s3aighmk4qarfljca7j9cy7ypvgh8rv5di3jb2v4nbg4m"; sha256 = "1icsirwfh7zscm8x9g2gp7aqzhs81ahhjflwjcwpz9bh0r9f1wb7";
name = "prison-5.38.0.tar.xz"; name = "prison-5.37.0.tar.xz";
}; };
}; };
solid = { solid = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/solid-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/solid-5.37.0.tar.xz";
sha256 = "1b3c5drx4m1x4ai0ziz0yan16a5s3ghf0py37mb92qyimq586lhh"; sha256 = "1gb9gnp1a11q5abl97b7sq1if2rqcrcs0f33sakpxf1z9y0ppg8l";
name = "solid-5.38.0.tar.xz"; name = "solid-5.37.0.tar.xz";
}; };
}; };
sonnet = { sonnet = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/sonnet-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/sonnet-5.37.0.tar.xz";
sha256 = "1355p88swnk828gsbnm3v4gryffnwbzjcdq49k8jwywzb65bnwxa"; sha256 = "0sb6i464riadgb2q73nj0vy6xavr2m1sszrvghr20nj7i64f3kk0";
name = "sonnet-5.38.0.tar.xz"; name = "sonnet-5.37.0.tar.xz";
}; };
}; };
syntax-highlighting = { syntax-highlighting = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/syntax-highlighting-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/syntax-highlighting-5.37.0.tar.xz";
sha256 = "101ng0l3jfg8x9bns9z38jk3iayijwcb299kf860vfy0nki8gf6l"; sha256 = "1l56pb84z7sy0qq8xkd5w5v5418bm9n4qds0vd39ch655d47bl72";
name = "syntax-highlighting-5.38.0.tar.xz"; name = "syntax-highlighting-5.37.0.tar.xz";
}; };
}; };
threadweaver = { threadweaver = {
version = "5.38.0"; version = "5.37.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.38/threadweaver-5.38.0.tar.xz"; url = "${mirror}/stable/frameworks/5.37/threadweaver-5.37.0.tar.xz";
sha256 = "1d89l9lknc1q25cz9r8iwc1a102q788mj01ghnl6ydss65rclvfv"; sha256 = "1hb3721r1zbbyj211886sfkcxk18k0rsdhcg9ssagx10f29rpxx4";
name = "threadweaver-5.38.0.tar.xz"; name = "threadweaver-5.37.0.tar.xz";
}; };
}; };
} }

2
pkgs/development/python-modules/afew/default.nix
View File

@ -32,7 +32,7 @@ buildPythonPackage rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/teythoon/afew; homepage = https://github.com/afewmail/afew;
description = "An initial tagging script for notmuch mail"; description = "An initial tagging script for notmuch mail";
maintainers = with maintainers; [ garbas ]; maintainers = with maintainers; [ garbas ];
}; };

4
pkgs/development/tools/database/sqlitebrowser/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }: { mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }:
mkDerivation rec { mkDerivation rec {
version = "3.9.1"; version = "3.10.0";
name = "sqlitebrowser-${version}"; name = "sqlitebrowser-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "sqlitebrowser"; repo = "sqlitebrowser";
owner = "sqlitebrowser"; owner = "sqlitebrowser";
rev = "v${version}"; rev = "v${version}";
sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150"; sha256 = "1fwr7p4b6glc3s0a06i7cg8l9p1mrcm4vyhyf2wi89cyg22rrf5c";
}; };
buildInputs = [ qtbase qttools sqlite ]; buildInputs = [ qtbase qttools sqlite ];

4
pkgs/servers/mattermost/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mattermost-${version}"; name = "mattermost-${version}";
version = "3.8.2"; version = "4.1.0";
src = fetchurl { src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
sha256 = "1rrcasx8yzr48lwznqhkqk4qjfhxq5lnfcl9xiqkh6y2gmaqbk42"; sha256 = "0bp56i108pxsqcswxy1hdz3d8wq83lc29wcq6npimwx566rx4xhf";
}; };
installPhase = '' installPhase = ''

6
pkgs/servers/meteor/default.nix
View File

@ -2,14 +2,14 @@
let let
bootstrap = fetchurl { bootstrap = fetchurl {
url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.4.2.3/meteor-bootstrap-os.linux.x86_64.tar.gz"; url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.5/meteor-bootstrap-os.linux.x86_64.tar.gz";
sha256 = "1x5dp8y731qai882ghy3337844lc686r15a4dd9wjx2zvy7wmwhz"; sha256 = "0cwwqv88h1ji7g4zmfz34xsrxkn640wr11ddjq5c6b9ygcljci3p";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "meteor-${version}"; name = "meteor-${version}";
version = "1.4.2.3"; version = "1.5";
dontStrip = true; dontStrip = true;

18
pkgs/servers/meteor/main.patch
View File

@ -2,9 +2,9 @@ diff --git a/tools/cli/main.js b/tools/cli/main.js
index 84f94bc..4fbda17 100644 index 84f94bc..4fbda17 100644
--- a/tools/cli/main.js --- a/tools/cli/main.js
+++ b/tools/cli/main.js +++ b/tools/cli/main.js
@@ -484,6 +484,45 @@ var springboard = function (rel, options) { @@ -554,6 +554,44 @@
process.exit(ret.wait()); }).await());
} } // Now exec; we're not coming back.
+ // BEGIN HACK + // BEGIN HACK
+ // patch shebang: + // patch shebang:
@ -44,7 +44,13 @@ index 84f94bc..4fbda17 100644
+ patchelf("mongodb", "bin", "mongo"); + patchelf("mongodb", "bin", "mongo");
+ patchelf("mongodb", "bin", "mongod"); + patchelf("mongodb", "bin", "mongod");
+ // END HACK + // END HACK
+
// Now exec; we're not coming back.
require('kexec')(executable, newArgv); require('kexec')(executable, newArgv);
throw Error('exec failed?');
@@ -1485,4 +1523,4 @@
process.exit(ret);
}).run();
-//# sourceMappingURL=main.js.map
\ No newline at end of file
+//# sourceMappingURL=main.js.map

13
pkgs/servers/web-apps/piwik/default.nix
View File

@ -2,29 +2,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "piwik-${version}"; name = "piwik-${version}";
version = "3.0.4"; version = "3.1.0";
src = fetchurl { src = fetchurl {
url = "https://builds.piwik.org/${name}.tar.gz"; url = "https://builds.piwik.org/${name}.tar.gz";
sha512 = "2i0vydr073ynv7wcn078zxhvywdv85c648hympkzicdd746g995878py9006m96iwkmk4q664wn3f8jnfqsl1jd9f26alz1nssizbn9"; sha512 = "175300ibf0lg4xnyn5v47czi3vd6i7yqf1im3br4975f6k7w8q22m2mk2mi006795js5q52x48g4sc7wb47wac7wbla8wp98al48gfb";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
# regarding the PIWIK_USER_PATH substitutes:
# looks like this is just a bug / confusion of the directories, and nobody has tested this.
# PR at https://github.com/piwik/piwik/pull/11661
# regarding the 127.0.0.1 substitute: # regarding the 127.0.0.1 substitute:
# This replaces the default value of the database server field. # This replaces the default value of the database server field.
# unix socket authentication only works with localhost, # unix socket authentication only works with localhost,
# but password-based SQL authentication works with both. # but password-based SQL authentication works with both.
postPatch = '' postPatch = ''
substituteInPlace core/AssetManager/UIAssetFetcher.php \
--replace "return PIWIK_USER_PATH;" "return PIWIK_DOCUMENT_ROOT;"
substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \
--replace "setImportDir(PIWIK_USER_PATH);" "setImportDir(PIWIK_DOCUMENT_ROOT);"
substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \
--replace "\$absolutePath = PIWIK_USER_PATH" "\$absolutePath = PIWIK_DOCUMENT_ROOT"
substituteInPlace plugins/Installation/FormDatabaseSetup.php \ substituteInPlace plugins/Installation/FormDatabaseSetup.php \
--replace "=> '127.0.0.1'," "=> 'localhost'," --replace "=> '127.0.0.1'," "=> 'localhost',"
cp ${./bootstrap.php} bootstrap.php cp ${./bootstrap.php} bootstrap.php

24
pkgs/tools/system/s-tui/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, pythonPackages }:
pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "s-tui";
version = "0.6.2";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0fijk26sm51bnxf7plzd1fn2k4f8mdqd7j9zqc3d8zri7228vik2";
};
propagatedBuildInputs = with pythonPackages; [
urwid
psutil
];
meta = with stdenv.lib; {
homepage = https://amanusk.github.io/s-tui/;
descrption = "Stress-Terminal UI monitoring tool";
license = licenses.gpl2;
maintainers = with maintainers; [ infinisil ];
};
}

12
pkgs/tools/system/socklog/default.nix
View File

@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];
postPatch = '' postPatch = ''
sed -i src/TARGETS -e '/^chkshsgr/d' # Fails to run as user without supplementary groups
echo "int main() { return 0; }" >src/chkshsgr.c
# Fixup implicit function declarations
sed -i src/pathexec_run.c -e '1i#include <unistd.h>'
sed -i src/prot.c -e '1i#include <unistd.h>' -e '2i#include <grp.h>'
sed -i src/seek_set.c -e '1i#include <unistd.h>'
''; '';
configurePhase = '' configurePhase = ''
@ -27,8 +33,6 @@ stdenv.mkDerivation rec {
buildPhase = ''package/compile''; buildPhase = ''package/compile'';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
mv command"/"* $out/bin mv command"/"* $out/bin
@ -39,8 +43,6 @@ stdenv.mkDerivation rec {
mkdir -p $doc/share/doc/socklog/html mkdir -p $doc/share/doc/socklog/html
mv doc/*.html $doc/share/doc/socklog/html/ mv doc/*.html $doc/share/doc/socklog/html/
runHook postInstall
''; '';
checkPhase = ''package/check''; checkPhase = ''package/check'';

9
pkgs/top-level/all-packages.nix
View File

@ -1984,6 +1984,10 @@ with pkgs;
finger_bsd = callPackage ../tools/networking/bsd-finger { }; finger_bsd = callPackage ../tools/networking/bsd-finger { };
iprange = callPackage ../applications/networking/firehol/iprange.nix {};
firehol = callPackage ../applications/networking/firehol {};
fio = callPackage ../tools/system/fio { }; fio = callPackage ../tools/system/fio { };
flamerobin = callPackage ../applications/misc/flamerobin { }; flamerobin = callPackage ../applications/misc/flamerobin { };
@ -4195,6 +4199,8 @@ with pkgs;
rzip = callPackage ../tools/compression/rzip { }; rzip = callPackage ../tools/compression/rzip { };
s-tui = callPackage ../tools/system/s-tui { };
s3backer = callPackage ../tools/filesystems/s3backer { }; s3backer = callPackage ../tools/filesystems/s3backer { };
s3fs = callPackage ../tools/filesystems/s3fs { }; s3fs = callPackage ../tools/filesystems/s3fs { };
@ -13457,6 +13463,7 @@ with pkgs;
}; };
atom = callPackage ../applications/editors/atom { }; atom = callPackage ../applications/editors/atom { };
atom-beta = callPackage ../applications/editors/atom/beta.nix { };
aseprite = callPackage ../applications/editors/aseprite { }; aseprite = callPackage ../applications/editors/aseprite { };
@ -13607,6 +13614,8 @@ with pkgs;
bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { };
bombono = callPackage ../applications/video/bombono {};
bomi = libsForQt5.callPackage ../applications/video/bomi { bomi = libsForQt5.callPackage ../applications/video/bomi {
youtube-dl = pythonPackages.youtube-dl; youtube-dl = pythonPackages.youtube-dl;
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;