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

This commit is contained in:
Tuomas Tynkkynen 2018-02-09 04:10:25 +02:00
commit 20e3109401
51 changed files with 1945 additions and 1259 deletions

View file

@ -256,6 +256,10 @@ rec {
functor = (defaultFunctor name) // { wrapped = elemType; };
};
nonEmptyListOf = elemType:
let list = addCheck (types.listOf elemType) (l: l != []);
in list // { description = "non-empty " + list.description; };
attrsOf = elemType: mkOptionType rec {
name = "attrsOf";
description = "attribute set of ${elemType.description}s";

View file

@ -289,10 +289,10 @@ in
# Create initial databases
if ! test -e "${cfg.dataDir}/${database.name}"; then
echo "Creating initial database: ${database.name}"
( echo "create database ${database.name};"
( echo "create database `${database.name}`;"
${optionalString (database ? "schema") ''
echo "use ${database.name};"
echo "use `${database.name}`;"
if [ -f "${database.schema}" ]
then

View file

@ -375,9 +375,6 @@ in
# LogLevel VERBOSE logs user's key fingerprint on login.
# Needed to have a clear audit track of which key was used to log in.
LogLevel VERBOSE
# Use kernel sandbox mechanisms where possible in unprivileged processes.
UsePrivilegeSeparation sandbox
'';
assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;

View file

@ -88,6 +88,9 @@ let
${flip concatMapStrings v.map (p: ''
HiddenServicePort ${toString p.port} ${p.destination}
'')}
${optionalString (v.authorizeClient != null) ''
HiddenServiceAuthorizeClient ${v.authorizeClient.authType} ${concatStringsSep "," v.authorizeClient.clientNames}
''}
''))
+ cfg.extraConfig;
@ -619,6 +622,33 @@ in
}));
};
authorizeClient = mkOption {
default = null;
description = "If configured, the hidden service is accessible for authorized clients only.";
type = types.nullOr (types.submodule ({config, ...}: {
options = {
authType = mkOption {
type = types.enum [ "basic" "stealth" ];
description = ''
Either <literal>"basic"</literal> for a general-purpose authorization protocol
or <literal>"stealth"</literal> for a less scalable protocol
that also hides service activity from unauthorized clients.
'';
};
clientNames = mkOption {
type = types.nonEmptyListOf (types.strMatching "[A-Za-z0-9+-_]+");
description = ''
Only clients that are listed here are authorized to access the hidden service.
Generated authorization data can be found in <filename>${torDirectory}/onion/$name/hostname</filename>.
Clients need to put this authorization data in their configuration file using <literal>HidServAuth</literal>.
'';
};
};
}));
};
};
config = {

View file

@ -768,10 +768,10 @@
el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
version = "1.5.3";
version = "1.5.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.5.3.tar";
sha256 = "095gpanpf88j65cbf4r6c787qxi07kqpvdsh0dsdpg9m3ivmxbra";
url = "https://elpa.gnu.org/packages/el-search-1.5.4.tar";
sha256 = "1k0makrk3p6hknpnr3kbiszqzw3rpw18gnx2m8scr9vv0wif4qmk";
};
packageRequires = [ cl-print emacs stream ];
meta = {
@ -1637,10 +1637,10 @@
}) {};
paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "paced";
version = "1.0.1";
version = "1.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/paced-1.0.1.tar";
sha256 = "1y2sl3iqz2vjgkbc859sm3h9jhnrgla9ynazy9d5rql0nsb6sn8p";
url = "https://elpa.gnu.org/packages/paced-1.1.2.tar";
sha256 = "1hxbzlzmlndj2gs9n741whi7rj6vbcnxdn89lg2l0997pqmsx58y";
};
packageRequires = [ async emacs ];
meta = {

File diff suppressed because it is too large Load diff

View file

@ -611,12 +611,12 @@
ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ac-rtags";
version = "2.16";
version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@ -3775,12 +3775,12 @@
caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "caml";
version = "4.6.1pre1";
version = "4.6.1pre2";
src = fetchFromGitHub {
owner = "ocaml";
repo = "ocaml";
rev = "b50ba2e822ff3a780f9b5a323d48e40881a88fc7";
sha256 = "10im6z3nrkn0yh8004jwk68gjl0lz7qq3dpj24q50nhhqabw9ah5";
rev = "b057bd0758f63f41fd8853ee025c58368e33ed21";
sha256 = "1s066clvar4ws0mingh68jrj87dak52grs8mnd2ibcf1kf21w08q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@ -3838,12 +3838,12 @@
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
melpaBuild {
pname = "cask";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
rev = "58f641960bcb152b33fcd27d41111291702e2da6";
sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
rev = "afdd191b97e76c8393f656336699419a2b39ca1a";
sha256 = "10qiapg6kp890q8n2pamvnnpxwcgcldw20mp23pmwzh9nsvqrpbs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@ -5555,12 +5555,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
version = "2.16";
version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@ -6854,22 +6854,22 @@
license = lib.licenses.free;
};
}) {};
datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
version = "0.3.2";
version = "0.4";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
rev = "d99e56785d750d6c7e416955f047fe057fae54a6";
sha256 = "0s2pmj2wpprmdx1mppbch8i1srwhfl2pzyhsmczan75wmiblpqfj";
rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b";
sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850";
url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime";
sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj";
name = "datetime";
};
packageRequires = [ emacs ];
packageRequires = [ emacs extmap ];
meta = {
homepage = "https://melpa.org/#/datetime";
license = lib.licenses.free;
@ -7935,12 +7935,12 @@
dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dotenv-mode";
version = "0.2.1";
version = "0.2.3";
src = fetchFromGitHub {
owner = "preetpalS";
repo = "emacs-dotenv-mode";
rev = "8d45b98beb04f486eb13d71765589e7dccb8ffa9";
sha256 = "00hm097m1jn3pb6k3r2jhkhn1zaf6skcwv1v4dxlvdx8by1md49q";
rev = "574bf1e3dfa79aa836c67759d9eec904a6878c77";
sha256 = "0rx0f9vs68lbrjmzsajcxxhv6dm3wjiil12xzqg924d7fx3b1w52";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode";
@ -8103,12 +8103,12 @@
dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dtrt-indent";
version = "0.3";
version = "0.4";
src = fetchFromGitHub {
owner = "jscheid";
repo = "dtrt-indent";
rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c";
sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq";
rev = "1cca0834800e8f775a558e84fc6d4fdcb6a235d0";
sha256 = "0vq1qz12kbphl9hfsnq1v2yzsy0p6v6wi4h9b3a0iwvbya4f110l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@ -8354,12 +8354,12 @@
eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "eacl";
version = "1.0.3";
version = "1.1.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "eacl";
rev = "ef58d13fbff4b5c49f934cfb9e3fd6ee219ef4b2";
sha256 = "0xxxzdr6iddxwx8z4lfay4n9r1ry8571lj2gadz5ycff6f6bxmhb";
rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700";
sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
@ -9160,12 +9160,12 @@
elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "elbank";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Elbank";
rev = "e4b532373a32889b8ab3389bd3e726dff5dd0bcf";
sha256 = "0kqiwa5gr8q0rhr598v9p7dx88i3359j49j04crqwnc5y107s1xk";
rev = "245cbc218e94793909ecede2e0d360c7d86f3122";
sha256 = "1qcxh8v5dj2wcxxs3qcdny00p906nj33wsxyswwa4jbhh2vfxz12";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
@ -9286,12 +9286,12 @@
elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed-protocol";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "fasheng";
repo = "elfeed-protocol";
rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83";
sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591";
rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b";
sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
@ -10256,12 +10256,12 @@
epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epl";
version = "0.8";
version = "0.9";
src = fetchFromGitHub {
owner = "cask";
repo = "epl";
rev = "a76ec344a7fee3ca7e7dfb98b86ebc3b8c1a3837";
sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr";
rev = "fd906d3f92d58ecf24169055744409886ceb06ce";
sha256 = "0d3z5z90ln8ipk1yds1n1p8fj9yyh2kpspqjs7agl38indra3nb4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl";
@ -12035,6 +12035,27 @@
license = lib.licenses.free;
};
}) {};
extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "extmap";
version = "1.0";
src = fetchFromGitHub {
owner = "doublep";
repo = "extmap";
rev = "3860b69fb19c962425d4e271ee0a24547b67d323";
sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap";
sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j";
name = "extmap";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/extmap";
license = lib.licenses.free;
};
}) {};
exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
@ -12119,6 +12140,27 @@
license = lib.licenses.free;
};
}) {};
f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "f3";
version = "0.1";
src = fetchFromGitHub {
owner = "cosmicexplorer";
repo = "f3";
rev = "19120dda2d760d3dd6c6aa620121d1de0a40932d";
sha256 = "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3";
sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610";
name = "f3";
};
packageRequires = [ cl-lib emacs helm ];
meta = {
homepage = "https://melpa.org/#/f3";
license = lib.licenses.free;
};
}) {};
fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fabric";
@ -12248,16 +12290,16 @@
faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faust-mode";
version = "0.4";
version = "0.6";
src = fetchFromGitHub {
owner = "magnetophon";
owner = "rukano";
repo = "emacs-faust-mode";
rev = "85f67bc4daabe6fd8dc6f5195c470716b543faa1";
sha256 = "0rmq6ca75x47hk2bpsk1j2ja62kpplgyanpiqq4hk6q259rd4lyv";
rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c";
sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode";
sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode";
sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z";
name = "faust-mode";
};
packageRequires = [];
@ -13346,12 +13388,12 @@
flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
melpaBuild {
pname = "flycheck-rtags";
version = "2.16";
version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@ -14228,12 +14270,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
rev = "f1dc9dff6779c0ce6ab0a1c0ae349df1194a314f";
sha256 = "0j1s6qws773aq3si7pnc1xmlrh9x3v3sfdni6pnlsirv2sc7c4g9";
rev = "e2878da13e7b87a824ebd6c842e9f552369b220c";
sha256 = "091c8scwdxfrg710d1rkqad6l2y8hiw8f5jg4ayvrjm7d0s29hsa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@ -14446,12 +14488,12 @@
futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "futhark-mode";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
rev = "e574976f5d8df1089672549a913a86c4039ab2cb";
sha256 = "0p32sxswyjj22pg25i509d9a4j8k7c6xkbv55pd8jvjfxc2hdy3p";
rev = "81b858a79b29622a1db732f97225cad705c4acf5";
sha256 = "04zxal7j58whcy384sscwc7npcqdjlq01jjjn0i35pf2v7r045xy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@ -14509,12 +14551,12 @@
fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fwb-cmds";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "tarsius";
repo = "fwb-cmds";
rev = "57973f99cf4a185b5cccbf941478fad25e8428c3";
sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b";
rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710";
sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds";
@ -14947,6 +14989,27 @@
license = lib.licenses.free;
};
}) {};
git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-attr";
version = "0.0.3";
src = fetchFromGitHub {
owner = "arnested";
repo = "emacs-git-attr";
rev = "c03078637a00ea301cbcc7ae301ae928b10af889";
sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr";
sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi";
name = "git-attr";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/git-attr";
license = lib.licenses.free;
};
}) {};
git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-auto-commit-mode";
@ -15199,22 +15262,22 @@
license = lib.licenses.free;
};
}) {};
git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-timemachine";
version = "3.0";
version = "4.4";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-timemachine";
rev = "7c66a878ee89861dcd59b5dfc598520daa156052";
sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
rev = "020d02cd77df6bf6f0efd4d4c597aad2083b6302";
sha256 = "1g7gxa2snh8ya8r3wim834qszhcmpp154gnvqkc3b1gw8x7jdrql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
name = "git-timemachine";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/git-timemachine";
license = lib.licenses.free;
@ -16252,12 +16315,12 @@
grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grab-x-link";
version = "0.4.1";
version = "0.5";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "grab-x-link";
rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76";
sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1";
rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c";
sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link";
@ -18486,12 +18549,12 @@
helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
melpaBuild {
pname = "helm-rtags";
version = "2.16";
version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@ -18612,12 +18675,12 @@
helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
melpaBuild {
pname = "helm-system-packages";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-system-packages";
rev = "22ff951b092a3fbde8eadf284a24e86bb4694f6a";
sha256 = "0argxi8dppgyfljwn654a7183lva74wnnwzkk3xlrvgngmir56kp";
rev = "beb7e488454402a122b9dec9a019ea190b9b7dc3";
sha256 = "0wclsv69v84d7bknnlralham94s7iqal7aczsvfxgj97hpwgywfz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
@ -19536,12 +19599,12 @@
ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ialign";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "mkcms";
repo = "interactive-align";
rev = "1d00ab870d06b946d94e5e6d340b85a3e51fbfb1";
sha256 = "191w5di4f0in49h60xmc5d6xaisbkv8y9f9bxzc3162c4b982qfr";
rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6";
sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
@ -20394,6 +20457,27 @@
license = lib.licenses.free;
};
}) {};
info-colors = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "info-colors";
version = "0.2";
src = fetchFromGitHub {
owner = "ubolonton";
repo = "info-colors";
rev = "13dd9b6a7288e6bb692b210bcb9cd72016658dae";
sha256 = "1h2q19574sc1lrxm9k78668pwcg3z17bnbgykmah01zlmbs264sx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors";
sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x";
name = "info-colors";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/info-colors";
license = lib.licenses.free;
};
}) {};
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
@ -20942,12 +21026,12 @@
ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ivy-rtags";
version = "2.16";
version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@ -21759,12 +21843,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-themes";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "ogdenwebb";
repo = "emacs-kaolin-themes";
rev = "56bafd9b1b022ebfd98cad022792957164ec56fb";
sha256 = "02nmrdc2ldvfzyn3s9qrvq61nl93krc1vyr4ad1vkmbyqrwszyvd";
rev = "d730208cff185ee86a81f8a5a6feadfea78ab9cc";
sha256 = "0xfb8zi6jvwdivklc3lk5dzf8nnx05pm4fip44s4al6ajns8hgya";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@ -22323,6 +22407,27 @@
license = lib.licenses.free;
};
}) {};
lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lcr";
version = "0.9";
src = fetchFromGitHub {
owner = "jyp";
repo = "lcr";
rev = "3bc341205bba437c8fec4fefefaf39793c0405ae";
sha256 = "0jvdnb3fn33wq7ixb7ayrallq1j5gc9nh3i3nmy03yg11h60h1am";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr";
sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k";
name = "lcr";
};
packageRequires = [ dash emacs ];
meta = {
homepage = "https://melpa.org/#/lcr";
license = lib.licenses.free;
};
}) {};
leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
melpaBuild {
pname = "leanote";
@ -22753,12 +22858,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
version = "2.21.0";
version = "2.21.1";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0";
sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx";
rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9";
sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@ -23138,8 +23243,8 @@
sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit";
sha256 = "03cmja9rcqc9250bsp1wwv94683mrcbnz1gjn8y7v62jlfi5qws5";
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit";
sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga";
name = "magit";
};
packageRequires = [
@ -23242,12 +23347,12 @@
magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
melpaBuild {
pname = "magit-gh-pulls";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "sigma";
repo = "magit-gh-pulls";
rev = "e4a73781e3c1c7e4a09232b25e3474463cdf77b6";
sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z";
rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7";
sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls";
@ -28019,12 +28124,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
version = "0.2.4";
version = "0.3";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16";
sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi";
rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d";
sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@ -28331,6 +28436,27 @@
license = lib.licenses.free;
};
}) {};
panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "panda-theme";
version = "0.1";
src = fetchFromGitHub {
owner = "jamiecollinson";
repo = "emacs-panda-theme";
rev = "ae24179e7a8a9667b169f00dbd891257530c1d22";
sha256 = "05vv4idl9h59jd089hpd09xcy1ix30bq0c4fif2b66170aychvii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme";
sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7";
name = "panda-theme";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/panda-theme";
license = lib.licenses.free;
};
}) {};
pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pandoc";
@ -30811,6 +30937,27 @@
license = lib.licenses.free;
};
}) {};
pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "pynt";
version = "1.0.0";
src = fetchFromGitHub {
owner = "ebanner";
repo = "pynt";
rev = "bc750cd244141005ea3b7bb87f75c6f6c5a5778f";
sha256 = "0mj8lkc40iv8d6afl4dba7gsbi0mgnx9ivanvczq6pxp5d4kgfsn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt";
sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3";
name = "pynt";
};
packageRequires = [ deferred ein emacs epc helm ];
meta = {
homepage = "https://melpa.org/#/pynt";
license = lib.licenses.free;
};
}) {};
python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-environment";
@ -32206,12 +32353,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
version = "2.16";
version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@ -35248,12 +35395,12 @@
swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }:
melpaBuild {
pname = "swiper-helm";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper-helm";
rev = "f3d6dba865629eed8fb14f92dab1fad50734891b";
sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64";
rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008";
sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm";
@ -36192,12 +36339,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
version = "2.6.2";
version = "2.7.1";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
rev = "1ee2e6e5f6e22b180af08264e5654b26599f96fe";
sha256 = "0gd149vlf3297lm595xw3hc9jd45wisbrpbr505qhkffrj60q1lq";
rev = "6ca5319cdd581d323944584242a1ba45a115ee3d";
sha256 = "1jcnzx8g742pfh9nv3gcsxdj31kfpjzl202by30pzg2xz54i48gb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@ -36380,12 +36527,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
version = "0.12";
version = "0.12.1";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9";
sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia";
rev = "03a36853f141387654b7cb9217c7417db096a083";
sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@ -37118,6 +37265,27 @@
license = lib.licenses.free;
};
}) {};
usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "usql";
version = "0.0.1";
src = fetchFromGitHub {
owner = "nickbarnwell";
repo = "usql.el";
rev = "4cd8f4cf5c2e75485343321f02d621915aef10e8";
sha256 = "0cw25g8jvfjpzq3sabc3zbp0qynknzc0mq5psspcbxffk2qalbb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql";
sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84";
name = "usql";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/usql";
license = lib.licenses.free;
};
}) {};
utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "utop";
@ -38863,12 +39031,12 @@
xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xterm-color";
version = "1.6";
version = "1.7";
src = fetchFromGitHub {
owner = "atomontage";
repo = "xterm-color";
rev = "ed3d0f4ccb2b28ff034192c50f244a97197d3911";
sha256 = "0djh18lm3xn9h4fa5ra0jrlzdzwhvhcalipj73j5gmmfaif4ya9q";
rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c";
sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";

View file

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20180129";
version = "20180205";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20180129.tar";
sha256 = "0cwxqr34c77qmv7flcpd46qwkn0nzli21s3m9km00mwc8xy308n4";
url = "https://orgmode.org/elpa/org-20180205.tar";
sha256 = "03045w9pr45byrj7wqzkb6i56d4r7xykfr066qmywspk764wmfyh";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20180129";
version = "20180205";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20180129.tar";
sha256 = "1bk7jmizlvfbq2bbis3kal8nllxj752a8dkq7j68q6kfbc6w1z24";
url = "https://orgmode.org/elpa/org-plus-contrib-20180205.tar";
sha256 = "0pbs3b0miqmpjw3d6mcw61dqyy6gnpdq6m18xmkbfvk5nn9lv7i6";
};
packageRequires = [];
meta = {

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = fetchurl {
# homepage needed you to login to download the tarball
url = "http://pkgs.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
url = "http://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
+ "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2";
sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
};

View file

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
stdenv.mkDerivation {
name = "slade-git-3.1.2.2018.01.29";
src = fetchFromGitHub {
owner = "sirjuddington";
repo = "SLADE";
rev = "f7409c504b40c4962f419038db934c32688ddd2e";
sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld";
};
cmakeFlags = ["-DNO_WEBVIEW=1"];
nativeBuildInputs = [ cmake pkgconfig zip ];
buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Doom editor";
homepage = http://slade.mancubus.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ertes ];
};
}

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "vifm-${version}";
version = "0.9";
version = "0.9.1";
src = fetchurl {
url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2";
sha256 = "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b";
sha256 = "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -98,12 +98,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "28.0.0.137";
version = "28.0.0.161";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "1776jjv2abzrwhgff8c75wm9dh3gfsihv9c5vzllhdys21zvravy";
sha256 = "0xhfr2mqmg71dxnsq4x716hzkryj2dmmlzgyi8hf7s999p7x8djw";
stripRoot = false;
};

View file

@ -6,10 +6,10 @@ rec {
firefox = common rec {
pname = "firefox";
version = "58.0.1";
version = "58.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "08xgv1qm2xx5wjczqg1ldf0yqm939zsghhr4acbkwnymv5apfak3vx0kcr9iwqkmdqjdjmggxz439kjn510f92fik33zjfsjn7sd9k5";
sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f";
};
patches =

View file

@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "28.0.0.137";
version = "28.0.0.161";
src = fetchurl {
url =
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"1hj3sfrspdkhq967fmnpgamgiq90k263cqfas94gp3dzslmkingw"
"0dsgq39c2d0kkdcd9j4nddqn3qiq5pvm2r67ji4m4wyv9chn518m"
else
"1v4k6hzngm23xwxnh6ngplp2m0ga480sbcm668bpcj61krmi6xy4"
"0x26qi9qr01rppji5l4nwvmrhmq6qy83dsppbb7jqjmgyvknq5jd"
else
if arch == "x86_64" then
"0ijmrk6262a1xcf98g94vdlqxnik9f7igjy08j3a2i4b5bikq479"
"1s62gx2a9q962w3gc847x2xwlzkq4dkzbmvf74x5k5c2k2l9hhg0"
else
"10a17dba4zy29padvi3fnv2s8v71q698ffqjp8ggsla42pjyhvkh";
"1m5pcgz2w9f3jkm3hpvysc8ap20y458xnba7j51d7h7fjy6md89x";
};
nativeBuildInputs = [ unzip ];

View file

@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "28.0.0.137";
version = "28.0.0.161";
src = fetchurl {
url =
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"0xr3hf828sm0xdnmk2kavxmvzc6m0mw369khrxyfwrbxvdsibwn8"
"0934vs3c51fjz9pr846wg9xn7h2qybswayfkhz0pnzcfnng2rrf1"
else
"1wr0avjpshrj51svb1sfnshz39xxla1brqs8pbcgfgyqjh350rgn";
"0pwi7pbfldiqiwc7yfy7psyr93679r025vjxmiybs2ap69vly4v0";
};
nativeBuildInputs = [ unzip ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, kubernetes }:
{ stdenv, fetchurl, kubectl }:
let
arch = if stdenv.isLinux
then "linux-amd64"
else "darwin-amd64";
checksum = if stdenv.isLinux
then "9f04c4824fc751d6c932ae5b93f7336eae06e78315352aa80241066aa1d66c49"
else "5058142bcd6e16b7e01695a8f258d27ae0b6469caf227ddf6aa2181405e6aa8e";
then "19sbvpll947y4dxn2dj26by2bwhcxa5nbkrq7x3cikn7z5bmj7vf"
else "0jllj13jv8yil6iqi4xcs5v4z388h7i7hcnv98gc14spkyjshf3d";
pname = "helm";
version = "2.7.2";
version = "2.8.0";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs = [ ];
propagatedBuildInputs = [ kubernetes ];
propagatedBuildInputs = [ kubectl ];
phases = [ "buildPhase" "installPhase" ];

View file

@ -4,7 +4,7 @@
let
version = "4.30.2.1665";
version = "4.30.3.1670";
rpath = stdenv.lib.makeLibraryPath [
xdg_utils
@ -44,7 +44,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
sha256 = "0gk1h2p5apppw94353378b2z93c5kllhgadb91z1g3mczczsbm0n";
sha256 = "0alqzay6bvi7ybrrdk5r0xkg4sx6qjsqbgmr16bkqxncxhb215ay";
}
else
throw "HipChat is not supported on ${stdenv.system}";

View file

@ -22,15 +22,15 @@ stdenv.mkDerivation rec {
patchFlags = ["-p0"];
patches = [
(fetchurl {
url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch";
url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch";
sha256 = "0risfy8iqmkr209hmnvpv57ywbd3rvchzzd0jy2lfyqrrrm6zknw";
})
(fetchurl {
url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch";
url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch";
sha256 = "16bj0ppzqd45an154dr7sifjra7lv4m9anxfw3c56y763jq7fafa";
})
(fetchurl {
url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch";
url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch";
sha256 = "1gfp82rc7pawb5x4hh2wf7xh1l1l54ib75930xgd1y437la4703r";
})
];

View file

@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec {
src = fetchurl {
urls = [
"http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz"
"http://pkgs.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz"
"http://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz"
];
sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
};

View file

@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
# Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
(fetchpatch {
name = "SDL_SetGamma.patch";
url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
url = "http://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv";
})
# Fix a build failure on OS X Mavericks

View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
src = fetchurl {
url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
url = "http://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9";
};

View file

@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libmatthew-java-0.8";
src = fetchurl {
url = http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz;
url = http://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz;
sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85";
};
JAVA_HOME=jdk;

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patches = [(fetchurl {
name = "gcc6.patch";
url = "http://pkgs.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
url = "http://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23";
})];

View file

@ -26,15 +26,15 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91";
})
(fetchpatch {
url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7";
})
(fetchpatch {
url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh";
})
];

View file

@ -1,4 +1,4 @@
Origin: http://pkgs.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD
Origin: http://src.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD
diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml
--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600
+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600

View file

@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
# the following three patches fix CVE-2016-9577 and CVE-2016-9578
(fetchpatch {
name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch";
url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
sha256 = "11x5566lx5zyl7f39glwsgpzkxb7hpcshx8va5ab3imrns07130q";
})
(fetchpatch {
name = "0002-Prevent-integer-overflows-in-capability-checks.patch";
url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5";
})
(fetchpatch {

View file

@ -0,0 +1,21 @@
{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "fpdf";
version = "1.7.2";
src = fetchPypi {
inherit pname version;
sha256 = "0yb73c2clv581sgak5jvlvkj4wy3jav6ms5ia8jx3rw969w40n0j";
};
# No tests available
doCheck = false;
meta = {
homepage = https://github.com/reingart/pyfpdf;
description = "Simple PDF generation for Python";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ geistesk ];
};
}

View file

@ -15,14 +15,9 @@
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pecan";
version = "1.3.2";
patches = [
./python36_test_fix.patch
];
src = fetchPypi {
inherit pname version;
sha256 = "24f06cf88a488b75f433e62b33c1c97e4575d0cd91eec9eec841a81cecfd6de3";

View file

@ -1,13 +0,0 @@
diff --git a/pecan/tests/test_conf.py b/pecan/tests/test_conf.py
index 0573d84..7c98e16 100644
--- a/pecan/tests/test_conf.py
+++ b/pecan/tests/test_conf.py
@@ -157,7 +157,7 @@ class TestConf(PecanTestCase):
try:
configuration.conf_from_file(f.name)
- except (ValueError, SystemError) as e:
+ except (ValueError, SystemError, ImportError) as e:
assert 'relative import' in str(e)
else:
raise AssertionError(

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz";
url = "http://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz";
sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13";
};
patchFlags = "-p0";

View file

@ -1,39 +1,38 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree }:
{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux }:
with stdenv.lib;
let
version = "0.1.28";
src = fetchFromGitHub {
rev = "v${version}";
owner = "projectatomic";
repo = "skopeo";
sha256 = "068nwrr3nr27alravcq1sxyhdd5jjr24213vdgn1dqva3885gbi0";
};
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
in
buildGoPackage rec {
name = "skopeo-${version}";
version = "0.1.27";
rev = "v${version}";
inherit src;
goPackagePath = "github.com/projectatomic/skopeo";
excludedPackages = "integration";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree ];
buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ];
src = fetchFromGitHub {
inherit rev;
owner = "projectatomic";
repo = "skopeo";
sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g";
};
patches = [
./path.patch
];
buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}";
preBuild = ''
export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"
export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib"
'';
postInstall = ''
mkdir $bin/etc
cp -v ./go/src/github.com/projectatomic/skopeo/default-policy.json $bin/etc/default-policy.json
'';
meta = {
description = "A command line utility for various operations on container images and image repositories";
homepage = https://github.com/projectatomic/skopeo;

View file

@ -1,25 +0,0 @@
diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go
index 50e29b2..7108df5 100644
--- a/cmd/skopeo/main.go
+++ b/cmd/skopeo/main.go
@@ -3,6 +3,7 @@ package main
import (
"fmt"
"os"
+ "path/filepath"
"github.com/Sirupsen/logrus"
"github.com/containers/image/signature"
@@ -88,6 +89,11 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) {
policyPath := c.GlobalString("policy")
var policy *signature.Policy // This could be cached across calls, if we had an application context.
var err error
+ var dir string
+ if policyPath == "" {
+ dir, err = filepath.Abs(filepath.Dir(os.Args[0]))
+ policyPath = dir + "/../etc/default-policy.json"
+ }
if c.GlobalBool("insecure-policy") {
policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
} else if policyPath == "" {

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = fetchurl {
urls = [
"http://pkgs.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz"
"http://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz"
"http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz"
"http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz"
];

View file

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "doom-bcc-git-0.8.0.2018.01.04";
src = fetchFromGitHub {
owner = "wormt";
repo = "bcc";
rev = "d58b44d9f18b28fd732c27113e5607a454506d19";
sha256 = "1m83ip40ln61qrvb1fbgaqbld2xip9n3k817lwkk1936pml9zcrq";
};
enableParallelBuilding = true;
makeFlags = ["CC=cc"];
patches = [ ./bcc-warning-fix.patch ];
installPhase = ''
mkdir -p $out/{bin,lib,share/doc}
install -m755 bcc $out/bin/bcc
cp -av doc $out/share/doc/bcc
cp -av lib $out/lib/bcc
'';
meta = with stdenv.lib; {
description = "Compiler for Doom/Hexen scripts (ACS, BCS)";
homepage = https://github.com/wormt/bcc;
license = licenses.mit;
maintainers = with maintainers; [ertes];
};
}

View file

@ -0,0 +1,25 @@
From c6ac05c96b7908ccd35f3908fc0f13650b0583c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <esz@posteo.de>
Date: Sat, 3 Feb 2018 17:08:54 +0100
Subject: [PATCH] Remove -Werror
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index bbe2c75..3357d2d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ EXE=bcc
BUILD_DIR=build
CC=gcc
INCLUDE=-Isrc -I src/parse
-OPTIONS=-Wall -Werror -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \
+OPTIONS=-Wall -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \
-Wstrict-aliasing=2 -Wmissing-field-initializers -D_BSD_SOURCE \
-D_DEFAULT_SOURCE $(INCLUDE)
VERSION_FILE=$(BUILD_DIR)/version.c
--
2.15.1

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "intel2200BGFirmware-${version}";
src = fetchurl {
url = "http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
url = "http://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd";
};

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
#url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz;
url = http://pkgs.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz;
url = http://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz;
sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49";
};
patches = [./gcc46-include-fix.patch ./config-paths.patch ];

View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.15.1";
version = "4.15.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
"http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"
"http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
"http://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
];
sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0";
};

View file

@ -14,7 +14,7 @@ let
sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5";
});
in
{
rec {
# Policy: use the highest stable version as the default (on our master).
stable = generic {
version = "390.25";
@ -24,13 +24,7 @@ in
persistencedSha256 = "033azbhi50f1b0lw759sncgf7ckh2m2c0khj5v15sch9kl1fzk8i";
};
beta = generic {
version = "381.22";
sha256_32bit = "024x3c6hrivg2bkbzv1xd0585hvpa2kbn1y2gwvca7c73kpdczbv";
sha256_64bit = "13fj9ndy5rmh410d0vi2b0crfl7rbsm6rn7cwms0frdzkyhshghs";
settingsSha256 = "1gls187zfd201b29qfvwvqvl5gvp5wl9lq966vd28crwqh174jrh";
persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963";
};
beta = stable; # not enough interest to maintain beta ATM
legacy_340 = generic {

View file

@ -21,6 +21,13 @@ let
sha256 = "0fzfpx5ny7559xrxaawnylq20dvrkjiag0ypcd13frwwivrlsagy";
};
});
pytest = super.pytest.overridePythonAttrs (oldAttrs: rec {
version = "3.3.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "14zbnbn53yvrpv79ch6n02myq9b4winjkaykzi356sfqb7f3d16g";
};
});
hass-frontend = super.callPackage ./frontend.nix { };
};
};

View file

@ -18,5 +18,8 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ phreedom ehmry ];
platforms = platforms.all;
knownVulnerabilities = [
"Unmaintained upstream: https://github.com/jech/polipo/commit/4d42ca1b5849"
];
};
}
}

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
url = "http://pkgs.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
url = "http://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
};
preInstall = ''

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchurl {
urls = [
ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz
http://pkgs.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz
http://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz
];
sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
};

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
src = fetchurl rec {
url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/"
url = "http://src.fedoraproject.org/repo/pkgs/python-pyblock/"
+ "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
};

View file

@ -6,7 +6,7 @@ buildPythonApplication rec {
md5_path = "d249f60aa89b1b4facd63f776925116d";
src = fetchurl rec {
url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/"
url = "http://src.fedoraproject.org/repo/pkgs/pykickstart/"
+ "${name}.tar.gz/${md5_path}/${name}.tar.gz";
sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
};

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "1.3-4";
src = fetchurl {
url = "http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz";
url = "http://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz";
sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2";
};
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Consolidate duplicate files via hardlinks";
homepage = https://pagure.io/hardlink;
repositories.git = http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git;
repositories.git = http://src.fedoraproject.org/cgit/rpms/hardlink.git;
license = licenses.gpl2Plus;
platforms = platforms.unix;
};

View file

@ -1897,10 +1897,16 @@ with pkgs;
};
doomseeker = callPackage ../applications/misc/doomseeker { };
doom-bcc = callPackage ../games/zdoom/bcc-git.nix { };
slade = callPackage ../applications/misc/slade {
wxGTK = wxGTK30;
};
sladeUnstable = callPackage ../applications/misc/slade/git.nix {
wxGTK = wxGTK30;
};
drive = callPackage ../applications/networking/drive { };
driftnet = callPackage ../tools/networking/driftnet {};
@ -11314,7 +11320,7 @@ with pkgs;
v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
inherit (python2Packages) python gyp;
cctools = darwin.cctools;
stdenv = overrideCC stdenv gcc5;
stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5;
};
v8_6_x = callPackage ../development/libraries/v8/6_x.nix {
@ -15919,6 +15925,10 @@ with pkgs;
kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
kubectl = (kubernetes.override { components = [ "cmd/kubectl" ]; }).overrideAttrs(oldAttrs: {
name = "kubectl-${oldAttrs.version}";
});
kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
kupfer = callPackage ../applications/misc/kupfer { };

View file

@ -716,10 +716,10 @@ let self = _self // overrides; _self = with self; {
};
bignum = buildPerlPackage rec {
name = "bignum-0.47";
name = "bignum-0.49";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
sha256 = "b084eac6d676d2acc4d60deed58e6e31b2f572b7b0be1aec9b93be92bad8261a";
sha256 = "28685b271251927d327851e5951e38649524a4e50cb0d1d35d649e2b814f212d";
};
buildInputs = [ MathBigInt MathBigRat ];
meta = {
@ -2722,10 +2722,10 @@ let self = _self // overrides; _self = with self; {
};
CryptJWT = buildPerlPackage rec {
name = "Crypt-JWT-0.019";
name = "Crypt-JWT-0.020";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
sha256 = "26aaaaedc153b04bdaaba7df7ac2f7ce3bdf672c8d7111d09347a8d0c794725c";
sha256 = "0587fc11435aecbbdc19b33f774d05ff31f19750b26a3588af93f33e8000d464";
};
propagatedBuildInputs = [ CryptX JSONMaybeXS ];
meta = {
@ -4834,10 +4834,10 @@ let self = _self // overrides; _self = with self; {
};
Encode = buildPerlPackage rec {
name = "Encode-2.93";
name = "Encode-2.95";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
sha256 = "2d06b0375c84a75cf3762685e6d94c3aef25833fd0427daa0ae87b04ae6f739c";
sha256 = "d662794c6f834382527f67ca62e1715887f504cfd09e119a1302e584dd3cdcde";
};
meta = {
description = "Character encodings in Perl";
@ -12859,10 +12859,10 @@ let self = _self // overrides; _self = with self; {
};
SubQuote = buildPerlPackage rec {
name = "Sub-Quote-2.003001";
name = "Sub-Quote-2.005000";
src = fetchurl {
url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
sha256 = "9d471d8e13e7ce4793d5a5ec04a60fface14dd53be78dd94d228871915cfd1f9";
sha256 = "44b145111bee7b0001818e77f7ce587153232dbc97351f4c5ed34522372b64ff";
};
buildInputs = [ TestFatal ];
meta = {

View file

@ -4545,6 +4545,8 @@ in {
};
};
fpdf = callPackage ../development/python-modules/fpdf { };
fritzconnection = callPackage ../development/python-modules/fritzconnection { };
frozendict = buildPythonPackage rec {
@ -11346,7 +11348,7 @@ in {
patches = singleton (pkgs.fetchurl {
name = "libnotify07.patch";
url = "http://pkgs.fedoraproject.org/cgit/notify-python.git/plain/"
url = "http://src.fedoraproject.org/cgit/notify-python.git/plain/"
+ "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c";
sha256 = "1lqdli13mfb59xxbq4rbq1f0znh6xr17ljjhwmzqb79jl3dig12z";
});
@ -13342,7 +13344,7 @@ in {
md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
src = pkgs.fetchurl rec {
url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/"
url = "http://src.fedoraproject.org/repo/pkgs/python-pyblock/"
+ "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
};
@ -14011,7 +14013,7 @@ in {
md5_path = "d249f60aa89b1b4facd63f776925116d";
src = pkgs.fetchurl rec {
url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/"
url = "http://src.fedoraproject.org/repo/pkgs/pykickstart/"
+ "${name}.tar.gz/${md5_path}/${name}.tar.gz";
sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
};