JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
... mainly to fixup the go problems.
This commit is contained in:
Vladimír Čunát 2016-12-30 15:48:19 +01:00
commit ee3fb421b8
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
43 changed files with 1596 additions and 1079 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/lib/test-driver/test-driver.pl
View File

@ -8,6 +8,7 @@ use IO::Pty;
use Logger;
use Cwd;
use POSIX qw(_exit dup2);
use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
$SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
@ -179,7 +180,12 @@ END {
$log->close();
}
my $now1 = clock_gettime(CLOCK_MONOTONIC);
runTests;
my $now2 = clock_gettime(CLOCK_MONOTONIC);
printf STDERR "test script finished in %.2fs\n", $now2 - $now1;
exit ($nrSucceeded < $nrTests ? 1 : 0);

2
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -178,7 +178,7 @@ in
image. It significantly increases image size. Use that when
you want to be able to keep all the sources needed to build your
system or when you are going to install the system on a computer
with slow on non-existent network connection.
with slow or non-existent network connection.
'';
};

2
nixos/modules/services/networking/i2pd.nix
View File

@ -147,7 +147,7 @@ let
host = ${tun.address}
port = ${tun.port}
inport = ${tun.inPort}
accesslist = ${concatStringSep "," tun.accessList}
accesslist = ${builtins.concatStringsSep "," tun.accessList}
'')
}
'';

5
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -264,8 +264,7 @@ in
StandardInput = "socket";
} else {
Restart = "always";
Type = "forking";
PIDFile = "/run/sshd.pid";
Type = "simple";
});
};
@ -322,8 +321,6 @@ in
services.openssh.extraConfig = mkOrder 0
''
PidFile /run/sshd.pid
Protocol 2
UsePAM yes

4
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -440,13 +440,13 @@ in
${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
{ device = "store";
fsType = "9p";
options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
neededForBoot = true;
};
"/tmp/xchg" =
{ device = "xchg";
fsType = "9p";
options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
neededForBoot = true;
};
"/tmp/shared" =

2
nixos/tests/gnome3.nix
View File

@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : {
$machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
$machine->succeed("xauth merge ~alice/.Xauthority");
$machine->waitForWindow(qr/Terminal/);
$machine->mustSucceed("timeout 900 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'");
$machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'");
$machine->sleep(10);
$machine->screenshot("screen");
'';

23
nixos/tests/openssh.nix
View File

@ -35,6 +35,18 @@ in {
];
};
server_lazy =
{ config, pkgs, ... }:
{
services.openssh = { enable = true; startWhenNeeded = true; };
security.pam.services.sshd.limits =
[ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];
users.extraUsers.root.openssh.authorizedKeys.keys = [
snakeOilPublicKey
];
};
client =
{ config, pkgs, ... }: { };
@ -50,6 +62,8 @@ in {
subtest "manual-authkey", sub {
$server->succeed("mkdir -m 700 /root/.ssh");
$server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
$server_lazy->succeed("mkdir -m 700 /root/.ssh");
$server_lazy->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
$client->succeed("mkdir -m 700 /root/.ssh");
$client->copyFileFromHost("key", "/root/.ssh/id_ed25519");
@ -58,6 +72,10 @@ in {
$client->waitForUnit("network.target");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024");
};
subtest "configured-authkey", sub {
@ -66,6 +84,11 @@ in {
$client->succeed("ssh -o UserKnownHostsFile=/dev/null" .
" -o StrictHostKeyChecking=no -i privkey.snakeoil" .
" server true");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null" .
" -o StrictHostKeyChecking=no -i privkey.snakeoil" .
" server_lazy true");
};
'';
})

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

@ -175,10 +175,10 @@
}) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex";
version = "11.89.7";
version = "11.89.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-11.89.7.tar";
sha256 = "03sxdh6dv4m98yq09hxcph2lgidai8ky22i9acjcp6vfjlsb9mlf";
url = "https://elpa.gnu.org/packages/auctex-11.89.8.tar";
sha256 = "0rilldzb7sm7k22vfifdsnxz1an94jnn1bn8gfmqkac4g9cskl46";
};
packageRequires = [];
meta = {
@ -377,10 +377,10 @@
context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "context-coloring";
version = "8.0.1";
version = "8.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/context-coloring-8.0.1.tar";
sha256 = "0c7sb8dzx6f40hz2l6zicc0shpxj3vzsmvdxzx65c4vgvr462js2";
url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar";
sha256 = "01wm36qgxsg7lgdxkn7avzfmxcpilsmvfwz3s7y04i0sdrsjvzp4";
};
packageRequires = [ emacs ];
meta = {
@ -619,10 +619,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
version = "1.2";
version = "1.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.2.tar";
sha256 = "0sz78kn9nx390aq5wqz174p8ppw987rzsh892ly166qz4ikwys5a";
url = "https://elpa.gnu.org/packages/el-search-1.2.1.tar";
sha256 = "1a5gqcl9v0ppizz0c61rcpahym3vr52f8azp2pjvrxvkmx4sj8c1";
};
packageRequires = [ emacs stream ];
meta = {
@ -1087,10 +1087,10 @@
loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "loccur";
version = "1.2.2";
version = "1.2.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/loccur-1.2.2.el";
sha256 = "0ij5wzxysaikiccw7mjbw1sfylvih0n6b6yyp55vn8w1z2dba0xk";
url = "https://elpa.gnu.org/packages/loccur-1.2.3.el";
sha256 = "09pxp03g4pg95cpqiadyv9dz6qrwd9igrkwrhm4s38cscmqm7dzq";
};
packageRequires = [ cl-lib ];
meta = {
@ -1364,10 +1364,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20161214";
version = "20161224";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20161214.tar";
sha256 = "0pa9d0l6axif5wlzi7lvxl0fpjwwvc79cy9d37z7md4hxyjdvwzm";
url = "https://elpa.gnu.org/packages/org-20161224.tar";
sha256 = "0b10bjypn0w5ja776f8sxl1qpvb61iyz1n3c74jx6fqwypv7dmgi";
};
packageRequires = [];
meta = {

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

File diff suppressed because it is too large Load Diff

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

@ -2617,6 +2617,27 @@
license = lib.licenses.free;
};
}) {};
bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bool-flip";
version = "1.0.1";
src = fetchFromGitHub {
owner = "michaeljb";
repo = "bool-flip";
rev = "0f7cc9b387429239fb929896511727d4e49a795b";
sha256 = "1051gy7izy25jwh079231d4lh9azchbqc6nvfrkv8s9ck407a65a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip";
sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c";
name = "bool-flip";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/bool-flip";
license = lib.licenses.free;
};
}) {};
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
@ -3828,12 +3849,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
version = "5.6.0";
version = "5.6.1";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d";
sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y";
rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d";
sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@ -3849,12 +3870,12 @@
clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode-extra-font-locking";
version = "5.6.0";
version = "5.6.1";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d";
sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y";
rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d";
sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@ -5154,22 +5175,22 @@
license = lib.licenses.free;
};
}) {};
creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "creamsody-theme";
version = "0.1.3";
version = "0.3.0";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-creamsody";
rev = "41164f285735383848aba1bfef4282bca4e9a8e8";
sha256 = "0inql6g8f1nhx0k781ahm26fjpmpqq1cm3i7bf64ib9g5izjf91d";
rev = "c897adf63cfd928779d90a54366ca5bdb24d4d35";
sha256 = "0bw1p0l52fgvw2bapq9anwxzfwpwr6d2ddskzp2r2whyy0w3jc9b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7";
name = "creamsody-theme";
};
packageRequires = [];
packageRequires = [ autothemer ];
meta = {
homepage = "https://melpa.org/#/creamsody-theme";
license = lib.licenses.free;
@ -5533,12 +5554,12 @@
darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
version = "0.1.60";
version = "0.2.100";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
rev = "1a5d0dc5ae9c57bcb07085ded6fa82c3512ff80f";
sha256 = "0hz3hhkyg6m2wvffanpclc2wq7y8n63sgz726kg87iqgq2lfa096";
rev = "380fdcff12f44faf099bc5a38984d88784b495a2";
sha256 = "1pragypiv59rrvq2xjzmldkf1v007viwwcvr3f5iyv31n0bmd0cn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@ -5554,12 +5575,12 @@
dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "dart-mode";
version = "0.14";
version = "0.15";
src = fetchFromGitHub {
owner = "nex3";
repo = "dart-mode";
rev = "07edf4d4448ede128d13c27bd76cf06f5ef5bb3b";
sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs";
rev = "e6635b390235cf16a8081763768cf925ca2d9133";
sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode";
@ -7196,12 +7217,12 @@
ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ede-php-autoload";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "stevenremot";
repo = "ede-php-autoload";
rev = "c748354c6398aa7e5d3f00ee4c5422f4eca09a91";
sha256 = "1imr45s2a1lilqfgfccgxasqlmh1nkc1ivf5iq01w31wik2hii0z";
rev = "c6896c648fbc90f4d083f511353d6b165836d0e8";
sha256 = "0dfx0qiyd23jhxi0y1n4s1pk9906b91qnp25xbyiqdacs54l6d8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@ -7385,12 +7406,12 @@
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egison-mode";
version = "3.6.3";
version = "3.6.4";
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
rev = "4cf38946096c185ac794d594a791da23675297aa";
sha256 = "0k6qh99jbzirgsa3qkhcxsivncbvk5wr4yag2s9c2y9akipxivrq";
rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6";
sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@ -7887,12 +7908,12 @@
elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elpa-clone";
version = "0.0.3";
version = "0.0.4";
src = fetchFromGitHub {
owner = "dochang";
repo = "elpa-clone";
rev = "77e45f3ac7de504ff65e17dfd52bfde7bdfc78f2";
sha256 = "09q54j0n52493smhdrngn2isnifvy0x3s6vlicllkm8qykr06z9v";
rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d";
sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
@ -9314,12 +9335,12 @@
eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
melpaBuild {
pname = "eval-in-repl";
version = "0.9.2";
version = "0.9.4";
src = fetchFromGitHub {
owner = "kaz-yos";
repo = "eval-in-repl";
rev = "2b5d1bee767de4f21b14cefd7ce310f862226bd7";
sha256 = "077rj7yj6laxyhcsmrmlpg438962jv0fm2yiqx6i365fbgyx0hck";
rev = "674873139ebde439fbeecaf0fb217d54f470bc14";
sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@ -10111,12 +10132,12 @@
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
version = "0.7.2";
version = "0.7.4";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "eyebrowse";
rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9";
sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls";
rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef";
sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@ -10489,12 +10510,12 @@
firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "firestarter";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "firestarter";
rev = "4b7428477980e12578ebbbb121115696b352d6b2";
sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864";
sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter";
@ -10958,12 +10979,12 @@
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
version = "1.0.2";
version = "1.0.5";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8";
sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld";
rev = "9dbfad340090523db0b936517d8543d8aa2f2e2c";
sha256 = "0cky0zxlfajhq5kh868yh17d0pr5pqjgj8v8xhj14sbch5jvd3bz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@ -11126,12 +11147,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2";
sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw";
rev = "6e1079576d30397eefea0300bf31a248a26cf98c";
sha256 = "0c8a5bgrirf3ms6v75w4jaiwfxf1acv2isf7x02jms7m8h36bzxz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@ -11795,22 +11816,22 @@
license = lib.licenses.free;
};
}) {};
fontawesome = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "fontawesome";
version = "0.3";
version = "0.4";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-fontawesome";
rev = "ccb03b8329daa3130491c9c4d285b325dbeb5cc7";
sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc";
rev = "72b4f2f83c7fdacd225aee58f93acefc53166626";
sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome";
sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
name = "fontawesome";
};
packageRequires = [ cl-lib helm-core ];
packageRequires = [ emacs helm-core ];
meta = {
homepage = "https://melpa.org/#/fontawesome";
license = lib.licenses.free;
@ -11819,12 +11840,12 @@
forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forecast";
version = "0.4.1";
version = "0.5.0";
src = fetchFromGitHub {
owner = "cadadr";
repo = "forecast.el";
rev = "ff307fd24c64577d204d0c1b7b245f190f70bd61";
sha256 = "1x4l24cbgc4apv9cfzf6phmj5pm32hfdgv37wpbh7ml8v3p8xm0w";
rev = "8fdd0d4532b81e4bfe114fad548aeb049cd512cf";
sha256 = "0ia4k7jxx35g0kdm9z75i3sr1h91nh8fkhbllxpd9za29dw5fs7c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@ -13316,12 +13337,12 @@
go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
melpaBuild {
pname = "go-playground";
version = "1.0";
version = "1.2";
src = fetchFromGitHub {
owner = "grafov";
repo = "go-playground";
rev = "2e1497517d13d813768b3f8e25bb3cce7a449acd";
sha256 = "08ka2wlwq5v13ni8n5zd5vp4iynwcirsqdw0an20gqg0hrcvs1ba";
rev = "97be0b3a19d7b8476663c9b16148c4dfd9783cfe";
sha256 = "0wz79iwcfql8kfq5q9b0fccj9590giqlzd2kzjaj0fl89n0sx9gq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@ -13547,12 +13568,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
rev = "ab40ac7324b5d45b8f1677d87ec0d26349448d41";
sha256 = "0rb55f4yx8wpqs93xy80wn6k8pyrhj8zh3q5lbi78afgscjrgjlr";
rev = "6103db21b38cbdfda3100fed08b988fc2d83aa1a";
sha256 = "0hlqrqi1s94cr828qyfbr95np5xwr3bn98l4gv59rnqa1vmx49gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@ -13955,12 +13976,12 @@
gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
version = "0.17";
version = "0.18.0";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
rev = "89b060abf49791cad2639f234b230dc4882bdc39";
sha256 = "0bhg2za2a67r6hkb0628zvzxx65rcj7cm3kq3m44wls8q8cr2jxj";
rev = "fa9cafdaf2b126a06a0196a668c14821ceba44fa";
sha256 = "1fn0dgnharn18xs6aq202y0jyldvg12sbf67jxmxjdn20w44g1d3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@ -16243,12 +16264,12 @@
htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "htmlize";
version = "1.50";
version = "1.51";
src = fetchFromGitHub {
owner = "hniksic";
repo = "emacs-htmlize";
rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797";
sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z";
rev = "88e2cb6588827893d7bc619529393887c264d15a";
sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
@ -20097,12 +20118,12 @@
mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mb-url";
version = "0.0.9";
version = "0.1.0";
src = fetchFromGitHub {
owner = "dochang";
repo = "mb-url";
rev = "178b03d2cbc31e889c095a6c25426c297e5fe6fc";
sha256 = "0y22bn4zvyw2qivjrvwkhx96mwvfpx74901r0m4l31nvyh559aq0";
rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa";
sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url";
@ -20223,12 +20244,12 @@
mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "mentor";
version = "0.1.1";
version = "0.2";
src = fetchFromGitHub {
owner = "skangas";
repo = "mentor";
rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22";
sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky";
rev = "256c59ab8562300c8de027afaec989239ad89395";
sha256 = "0xlaanyv6k8ski6c45mrha8n4yinqvjgn6kn64mwy4n64fvlrvv5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@ -20978,12 +20999,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "msvc";
version = "1.2.2";
version = "1.3.0";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "msvc";
rev = "e7a61fa5b98a129637f970ac6db9163e330b3d02";
sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
rev = "71c38323187c98b32250b89088768599bb216ddb";
sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@ -21293,12 +21314,12 @@
nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nasm-mode";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "skeeto";
repo = "nasm-mode";
rev = "c3f5475c2f4bd930411b6d716765d094b36ce219";
sha256 = "0d8bfz41ry5bvkz2894dqkk3244n7xcjk3pf58fcsagvmmkkln7b";
rev = "d990ed94d902b74a5c834fb567e03307607cee45";
sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode";
@ -21668,11 +21689,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
version = "0.23.3";
version = "0.23.4";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
rev = "fd7f3d0829725bf9ce209cf597dfb0acd4d59b10";
sha256 = "0w1nwr7brgapnzsbp9cjcx30lk90ir5hscllpxzw44sq25ir85g5";
rev = "4dde1e677473faa6588909396820f9948e28923f";
sha256 = "14675mrlqbp2s5wdj8rs96kz7vdzv3j80d259cybp1ijvncgh1ds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@ -22196,8 +22217,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
rev = "f956929891e77ba4ce2fb1361129d5d3ebc7bb55";
sha256 = "1xds6fqs1l6q9vak3v4xlzl1w084mhz86xrnycibcwm8q3q9hmb3";
rev = "e7eaa1202486f996121cc0ef17a8d72b915c8165";
sha256 = "1f66k2l996vzf5rm2scyz4bv1cyn365a8yfh1cfq13vrmvah57xb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@ -22618,22 +22639,22 @@
license = lib.licenses.free;
};
}) {};
org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "org-jira";
version = "2.2.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
rev = "d2db2827ff030a8c11b52402adcd3a4b3050f3c1";
sha256 = "16wzrq2syk03710iklrayf4s9ap4brvlzyd4b0rya0rxy2q2rck7";
rev = "6330511011b7fe8ee04300e82f090ce3efd3b100";
sha256 = "18kwiwmq95pf8w07xl3vh2xhlkwnv53b4n6h0xq2fqprkh8n6f0l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
name = "org-jira";
};
packageRequires = [ cl-lib request ];
packageRequires = [ cl-lib emacs request ];
meta = {
homepage = "https://melpa.org/#/org-jira";
license = lib.licenses.free;
@ -22785,6 +22806,26 @@
license = lib.licenses.free;
};
}) {};
org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-password-manager";
version = "0.0.1";
src = fetchgit {
url = "https://git.leafac.com/org-password-manager";
rev = "d3a33ddfe583180bdb76cfb8bbd772e0078b24a3";
sha256 = "0pqmnhd3qdg06agj6h8v8lm4m5q8px0qmd7a1bfn6i5g2bq9zrck";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm";
name = "org-password-manager";
};
packageRequires = [ org s ];
meta = {
homepage = "https://melpa.org/#/org-password-manager";
license = lib.licenses.free;
};
}) {};
org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
melpaBuild {
pname = "org-pdfview";
@ -24586,12 +24627,12 @@
phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "phpunit";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "phpunit.el";
rev = "165ca257d4840c266e1e79e806b4b943b5785fe6";
sha256 = "1xgjhq1nxj4zfcns0q8a1kdlmqcjrxlblyj9vrspv1qck3akrp3z";
rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18";
sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@ -24775,12 +24816,12 @@
plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plantuml-mode";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "skuro";
repo = "plantuml-mode";
rev = "87417ad75b215ababf153cba533575ac0273a5db";
sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm";
rev = "eb380bac5663ec8e73482db6c6ba9d1394766eb3";
sha256 = "19zxwmn5mjbzqgk7l444h57ninrlhi22l85l9zphryx2992plf0k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
@ -26407,6 +26448,27 @@
license = lib.licenses.free;
};
}) {};
rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rebecca-theme";
version = "1.2.1";
src = fetchFromGitHub {
owner = "vic";
repo = "rebecca-theme";
rev = "239115183e0a354ccd5c2cb299893b558fbde05c";
sha256 = "0n6xf9s39frnyvchk40zzxbkn0hyga5ridkxbf50n7hr5j19yrmb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md";
name = "rebecca-theme";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/rebecca-theme";
license = lib.licenses.free;
};
}) {};
recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "recover-buffers";
@ -27103,12 +27165,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
version = "2.7";
version = "2.8";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "8b6d0cdf57c951769ead8aad1d8538308e1b6861";
sha256 = "07qjpvkhv556p3pfm1hxswky4irp7f4wxb2blcvk3s7qmqirqshj";
rev = "6ac7740eaf05cdd9b699185f71cc2d1f634a761b";
sha256 = "1w506qaklrly1lnq1i5kshl8m9aki8h2ba1y7h578gwx6lph3vhi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@ -27289,6 +27351,27 @@
license = lib.licenses.free;
};
}) {};
rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "rust-playground";
version = "0.1";
src = fetchFromGitHub {
owner = "grafov";
repo = "rust-playground";
rev = "6a23f8956bce1deaa38f52c01f5571c5cff77445";
sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground";
sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l";
name = "rust-playground";
};
packageRequires = [ emacs rust-mode ];
meta = {
homepage = "https://melpa.org/#/rust-playground";
license = lib.licenses.free;
};
}) {};
rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rvm";
@ -27352,22 +27435,22 @@
license = lib.licenses.free;
};
}) {};
sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "sage-shell-mode";
version = "0.2.1";
version = "0.3";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage-shell-mode";
rev = "2cfc3b712796d1ed22e9c8a39d24e11316aab065";
sha256 = "14wcnv78dwkxaq4g45kw0p34y5c5snscix0ar22bbryclqr929qy";
rev = "e8bc089e8dfd76f688160e2ac77aee985afeade7";
sha256 = "166plwg9ggivr3im0yfxw8k6m9ral37jzznnb06kb6g0zycb4aps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv";
name = "sage-shell-mode";
};
packageRequires = [ cl-lib deferred emacs ];
packageRequires = [ cl-lib deferred emacs let-alist ];
meta = {
homepage = "https://melpa.org/#/sage-shell-mode";
license = lib.licenses.free;
@ -27464,8 +27547,8 @@
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea";
sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm";
rev = "9b8db623b13fcb0aad9271d1fae73e1257dda13c";
sha256 = "0q41dqlhp0cds16inmh7jrvhqrnjsdiv2in6pq3f0srhwms81ff3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@ -28232,22 +28315,22 @@
license = lib.licenses.free;
};
}) {};
sl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sl";
version = "0.1.1";
version = "0.2";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "sl.el";
rev = "76a8eae2b3fc449ed81b2a577c53939434851635";
sha256 = "1nkgqva4l4nwpixavky8gm38371z7mrkpqdkgrya4j5mrx4kiw86";
rev = "51d92f820f3e93776fff6cdb9690458816888bdc";
sha256 = "1faklr7jz1s6hs1xrzhvddlibhbjbqwxsb8iz6i5c8dg9sj3hw45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl";
sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii";
name = "sl";
};
packageRequires = [ cl-lib emacs ];
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/sl";
license = lib.licenses.free;
@ -28883,22 +28966,22 @@
license = lib.licenses.free;
};
}) {};
sourcemap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sourcemap";
version = "0.2";
version = "0.3";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-sourcemap";
rev = "065a0c3bd8ca5fe6a45e8f983f932c3c9fac5db9";
sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d";
rev = "64c89d296186f48d9135fb8aad501de19f64bceb";
sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap";
sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
name = "sourcemap";
};
packageRequires = [ cl-lib emacs ];
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/sourcemap";
license = lib.licenses.free;
@ -29009,6 +29092,27 @@
license = lib.licenses.free;
};
}) {};
speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "speed-type";
version = "1.0";
src = fetchFromGitHub {
owner = "parkouss";
repo = "speed-type";
rev = "d9d98b9744e21d5e12a695096efcde288bdb5c18";
sha256 = "043ydcik23ykphbh89haagxbdn11s1b44wkziwibnb7d3r9hd8p7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06";
name = "speed-type";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/speed-type";
license = lib.licenses.free;
};
}) {};
sphinx-doc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "sphinx-doc";
@ -29201,12 +29305,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
version = "1.0.0";
version = "1.1";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
rev = "94fc9e677c864bd2c302c4842b95f7580cda6cef";
sha256 = "1zxgqlfipbympgg8i58r1pwn50fq6vb42y8fmipxy25s0j3x53k7";
rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114";
sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
@ -29346,12 +29450,12 @@
string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "string-inflection";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "akicho8";
repo = "string-inflection";
rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a";
sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0";
rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5";
sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@ -32918,12 +33022,12 @@
yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yang-mode";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "mbj4668";
repo = "yang-mode";
rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4";
sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5";
rev = "bcf698acbdb4df91f587942348739b407a8b0807";
sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";

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

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20161214";
version = "20161224";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20161214.tar";
sha256 = "1x3wvagx7437xr4lawxr24kivb661997bncq2w9iz3fkg9rrr73m";
url = "http://orgmode.org/elpa/org-20161224.tar";
sha256 = "15fnc65k5mn5ssl53z4f9nlkz5m8a59zkaripcapdcq87ys5imqm";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20161214";
version = "20161224";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20161214.tar";
sha256 = "1rc3p1cys15i9vnll946w5hlckmmbgkw22yw98mna9cwqdpc387c";
url = "http://orgmode.org/elpa/org-plus-contrib-20161224.tar";
sha256 = "1pj3h5qllhcqyqvm2kln7056m34k5flipvslnn1rvsk4iwwjlv1a";
};
packageRequires = [];
meta = {

4
pkgs/applications/editors/idea/default.nix
View File

@ -208,12 +208,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2016.3.1";
version = "2016.3.2";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "1696gfmqi76ybgi5r84kisjx9mv0hd70hsn16banw61zy4rfllhw";
sha256 = "13pd95zad29c3i9qpwhjii601ixb4dgcld0kxk3liq4zmnv6wqxa";
};
wmClass = "jetbrains-idea";
};

2
pkgs/applications/misc/urlscan/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid, pythonOlder }:
{ stdenv, buildPythonPackage, fetchFromGitHub, urwid, pythonOlder }:
buildPythonPackage rec {
name = "urlscan-${version}";

4
pkgs/applications/networking/syncthing/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, go, pkgs }:
stdenv.mkDerivation rec {
version = "0.14.15";
version = "0.14.17";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "0iq7pzb9f0vgikxxxwvrhi5rlgw9frcwy0lgvc61l6lbw3vl0rd7";
sha256 = "0l220jnm8xwfc5jrznan15290al05bim5yyy4wngj9c55av6mlzq";
};
buildInputs = [ go ];

10
pkgs/applications/office/impressive/default.nix
View File

@ -1,9 +1,9 @@
{ fetchurl, stdenv, python2Packages, makeWrapper, lib
, xpdf, mesa, freeglut }:
, xpdf, mesa, SDL, freeglut }:
let
inherit (python2Packages) python pyopengl pygame setuptools pillow;
version = "0.10.5";
version = "0.11.1";
in stdenv.mkDerivation {
# This project was formerly known as KeyJNote.
# See http://keyj.s2000.ws/?p=77 for details.
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
sha256 = "0fz1zahxlfjang53wn06svy4s4aw28c79v24gwadvjvv3h1g5wam";
sha256 = "0b3rmy6acp2vmf5nill3aknxvr9a5aawk1vnphkah61anxp62gsr";
};
# Note: We need to have `setuptools' in the path to be able to use
@ -39,13 +39,13 @@ in stdenv.mkDerivation {
# honors $LIBRARY_PATH. See
# http://python.net/crew/theller/ctypes/reference.html#id1 .
wrapProgram "$out/bin/impressive" \
--prefix PATH ":" "${xpdf}" \
--prefix PATH ":" "${xpdf}/bin" \
--prefix PYTHONPATH ":" \
${lib.concatStringsSep ":"
(map (path:
path + "/lib/${python.libPrefix}/site-packages")
[ pillow pyopengl pygame setuptools ])} \
--prefix LIBRARY_PATH ":" "${lib.makeLibraryPath [ mesa freeglut ]}"
--prefix LIBRARY_PATH ":" "${lib.makeLibraryPath [ mesa freeglut SDL ]}"
'';
meta = {

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -80,8 +80,6 @@ rec {
qgit = callPackage ./qgit { };
qgitGit = callPackage ./qgit/qgit-git.nix { };
stgit = callPackage ./stgit {
};

21
pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11, sourceFromHead }:
stdenv.mkDerivation rec {
name = "qgit-git";
meta =
{
license = stdenv.lib.licenses.gpl2;
homepage = "http://digilander.libero.it/mcostalba/";
description = "Graphical front-end to Git";
};
# REGION AUTO UPDATE: { name="qgit"; type="git"; url="git://git.kernel.org/pub/scm/qgit/qgit4.git"; }
src = sourceFromHead "qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"; sha256 = "17e4727ac68b4f2e8503289d5b6a2c042547e7be133e7f8195b79e33eab61b93"; });
# END
buildInputs = [ qt4 libXext libX11 ];
nativeBuildInputs = [ qmake4Hook ];
}

4
pkgs/build-support/vm/default.nix
View File

@ -130,7 +130,7 @@ rec {
echo "mounting Nix store..."
mkdir -p /fs${storeDir}
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose
mkdir -p /fs/tmp /fs/run /fs/var
mount -t tmpfs -o "mode=1777" none /fs/tmp
@ -139,7 +139,7 @@ rec {
echo "mounting host's temporary directory..."
mkdir -p /fs/tmp/xchg
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose
mkdir -p /fs/proc
mount -t proc none /fs/proc

8
pkgs/development/compilers/go/1.4.nix
View File

@ -9,11 +9,12 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.4.3";
version = "1.4-bootstrap-20161024";
revision = "79d85a4965ea7c46db483314c3981751909d7883";
src = fetchurl {
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
sha256 = "0rcrhb3r997dw3d02r37zp26ln4q9n77fqxbnvw04zs413md5s35";
url = "https://github.com/golang/go/archive/${revision}.tar.gz";
sha256 = "1ljbllwjysya323xxm9s792z8y9jdw19n8sj3mlc8picjclrx5xf";
};
nativeBuildInputs = [ pkgconfig ];
@ -89,7 +90,6 @@ stdenv.mkDerivation rec {
patches = [
./remove-tools-1.4.patch
./new-binutils.patch
./creds-test-1.4.patch
];

2
pkgs/development/compilers/go/1.6.nix
View File

@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
# Remove the coverage test as we have removed this utility
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
# Remove the timezone naming test
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go

2
pkgs/development/compilers/go/1.7.nix
View File

@ -66,6 +66,8 @@ stdenv.mkDerivation rec {
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
# Remove the coverage test as we have removed this utility
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
# Remove the timezone naming test
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go

12
pkgs/development/compilers/nim/default.nix
View File

@ -1,26 +1,32 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, lib, fetchurl, makeWrapper, gcc }:
stdenv.mkDerivation rec {
name = "nim-0.15.2";
name = "nim-${version}";
version = "0.15.2";
src = fetchurl {
url = "http://nim-lang.org/download/${name}.tar.xz";
sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch";
};
buildInputs = [ makeWrapper ];
buildPhase = "sh build.sh";
installPhase =
''
install -Dt "$out/bin" bin/nim
substituteInPlace install.sh --replace '$1/nim' "$out"
sh install.sh $out
wrapProgram $out/bin/nim \
--suffix PATH : ${lib.makeBinPath [ gcc ]}
'';
meta = with stdenv.lib;
{ description = "Statically typed, imperative programming language";
homepage = http://nim-lang.org/;
license = licenses.mit;
maintainers = with maintainers; [ ehmry ];
maintainers = with maintainers; [ ehmry peterhoeg ];
platforms = platforms.linux ++ platforms.darwin; # arbitrary
};
}

3
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
View File

@ -63,4 +63,7 @@ self: super: {
# https://github.com/christian-marie/xxhash/issues/3
xxhash = doJailbreak super.xxhash;
# https://github.com/Deewiant/glob/issues/8
Glob = doJailbreak super.Glob;
}

97
pkgs/development/interpreters/clisp/hg.nix Normal file
View File

@ -0,0 +1,97 @@
# there are the following linking sets:
# - boot (not installed): without modules, only used when building clisp
# - base (default): contains readline and i18n, regexp and syscalls modules
# by default
# - full: contains base plus modules in withModules
{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
, libffi
, libffcall
, coreutils
# build options
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
, dllSupport ? true
, withModules ? [
"pcre"
"rawsock"
]
++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
++ stdenv.lib.optional x11Support "clx/new-clx"
}:
assert x11Support -> (libX11 != null && libXau != null && libXt != null
&& libXpm != null && xproto != null && libXext != null && xextproto != null);
stdenv.mkDerivation rec {
v = "2.50pre20161201";
name = "clisp-${v}";
src = fetchhg {
url = "http://hg.code.sf.net/p/clisp/clisp";
rev = "536a48";
sha256 = "097igsfpn8xipnjapyf5hx6smzh04v4ncskxl747xxn6pgpq813z";
};
inherit libsigsegv gettext coreutils;
ffcallAvailable = stdenv.isLinux && (libffcall != null);
buildInputs = [libsigsegv]
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (ncurses != null) ncurses
++ stdenv.lib.optional (pcre != null) pcre
++ stdenv.lib.optional (zlib != null) zlib
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
++ stdenv.lib.optional ffcallAvailable libffcall
++ stdenv.lib.optionals x11Support [
libX11 libXau libXt libXpm xproto libXext xextproto
];
# First, replace port 9090 (rather low, can be used)
# with 64237 (much higher, IANA private area, not
# anything rememberable).
# Also remove reference to a type that disappeared from recent glibc
# (seems the correct thing to do, found no reference to any solution)
postPatch = ''
sed -e 's@9090@64237@g' -i tests/socket.tst
sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
'';
configureFlags = "builddir"
+ stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules"
+ stdenv.lib.optionalString (readline != null) " --with-readline"
# --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
+ stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi"
+ stdenv.lib.optionalString ffcallAvailable " --with-ffcall"
+ stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall"
+ stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules
+ stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS";
preBuild = ''
sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
cd builddir
'';
postInstall =
stdenv.lib.optionalString (withModules != [])
(''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
+ stdenv.lib.concatMapStrings (x: " " + x) withModules);
NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
# TODO : make mod-check fails
doCheck = false;
meta = {
description = "ANSI Common Lisp Implementation";
homepage = http://clisp.cons.org;
maintainers = with stdenv.lib.maintainers; [raskin tohl];
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
platforms = stdenv.lib.platforms.linux;
};
}

24
pkgs/development/interpreters/maude/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, unzip, makeWrapper
, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx,
{ stdenv, fetchurl, unzip, makeWrapper , flex, bison, ncurses, buddy, tecla
, libsigsegv, gmpxx, cvc4, cln
}:
let
version = "2.7";
version = "2.7.1";
fullMaude = fetchurl {
url = "https://raw.githubusercontent.com/maude-team/full-maude/master/full-maude27c.maude";
sha256 = "08bg3gn1vyjy5k69hnynpzc9s1hnrbkyv6z08y1h2j37rlc4c18y";
url = "http://maude.cs.illinois.edu/w/images/c/ca/Full-Maude-${version}.zip";
sha256 = "0y4gn7n8vh24r24vckhpkd46hb5hqsbrm4w9zr6dz4paafq12fjc";
};
in
@ -17,11 +17,13 @@ stdenv.mkDerivation rec {
name = "maude-${version}";
src = fetchurl {
url = "https://github.com/maude-team/maude/archive/v${version}-ext-hooks.tar.gz";
sha256 = "02p0snxm69rs8pvm93r91p881dw6p3bxmazr3cfw5pnxpgz0vjl0";
url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz";
sha256 = "0jskn5dm8vvbd3mlryjxdb6wfpkvyx174wk7ci9a31aylxzpr25i";
};
buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip];
buildInputs = [
flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cvc4 cln
];
hardeningDisable = [ "stackprotector" ] ++
stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ];
@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
configureFlagsArray=(
--datadir="$out/share/maude"
TECLA_LIBS="-ltecla -lncursesw"
LIBS="-lcln"
CFLAGS="-O3" CXXFLAGS="-O3"
)
'';
@ -38,11 +41,12 @@ stdenv.mkDerivation rec {
postInstall = ''
for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
install -D -m 444 ${fullMaude} $out/share/maude/full-maude.maude
unzip ${fullMaude}
install -D -m 444 full-maude.maude $out/share/maude/full-maude.maude
'';
meta = {
homepage = "http://maude.cs.uiuc.edu/";
homepage = "http://maude.cs.illinois.edu/";
description = "High-level specification language";
license = stdenv.lib.licenses.gpl2;

6
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -7,17 +7,15 @@
stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}";
version = "1.0.43";
version = "1.0.48";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
sha256 = "0sa0pkkbxxfn3h7b19yf296r5g5nqm4aqpwrkij0rq7jix9lxqj6";
sha256 = "1k73ir1w6457y9mdv2xnk8cr1y1xxhzzd4095rzvn2y7fr3zgz01";
};
patches = [ ./s3-encryption-headers.patch ];
# FIXME: might be nice to put different APIs in different outputs
# (e.g. libaws-cpp-sdk-s3.so in output "s3").
outputs = [ "out" "dev" ];

18
pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch
View File

@ -1,18 +0,0 @@
diff --git a/aws-cpp-sdk-s3-encryption/CMakeLists.txt b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
index 0a1a907..cf9ce0e 100644
--- a/aws-cpp-sdk-s3-encryption/CMakeLists.txt
+++ b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
@@ -69,9 +69,9 @@ target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
setup_install()
-install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION include/aws/s3-encryption)
-install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION include/aws/s3-encryption/materials)
-install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION include/aws/s3-encryption/handlers)
-install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION include/aws/s3-encryption/modules)
+install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption)
+install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/materials)
+install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/handlers)
+install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/modules)
do_packaging()

6
pkgs/development/libraries/opencv/3.x.nix
View File

@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch";
sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg";
})
];
]
++ lib.optional enablePython (fetchpatch { # Patch to fix FlannBasedMatcher under python
url = "https://github.com/opencv/opencv/commit/05cfe28612fd8dc8fb0ccb876df945c7b435dd26.patch";
sha256 = "0niza5lybr1ljzdkyiapr16laa468168qinpy5qn00yimnaygpm6";
});
preConfigure =
let ippicvVersion = "20151201";

10
pkgs/development/qtcreator/default.nix
View File

@ -6,17 +6,17 @@
with stdenv.lib;
let
baseVersion = "4.1";
baseVersion = "4.2";
revision = "0";
version = "${baseVersion}.${revision}";
in
stdenv.mkDerivation rec {
name = "qtcreator-${version}";
version = "${baseVersion}.${revision}";
src = fetchurl {
url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
sha256 = "00xlzw01ngza54ssmwz2ryahjlrbniy2q3p174xri1pxvcih4b21";
sha256 = "0yzj1i6hkzl9w1g8d5vidz7z6amwpj8p3cfibn9slf1sphxph18f";
};
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
preBuild = optional withDocumentation ''
ln -s ${qtbase}/share/doc $NIX_QT5_TMP/share
'';
postInstall = ''
# Install desktop file
mkdir -p "$out/share/applications"

6
pkgs/development/tools/bloaty/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, binutils, fetchgit }:
stdenv.mkDerivation rec {
version = "2016.11.16";
version = "2016.12.28";
name = "bloaty-${version}";
src = fetchgit {
url = "https://github.com/google/bloaty.git";
rev = "d040e4821ace478f9b43360acd6801aefdd323f7";
sha256 = "1qk2wgd7vzr5zy0332y9h69cwkqmy8x7qz97xpgwwnk54amm8i3k";
rev = "2234386bcee7297dfa1b6d8a5d20f95ea4ed9bb0";
sha256 = "0cfsjgbp9r16d6qi8v4k609bbhjff4vhdiapfkhr34z1cik1md4l";
fetchSubmodules = true;
};

21
pkgs/development/tools/remarshal/default.nix
View File

@ -1,20 +1,23 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ stdenv, pythonPackages, fetchFromGitHub }:
buildGoPackage rec {
name = "remarshal-${rev}";
rev = "0.3.0";
goPackagePath = "github.com/dbohdan/remarshal";
pythonPackages.buildPythonApplication rec {
name = "remarshal-${version}";
version = "0.6.0";
src = fetchFromGitHub {
rev = "v${rev}";
owner = "dbohdan";
repo = "remarshal";
sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496";
rev = "v${version}";
sha256 = "0jslawpzghv3chamrfddnyn5p5068kjxy8d38fxvi5h06qgfb4wp";
};
goDeps = ./deps.nix;
propagatedBuildInputs = with pythonPackages; [
dateutil
pytoml
pyyaml
];
meta = with lib; {
meta = with stdenv.lib; {
description = "Convert between TOML, YAML and JSON";
license = licenses.mit;
homepage = https://github.com/dbohdan/remarshal;

17
pkgs/os-specific/linux/google-authenticator/default.nix
View File

@ -1,27 +1,28 @@
{ stdenv, lib, fetchurl, pam, qrencode }:
{ stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }:
stdenv.mkDerivation rec {
name = "google-authenticator-1.0";
name = "google-authenticator-libpam-${version}";
version = "1.03";
src = fetchurl {
url = "https://google-authenticator.googlecode.com/files/libpam-${name}-source.tar.bz2";
sha1 = "017b7d89989f1624e360abe02d6b27a6298d285d";
url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7";
};
buildInputs = [ pam ];
buildInputs = [ autoreconfHook pam ];
preConfigure = ''
sed -i 's|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|' google-authenticator.c
sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c
'';
installPhase = ''
mkdir -p $out/bin $out/lib/security
cp pam_google_authenticator.so $out/lib/security
cp ./.libs/pam_google_authenticator.so $out/lib/security
cp google-authenticator $out/bin
'';
meta = with lib; {
homepage = https://code.google.com/p/google-authenticator/;
homepage = https://github.com/google/google-authenticator-libpam;
description = "Two-step verification, with pam module";
license = licenses.asl20;
maintainers = with maintainers; [ aneeshusa ];

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -175,4 +175,13 @@ rec {
};
};
p9_caching_4_4 = rec
{ name = "9p-caching.patch";
patch = fetchpatch {
inherit name;
url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
};
};
}

3
pkgs/tools/filesystems/ceph/generic.nix
View File

@ -285,6 +285,9 @@ stdenv.mkDerivation {
license = licenses.lgpl21;
maintainers = with maintainers; [ ak wkennington ];
platforms = platforms.unix;
# Broken because of https://lwn.net/Vulnerabilities/709844/
# and our version is quite out of date.
broken = true;
};
passthru.version = version;

20
pkgs/tools/networking/dnscrypt-proxy/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, libsodium, pkgconfig, systemd }:
{ stdenv, fetchurl, pkgconfig, libsodium, systemd }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "dnscrypt-proxy-${version}";
version = "1.7.0";
version = "1.9.0";
src = fetchurl {
url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
sha256 = "1qw2nib0d5ia8581lbdnjxgn9c7pf2qw8vhpnnh1wjcjj3gpgbqx";
sha256 = "0v5rsn9zdakzn6rcf2qhjqfd2y4h8q0hj4xr5hwhvaskg213rsyp";
};
configureFlags = optional stdenv.isLinux "--with-systemd";
@ -17,7 +17,19 @@ stdenv.mkDerivation rec {
buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd;
outputs = [ "out" "man" ];
postInstall = ''
# Previous versions required libtool files to load plugins; they are
# now strictly optional.
rm $out/lib/dnscrypt-proxy/*.la
# The installation ends up copying the same sample configuration
# into $out/etc twice, with the expectation that one of them will be
# edited by the user. Since we can't modify the file, it makes more
# sense to move only a single copy to the doc directory.
mkdir -p $out/share/doc/dnscrypt-proxy
mv $out/etc/dnscrypt-proxy.conf.example $out/share/doc/dnscrypt-proxy/
rm -rf $out/etc
'';
meta = {
description = "A tool for securing communications between a client and a DNS resolver";

37
pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
View File

@ -1,37 +0,0 @@
diff --git a/kex.c b/kex.c
index 50c7a0f..823668b 100644
--- a/kex.c
+++ b/kex.c
@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt)
ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
if ((r = sshpkt_get_end(ssh)) != 0)
return r;
+ if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
+ return r;
kex->done = 1;
sshbuf_reset(kex->peer);
/* sshbuf_reset(kex->my); */
diff --git a/packet.c b/packet.c
index d6dad2d..f96566b 100644
--- a/packet.c
+++ b/packet.c
@@ -38,7 +38,7 @@
*/
#include "includes.h"
-
+
#include <sys/param.h> /* MIN roundup */
#include <sys/types.h>
#include "openbsd-compat/sys-queue.h"
@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
return r;
return SSH_ERR_PROTOCOL_ERROR;
}
- if (*typep == SSH2_MSG_NEWKEYS)
- r = ssh_set_newkeys(ssh, MODE_IN);
- else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
+ if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
r = ssh_packet_enable_delayed_compress(ssh);
else
r = 0;

12
pkgs/tools/networking/openssh/default.nix
View File

@ -19,8 +19,10 @@ let
# **please** update this patch when you update to a new openssh release.
gssapiSrc = fetchpatch {
url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=477bb7636238c106f8cd7c868a8c0c5eabcfb3db";
sha256 = "1kcx2rw6z7y591vr60ww2m2civ0cx6f6awdpi66p1sric9b65si3";
name = "openssh-gssapi.patch";
url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian"
+ "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa";
sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2";
};
in
@ -29,11 +31,11 @@ stdenv.mkDerivation rec {
# Please ensure that openssh_with_kerberos still builds when
# bumping the version here!
name = "openssh-${version}";
version = "7.3p1";
version = "7.4p1";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
sha256 = "1k5y1wi29d47cgizbryxrhc1fbjsba2x8l5mqfa9b9nadnd9iyrz";
sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv";
};
prePatch = optionalString hpnSupport
@ -44,13 +46,11 @@ stdenv.mkDerivation rec {
patches =
[
./RH-1380296-NEWKEYS-null-pointer-deref.patch
./locale_archive.patch
./fix-host-key-algorithms-plus.patch
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./dont_create_privsep_path.patch
./fix-CVE-2016-8858.patch
]
++ optional withGssapiPatches gssapiSrc;

11
pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
View File

@ -1,11 +0,0 @@
diff -u -r1.126 -r1.127
--- ssh/kex.c 2016/09/28 21:44:52 1.126
+++ ssh/kex.c 2016/10/10 19:28:48 1.127
@@ -461,6 +461,7 @@
if (kex == NULL)
return SSH_ERR_INVALID_ARGUMENT;
+ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
ptr = sshpkt_ptr(ssh, &dlen);
if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
return r;

17
pkgs/tools/security/enpass/default.nix
View File

@ -1,7 +1,8 @@
{stdenv, system, fetchurl, dpkg, openssl, xorg
, glib, mesa, libpulseaudio, zlib, dbus, fontconfig, freetype
, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig
, makeWrapper , makeDesktopItem, python, pythonPackages, lib}:
, makeWrapper , makeDesktopItem, python, pythonPackages, lib
, libredirect, lsof}:
assert system == "i686-linux" || system == "x86_64-linux";
let
all_data = (with builtins; fromJSON (readFile ./data.json));
@ -66,21 +67,27 @@ let
cp -r opt/Enpass/* $out
cp -r usr/* $out
rm $out/bin/runenpass.sh
cp $out/bin/EnpassHelper/EnpassHelper{,.untampered}
sed \
-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
$out/share/applications/enpass.desktop
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
$out/bin/Enpass
for i in $out/bin/{Enpass,EnpassHelper/EnpassHelper}; do
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i
done
# The helper's sha256 sum must match, hence the use of libredirect.
# Also, lsof must be in the path for proper operation.
wrapProgram $out/bin/Enpass \
--set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \
--set QT_PLUGIN_PATH "$out/plugins" \
--set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
--set HIDE_TOOLBAR_LINE 0
--set HIDE_TOOLBAR_LINE 0 \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered" \
--prefix PATH : ${lsof}/bin
'';
};
updater = {

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

@ -5437,6 +5437,7 @@ in
ceptre = callPackage ../development/interpreters/ceptre { };
clisp = callPackage ../development/interpreters/clisp { };
clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };
# compatibility issues in 2.47 - at list 2.44.1 is known good
# for sbcl bootstrap.
@ -6454,9 +6455,7 @@ in
premake = premake4;
qtcreator = qt5.callPackage ../development/qtcreator {
withDocumentation = false; # 'true' is currently broken with qt>=5.5
};
qtcreator = qt5.callPackage ../development/qtcreator { };
r10k = callPackage ../tools/system/r10k { };
@ -11070,6 +11069,7 @@ in
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.4"
kernelPatches.p9_caching_4_4
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu

22
pkgs/top-level/python-packages.nix
View File

@ -31649,6 +31649,28 @@ EOF
};
};
pytoml = buildPythonPackage rec {
name = "pytoml-${version}";
version = "0.1.11";
checkPhase = "${python.interpreter} test/test.py";
# fetchgit used to ensure test submodule is available
src = pkgs.fetchgit {
url = "${meta.homepage}.git";
rev = "refs/tags/v${version}";
sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j";
};
meta = {
description = "A TOML parser/writer for Python";
homepage = https://github.com/avakar/pytoml;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
};
ROPGadget = buildPythonPackage rec {
name = "ROPGadget-5.4";
src = pkgs.fetchurl {

86
pkgs/top-level/release-cross.nix
View File

@ -1,5 +1,7 @@
with import ./release-lib.nix { supportedSystems = []; };
with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; };
let
lib = import ../../lib;
nativePlatforms = linux;
/* Basic list of packages to cross-build */
@ -20,10 +22,44 @@ let
basic = basicCrossDrv // basicNativeDrv;
in
(
{
# These `nativeDrv`s should be identical to their vanilla ones --- cross
# compiling should not affect the native derivation.
ensureUnaffected = let
# Absurd values are fine here, as we are not building anything. In fact,
# there probably a good idea to try to be "more parametric" --- i.e. avoid
# any special casing.
crossSystem = {
config = "foosys";
libc = "foolibc";
};
# Converting to a string (drv path) before checking equality is probably a
# good idea lest there be some irrelevant pass-through debug attrs that
# cause false negatives.
testEqualOne = path: system: let
f = attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs));
in assert f { inherit system; } == f { inherit system crossSystem; }; true;
testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path);
mapTestEqual = lib.mapAttrsRecursive testEqual;
in mapTestEqual {
boehmgc = nativePlatforms;
libffi = nativePlatforms;
libiconv = nativePlatforms;
libtool = nativePlatforms;
zlib = nativePlatforms;
readline = nativePlatforms;
libxml2 = nativePlatforms;
guile = nativePlatforms;
};
/* Test some cross builds to the Sheevaplug */
let
crossSheevaplugLinux = let
crossSystem = {
config = "armv5tel-unknown-linux-gnueabi";
bigEndian = false;
@ -34,25 +70,20 @@ let
libc = "glibc";
openssl.system = "linux-generic32";
};
in {
crossSheevaplugLinux = mapTestOnCross crossSystem (
basic //
{
in mapTestOnCross crossSystem (basic // {
ubootSheevaplug.crossDrv = nativePlatforms;
});
}) // (
/* Test some cross builds on 32 bit mingw-w64 */
let
crossMingw32 = let
crossSystem = {
config = "i686-w64-mingw32";
arch = "x86"; # Irrelevant
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {};
};
in {
crossMingw32 = mapTestOnCross crossSystem {
in mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms;
boehmgc.crossDrv = nativePlatforms;
gmp.crossDrv = nativePlatforms;
@ -62,10 +93,10 @@ in {
libunistring.crossDrv = nativePlatforms;
windows.wxMSW.crossDrv = nativePlatforms;
};
}) // (
/* Test some cross builds on 64 bit mingw-w64 */
let
crossMingwW64 = let
crossSystem = {
# That's the triplet they use in the mingw-w64 docs.
config = "x86_64-w64-mingw32";
@ -73,8 +104,7 @@ let
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {};
};
in {
crossMingwW64 = mapTestOnCross crossSystem {
in mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms;
boehmgc.crossDrv = nativePlatforms;
gmp.crossDrv = nativePlatforms;
@ -84,10 +114,10 @@ in {
libunistring.crossDrv = nativePlatforms;
windows.wxMSW.crossDrv = nativePlatforms;
};
}) // (
/* Linux on the fuloong */
let
fuloongminipc = let
crossSystem = {
config = "mips64el-unknown-linux";
bigEndian = false;
@ -111,17 +141,15 @@ let
abi = "n32";
};
};
in {
fuloongminipc = mapTestOnCross crossSystem {
in mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms;
ed.crossDrv = nativePlatforms;
patch.crossDrv = nativePlatforms;
};
}) // (
/* Linux on Raspberrypi */
let
rpi = let
crossSystem = {
config = "armv6l-unknown-linux-gnueabi";
bigEndian = false;
@ -139,8 +167,7 @@ let
abi = "aapcs-linux";
};
};
in {
rpi = mapTestOnCross crossSystem {
in mapTestOnCross crossSystem {
coreutils.crossDrv = nativePlatforms;
ed.crossDrv = nativePlatforms;
patch.crossDrv = nativePlatforms;
@ -152,13 +179,12 @@ in {
binutils.crossDrv = nativePlatforms;
mpg123.crossDrv = nativePlatforms;
};
}) // (
/* Cross-built bootstrap tools for every supported platform */
let
bootstrapTools = let
tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
maintainers = [ pkgs.lib.maintainers.dezgeg ];
mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist);
in {
bootstrapTools = pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools;
})
in pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools;
}

12
pkgs/top-level/release-lib.nix
View File

@ -46,23 +46,23 @@ rec {
interested in the result of cross building a package. */
crossMaintainers = [ maintainers.viric ];
forAllSupportedSystems = systems: f:
genAttrs (filter (x: elem x supportedSystems) systems) f;
/* Build a package on the given set of platforms. The function `f'
is called for each supported platform with Nixpkgs for that
platform as an argument . We return an attribute set containing
a derivation for each supported platform, i.e. ‘{ x86_64-linux =
f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */
testOn = systems: f: genAttrs
(filter (x: elem x supportedSystems) systems) (system: hydraJob' (f (pkgsFor system)));
testOn = systems: f: forAllSupportedSystems systems
(system: hydraJob' (f (pkgsFor system)));
/* Similar to the testOn function, but with an additional
'crossSystem' parameter for allPackages, defining the target
platform for cross builds. */
testOnCross = crossSystem: systems: f: {system ? builtins.currentSystem}:
if elem system systems
then f (allPackages { inherit system crossSystem; })
else {};
testOnCross = crossSystem: systems: f: forAllSupportedSystems systems
(system: hydraJob' (f (allPackages { inherit system crossSystem; })));
/* Given a nested set where the leaf nodes are lists of platforms,