alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' into staging

Browse source 
* master: (80 commits)
  lkl: Supports aarch64
  wimlib: nitpicks
  gitAndTools.git-codeowners: 0.1.1 -> 0.1.2
  wimlib: init at 1.12.0
  kernel: improve modDirVersion error message
  releaseTools.sourceTarball: Clean up temporary files
  dotnetPackages.SmartIrc4net: rehash source
  migmix: make it a fixed-output derivation
  vm: Create /dev/full
  samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275
  microcodeIntel: 20170707 -> 20171117
  sshd: Remove ripemd160 MACs
  kernel config: Enable MEDIA_CONTROLLER
  linux: 4.4.99 -> 4.4.100
  linux: 4.9.63 -> 4.9.64
  nix-bash-completions: 0.4 -> 0.5
  linux: 4.14 -> 4.14.1
  linux: 4.13.14 -> 4.13.15
  nix-zsh-completions: 0.3.3 -> 0.3.5
  dns-root-data: use a stable URL that I maintain anyway
  ...
This commit is contained in:
Orivej Desh 2017-11-21 22:48:36 +00:00
parent 71a2a5ae40 91d2cf9642
commit b8e1e7191e
81 changed files with 6014 additions and 2341 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/maintainers.nix
View file

@ -415,6 +415,7 @@
michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
midchildan = "midchildan <midchildan+nix@gmail.com>";
mikefaille = "Michaël Faille <michael@faille.io>";
mikoim = "Eshin Kunishima <ek@esh.ink>";
miltador = "Vasiliy Solovey <miltador@yandex.ua>";
mimadrid = "Miguel Madrid <mimadrid@ucm.es>";
mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";

23
nixos/doc/manual/release-notes/rl-1803.xml
View file

@ -72,6 +72,29 @@ following incompatible changes:</para>
<option>services.pgmanage</option>.
</para>
</listitem>
<listitem>
<para>
<emphasis role="strong">
The OpenSSH service no longer enables support for DSA keys by default,
which could cause a system lock out. Update your keys or, unfavorably,
re-enable DSA support manually.
</emphasis>
</para>
<para>
DSA support was
<link xlink:href="https://www.openssh.com/legacy.html">deprecated in OpenSSH 7.0</link>,
due to it being too weak. To re-enable support, add
<literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your
<option>services.openssh.extraConfig</option>.
</para>
<para>
After updating the keys to be stronger, anyone still on a pre-17.03
version is safe to jump to 17.03, as vetted
<link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
</para>
</listitem>
</itemizedlist>
</section>

5
nixos/modules/programs/bash/bash.nix
View file

@ -197,8 +197,9 @@ in
fi
'';
# Configuration for readline in bash.
environment.etc."inputrc".source = ./inputrc;
# Configuration for readline in bash. We use "option default"
# priority to allow user override using both .text and .source.
environment.etc."inputrc".source = mkOptionDefault ./inputrc;
users.defaultUserShell = mkDefault pkgs.bashInteractive;

26
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -54,8 +54,6 @@ let
));
in listToAttrs (map mkAuthKeyFile usersWithKeys);
supportOldHostKeys = !versionAtLeast config.system.stateVersion "15.07";
in
{
@ -191,9 +189,6 @@ in
default =
[ { type = "rsa"; bits = 4096; path = "/etc/ssh/ssh_host_rsa_key"; }
{ type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
] ++ optionals supportOldHostKeys
[ { type = "dsa"; path = "/etc/ssh/ssh_host_dsa_key"; }
{ type = "ecdsa"; bits = 521; path = "/etc/ssh/ssh_host_ecdsa_key"; }
];
description = ''
NixOS can automatically generate SSH host keys. This option
@ -363,14 +358,21 @@ in
HostKey ${k.path}
'')}
# Allow DSA client keys for now. (These were deprecated
# in OpenSSH 7.0.)
PubkeyAcceptedKeyTypes +ssh-dss
### Recommended settings from both:
# https://stribika.github.io/2015/01/04/secure-secure-shell.html
# and
# https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29
# Re-enable DSA host keys for now.
${optionalString supportOldHostKeys ''
HostKeyAlgorithms +ssh-dss
''}
KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
# 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;

3
pkgs/applications/altcoins/default.nix
View file

@ -32,9 +32,6 @@ rec {
};
go-ethereum-classic = callPackage ./go-ethereum-classic { };
hivemind = callPackage ./hivemind.nix { withGui = true; };
hivemindd = callPackage ./hivemind.nix { withGui = false; };
litecoin = callPackage ./litecoin.nix { withGui = true; };
litecoind = callPackage ./litecoin.nix { withGui = false; };

39
pkgs/applications/altcoins/hivemind.nix
View file

@ -1,39 +0,0 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
, withGui }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "hivemind" + (toString (optional (!withGui) "d")) + "-" + version;
version = "unstable";
src = fetchFromGitHub {
owner = "bitcoin-hivemind";
repo = "hivemind";
rev = "147973cfe76867410578d91d6f0a8df105cab4e0";
sha256 = "1ndqqma1b0sh2gn7cl8d9fg44q0g2g42jr2y0nifkjgfjn3c7l5h";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib
miniupnpc protobuf libevent]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qt4 qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
"--with-incompatible-bdb"
] ++ optionals withGui [ "--with-gui=qt4" ];
meta = {
description = "Peer-to-Peer oracle protocol";
longDescription= ''
Hivemind is a Peer-to-Peer Oracle Protocol which absorbs accurate data
into a blockchain so that Bitcoin-users can speculate in Prediction
Markets.
'';
homepage = https://bitcoinhivemind.com;
maintainers = with maintainers; [ canndrew ];
license = licenses.mit;
platforms = platforms.unix;
};
}

2
pkgs/applications/audio/deadbeef/default.nix
View file

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2";
sha256 = "0rwdxxn7h94vlgblbkswyvj6pm82488v8x5nrmlrcsbzjjf2pccw";
sha256 = "1168hgr1nf27pf24n1rlfh1kx1wiscwhpbhqw0rprwy203gsnqwa";
};
buildInputs = with stdenv.lib; [ jansson ]

4
pkgs/applications/audio/mopidy-iris/default.nix
View file

@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec {
name = "mopidy-iris-${version}";
version = "3.6.1";
version = "3.8.2";
src = pythonPackages.fetchPypi {
inherit version;
pname = "Mopidy-Iris";
sha256 = "1mfi3qx7pvfq4rz0py39lnbzv7sq703b6k6mypzhj1gdzbisfn46";
sha256 = "051bzs8p2zz960mi9cmv51q1fmmm15nnb9apph9icicr0p8g7lif";
};
propagatedBuildInputs = [

3
pkgs/applications/audio/tomahawk/default.nix
View file

@ -47,10 +47,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A multi-source music player";
description = "A multi-source music player (unmaintained)";
homepage = http://tomahawk-player.org/;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.aszlig ];
};
}

18
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View file

@ -755,10 +755,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
version = "1.3.2";
version = "1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.3.2.tar";
sha256 = "0lf0hk2pvy9yrb02sa3bg0hipshbgl9m4hx7db46jvmz5bf15nfq";
url = "https://elpa.gnu.org/packages/el-search-1.4.tar";
sha256 = "0fzsq1wdkb94dk67ligdwc7kyl0x9bifgl2qvvf0hsj4zws4pgjg";
};
packageRequires = [ emacs stream ];
meta = {
@ -1053,10 +1053,10 @@
}) {};
hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "hyperbole";
version = "6.0.2";
version = "7.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hyperbole-6.0.2.tar";
sha256 = "0nyihi7j2061jpdzl4mf4pki840hkfpwj0m2sqz0nqxd689ckwpg";
url = "https://elpa.gnu.org/packages/hyperbole-7.0.0.tar";
sha256 = "07cy40yfxwka1r6i01pgrf9a3n9ms5xw2x486jd803dhfkm3113b";
};
packageRequires = [ emacs ];
meta = {
@ -1570,10 +1570,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20171113";
version = "20171120";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20171113.tar";
sha256 = "0yynbzxbsjv0z12ydjgz81ysbg2irq37d9pzar8wspdjij15dypb";
url = "https://elpa.gnu.org/packages/org-20171120.tar";
sha256 = "0hxy061g1qd77pvx8mq5rb9avx139x4z5nmjhdq518xhg7kxmq6a";
};
packageRequires = [];
meta = {

1
pkgs/applications/editors/emacs-modes/elpa-packages.nix
View file

@ -39,6 +39,7 @@ self:
el-search = markBroken super.el-search; # requires emacs-25
iterators = markBroken super.iterators; # requires emacs-25
midi-kbd = markBroken super.midi-kbd; # requires emacs-25
rcirc-menu = markBroken super.rcirc-menu; # Missing file header
stream = markBroken super.stream; # requires emacs-25
cl-lib = null; # builtin
tle = null; # builtin

1317
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View file

File diff suppressed because it is too large Load diff

3
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file

@ -147,6 +147,9 @@ self:
# upstream issue: missing file footer
seoul256-theme = markBroken super.seoul256-theme;
# bad dependencies
shm = markBroken super.shm;
spaceline = super.spaceline.override {
inherit (self.melpaPackages) powerline;
};

244
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View file

@ -3857,12 +3857,12 @@
cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cbm";
version = "0.5";
version = "0.6";
src = fetchFromGitHub {
owner = "akermu";
repo = "cbm.el";
rev = "bf8cbbcef82e4643c5f0399f0198f606275af08c";
sha256 = "1p88fx90xwjk7dmd5gmbqyajyxf859kjsjzqmzljwai91skbb3pm";
rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31";
sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm";
@ -5210,6 +5210,27 @@
license = lib.licenses.free;
};
}) {};
company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-eshell-autosuggest";
version = "1.0.1";
src = fetchFromGitHub {
owner = "dieggsy";
repo = "company-eshell-autosuggest";
rev = "a1de14ae79c720fa681fafa000b2650c42cf5050";
sha256 = "1l4fc6crkm1yhbcidrdi19dirnyhjdfdyyz67s6va1i0v3gx0w6w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest";
sha256 = "1bpjyr01rwl58fypfhzzml69wx7h2a044s4l58cxl3fw8lbjb13f";
name = "company-eshell-autosuggest";
};
packageRequires = [ company emacs ];
meta = {
homepage = "https://melpa.org/#/company-eshell-autosuggest";
license = lib.licenses.free;
};
}) {};
company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
melpaBuild {
pname = "company-ghc";
@ -5975,12 +5996,12 @@
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-etags";
version = "1.3.3";
version = "1.3.5";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-etags";
rev = "ad70ab89861d17b648a798c234153269eacf90b5";
sha256 = "0jzk5sdh6kax1gvrdrldvqlbgbsx8p938qnzn1mpkd2nmjga3v3c";
rev = "ec56d4650ad11cd0cf8c7e168d9d6a5dfd9cdae8";
sha256 = "0xmjsa5ic4hh9lrkblf6si7q7s6xcnvs83rnpj5an23jxg7r12ma";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@ -8144,12 +8165,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
version = "2.0.16";
version = "2.1.17";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
rev = "6fcbdcbbbfeb3939d2bd3848f83fe7c702294ad8";
sha256 = "0g486p9rhjc10mywxz7wizqwqcmi0wm7j4igxi85002ls958m7sm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -8627,12 +8648,12 @@
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egison-mode";
version = "3.7.0";
version = "3.7.3";
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
rev = "accb84375895946f0d0bed3917e0193074bd4131";
sha256 = "0adxbjbmph186amkyhyl9syypfawarxmyk80zz4c0b6bgxy15rc1";
rev = "269e2e0c38d8ac0eef636954ebfd980b93be4438";
sha256 = "1v7rsp24lhryc5swi1415vmvgzgcrx997kyiqr7qsk5nvzxxfzw3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@ -8989,6 +9010,27 @@
license = lib.licenses.free;
};
}) {};
elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed-protocol";
version = "0.4.0";
src = fetchFromGitHub {
owner = "fasheng";
repo = "elfeed-protocol";
rev = "bc1913e4275b69ac69e93981bf575a2053ef1657";
sha256 = "04zn1lww8zcfi2anrkyfmgg55r40wfrj9qvpzh9xl9l2qcsbs4pk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi";
name = "elfeed-protocol";
};
packageRequires = [ cl-lib elfeed emacs ];
meta = {
homepage = "https://melpa.org/#/elfeed-protocol";
license = lib.licenses.free;
};
}) {};
elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "elfeed-web";
@ -10170,12 +10212,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
version = "20.1.5";
version = "20.1.6";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
rev = "84f29ab803e8f36ef058a47f4c2b224f4dd58220";
sha256 = "02y02m5cv29nr6icih7f5772657swnwan279scgcw02wm9lnm0vh";
rev = "f021a71ad8ffd2d1f5548927944d2b08935511d1";
sha256 = "05fb4cxsz1q0vpfjdzga7ghmr8fhlk4b93d1768wibhc3q3xqk2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -11489,6 +11531,27 @@
license = lib.licenses.free;
};
}) {};
exato = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
melpaBuild {
pname = "exato";
version = "0.0.3";
src = fetchFromGitHub {
owner = "ninrod";
repo = "exato";
rev = "082a2f7bb0afe38f5faede87d306049239d8eb95";
sha256 = "0gzyadh6bwzh6qkji0iijwld3l6p30jd8wfhw3ps4gg55w9ymb97";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn";
name = "exato";
};
packageRequires = [ evil thingatpt-plus ];
meta = {
homepage = "https://melpa.org/#/exato";
license = lib.licenses.free;
};
}) {};
exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exec-path-from-shell";
@ -11973,12 +12036,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
version = "5.4.3";
version = "5.4.4";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663";
sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v";
rev = "8eedc930ec7fb187ebc3cec284e213054545db09";
sha256 = "0b8j1i1bshd4774c581lkc55vz4waz1c10pcdxa2vwgiaccjjnmz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@ -13983,12 +14046,12 @@
futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "futhark-mode";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
rev = "2a7d824f7265a35bb928bf4de8e46d02e0a56a12";
sha256 = "0dkx9xl39k0bcspyx37410rb5ngphw9svinwjw1kgq0pqhc2qxdf";
rev = "e574976f5d8df1089672549a913a86c4039ab2cb";
sha256 = "0p32sxswyjj22pg25i509d9a4j8k7c6xkbv55pd8jvjfxc2hdy3p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@ -14109,12 +14172,12 @@
gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gams-mode";
version = "6.2";
version = "6.3";
src = fetchFromGitHub {
owner = "ShiroTakeda";
repo = "gams-mode";
rev = "ce51aa1afec78bf96aedb4badf33463383b7593e";
sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5";
rev = "900e1788695d91dde2a3d7fee97681a3380285de";
sha256 = "1lix0x2gj6lrcx6imr5w3scyix99526fwpx0vzs1dzxfzglscjja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
@ -16134,12 +16197,12 @@
gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
version = "1.12.0";
version = "1.22.1";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
rev = "e57f494fd94e49321a6396f530b8a13bae8b57df";
sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly";
rev = "b6d93d25faff573a7f7712bc33fce1fe422473e0";
sha256 = "1j8ivqhzrz5kaq1as4s5vljjpan8adqdc5s2ms8p3p83b2kg55si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@ -19367,12 +19430,12 @@
iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iflipb";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "jrosdahl";
repo = "iflipb";
rev = "2e0d1719abeec7982341761ee5dabb01574e6862";
sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a";
sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
@ -20666,12 +20729,12 @@
jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jq-mode";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "ljos";
repo = "jq-mode";
rev = "3237634ab42566eb50f54e4b7f3896ffd20a8e53";
sha256 = "063j0kfp2ybaw5r9hvn9rrksh874xpm9xvpiycv33lf7kdsp5lh3";
rev = "8384a1926cc22000e5e42f86f28d807fd6149f8e";
sha256 = "0fa84jln0vddrc218s8scz6hx12ym0wimh6dm58wqxias7gm9fgk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
@ -22122,12 +22185,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
version = "2.19.0";
version = "2.19.1";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
rev = "f5da8df21ae2aa704ddca4473b6f9400ba12d30c";
sha256 = "1w0xc0bc5jl0q9yi9jhvy4xgdyrz9l402v9qv8mmrp2iqf5cdblm";
rev = "b6627fdd25fe6d866fe5a53c8bf7923ffd8ab9f9";
sha256 = "1z17z58rp65qln6lv2l390df2bf6dpnrqdh0q352r4wqzzki8gqn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@ -23416,7 +23479,7 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
version = "3.0.4";
version = "3.0.5";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
@ -25683,8 +25746,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
rev = "ad4a19c60f7dc3d52a5b11febdcc9b78930a1e7d";
sha256 = "0jc2ap9l0cc636kssld1bqalbriib57sw1rzz45s8r19jqa8w5gm";
rev = "af6039f5c02dc4664ce2baa96c1a6a1e5c7a61bb";
sha256 = "0cx1r7cl3jd0wr424xkf10y2rqngl8zcidyy04xw71ghfj79zhnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@ -26215,12 +26278,12 @@
org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "org-jira";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
rev = "ab86b343634acaaa04b81ecea511a38e975977d1";
sha256 = "19sd42w91gzhd0qxgymi09ms0kn6yhv3kdpky1n6l5mkpbv3kp39";
rev = "9315d871556ebe92e766544ff5210dc85ad1ef33";
sha256 = "03ddwdzby0s3km0a3dmn6mfdp2zsiqyrddvpp8mgj77rb039g08k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@ -27996,12 +28059,12 @@
pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "pastery";
version = "0.1.15";
version = "0.2.1";
src = fetchFromGitHub {
owner = "diasbruno";
repo = "pastery.el";
rev = "245779100e7d1c1a10b67fe7b9055343d3a8229c";
sha256 = "1wn53ncs0nivmdqlryvidqkksky8w4ymmfsqm1ha62jkxcwqf26h";
rev = "4493be98b743b4d062cb4e00760125e394a55022";
sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery";
@ -29596,12 +29659,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
version = "3.4.1";
version = "3.5.0";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
rev = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9";
sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
rev = "2761122b810fe8861004ae785cc3ab39f384d342";
sha256 = "01z3p947hyzi3p42fiqnx6lskz4inqw89lp2agqj9wfyfvag3369";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@ -33143,12 +33206,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
version = "1.10.1";
version = "1.11.0";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
rev = "7841b2f02a1a99e1cb166d595f24f16a514ccbb5";
sha256 = "062g6y8an4kvfym2w56qy2iqd4ngxdxba38136ph0ckkzl0yrl7l";
rev = "4873352b5d0a1c5142658122de1b6950b8fe7e4d";
sha256 = "0zij2f2rjjym98w68jkp10n1ckpfprlkk217c3fg16hz5nq4vnm6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@ -33668,12 +33731,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
version = "3.0.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
rev = "e220a0c0c478fee0be3622442651981cdd82090c";
sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
rev = "0ca89a2186ac35d7323ac45c0bea2e1c9ecd61ea";
sha256 = "0a0vy1pg9s6vh3z52bahhcls9b5p4hhqi075cqsif0ld2l4a4am2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@ -34088,12 +34151,12 @@
string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "string-inflection";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "akicho8";
repo = "string-inflection";
rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5";
sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5";
rev = "a150e7bdda60b7824d3a936750ce23f73b0e4edd";
sha256 = "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@ -35346,12 +35409,12 @@
tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tickscript-mode";
version = "0.4";
version = "0.4.1";
src = fetchFromGitHub {
owner = "msherry";
repo = "tickscript-mode";
rev = "9acf389dd055ae77c92170802769838810472490";
sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8";
rev = "6e7564593d7735acc9f3fa670ec6512991cb73a1";
sha256 = "173zk9nzjds0rkypmaq8xv5qianivgk16jpzgk0msdsn9kjbd8s9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
@ -35576,16 +35639,16 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
version = "1.12.3";
version = "1.13.3";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c";
sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd";
rev = "9e12a68018e23ee10e8db48789f7358ed5375390";
sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a";
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a";
name = "treemacs";
};
packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ];
@ -35597,16 +35660,16 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
version = "1.12.3";
version = "1.13.3";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c";
sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd";
rev = "9e12a68018e23ee10e8db48789f7358ed5375390";
sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3";
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
sha256 = "1b02dybvp2fs9n1f80gpnqaxic45wwykny7vdyfay11ds5xzfpsg";
name = "treemacs-evil";
};
packageRequires = [ evil treemacs ];
@ -35618,16 +35681,16 @@
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
melpaBuild {
pname = "treemacs-projectile";
version = "1.12.3";
version = "1.13.3";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c";
sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd";
rev = "9e12a68018e23ee10e8db48789f7358ed5375390";
sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld";
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
sha256 = "0q3rj0g03423ql0d1ssp928x5f4540kxqlg51584aw57dlyy2z3n";
name = "treemacs-projectile";
};
packageRequires = [ projectile treemacs ];
@ -35636,6 +35699,27 @@
license = lib.licenses.free;
};
}) {};
treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "treepy";
version = "1.0.0";
src = fetchFromGitHub {
owner = "volrath";
repo = "treepy.el";
rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7";
sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72";
name = "treepy";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/treepy";
license = lib.licenses.free;
};
}) {};
trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "trr";
@ -37007,22 +37091,22 @@
license = lib.licenses.free;
};
}) {};
websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "websocket";
version = "1.8";
version = "1.9";
src = fetchFromGitHub {
owner = "ahyatt";
repo = "emacs-websocket";
rev = "a9b8e74fa190024cd450ef4f832482e8438674fa";
sha256 = "0yi6g7wmjsgv0dmpyf8cpin0icw3ymb7vbr3f9s01xs2w6kp8p13";
rev = "7d2adf218743c52578c8e8fd5584a5e54732e256";
sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
name = "websocket";
};
packageRequires = [];
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/websocket";
license = lib.licenses.free;

3
pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
View file

@ -119,6 +119,9 @@ self:
# missing OCaml
ocp-indent = markBroken super.ocp-indent;
# upstream issue: missing file header
po-mode = markBroken super.po-mode;
# upstream issue: truncated file
powershell = markBroken super.powershell;

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 = "20171113";
version = "20171120";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20171113.tar";
sha256 = "0lip21hxq912ya2cgfls3c4clks9knsf2cma9dabbdkiz9jmw1xq";
url = "http://orgmode.org/elpa/org-20171120.tar";
sha256 = "1xpfs0bz5lb4jmzd0kk5mgl2yfk0hb6hk788x9rn7i1n1dnz4mdy";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20171113";
version = "20171120";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20171113.tar";
sha256 = "1yy24rgdfvs99rj0zi74djb7l4wmj3w1i6m6j8z6xkqnhixwg5w7";
url = "http://orgmode.org/elpa/org-plus-contrib-20171120.tar";
sha256 = "1ivrdxfvxiqj3ydc9d9vmh8wcb4ydavrn9mprx74kg4g084v9y26";
};
packageRequires = [];
meta = {

37
pkgs/applications/editors/neovim/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
, libtool, libuv, luaPackages, ncurses, perl, pkgconfig
, unibilium, makeWrapper, vimUtils, xsel, gperf
, unibilium, makeWrapper, vimUtils, xsel, gperf, callPackage
, withPython ? true, pythonPackages, extraPythonPackages ? []
, withPython3 ? true, python3Packages, extraPython3Packages ? []
, withJemalloc ? true, jemalloc
, withRuby ? true, bundlerEnv
, withRuby ? true, bundlerEnv, ruby
, withPyGUI ? false
, vimAlias ? false
@ -48,10 +48,11 @@ let
rubyEnv = bundlerEnv {
name = "neovim-ruby-env";
gemdir = ./ruby_provider;
postBuild = ''
ln -s ${ruby}/bin/* $out/bin
'';
};
rubyWrapper = ''--suffix PATH : \"${rubyEnv}/bin\" '' +
''--suffix GEM_HOME : \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" '';
rubyWrapper = ''--cmd \"let g:ruby_host_prog='$out/bin/nvim-ruby'\" '';
pluginPythonPackages = if configure == null then [] else builtins.concatLists
(map ({ pythonDependencies ? [], ...}: pythonDependencies)
@ -74,10 +75,14 @@ let
ignoreCollisions = true;
};
python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '';
pythonFlags = optionalString (withPython || withPython3) ''--add-flags "${
(optionalString withPython pythonWrapper) +
(optionalString withPython3 python3Wrapper)
}"'';
additionalFlags =
optionalString (withPython || withPython3 || withRuby)
''--add-flags "${(optionalString withPython pythonWrapper) +
(optionalString withPython3 python3Wrapper) +
(optionalString withRuby rubyWrapper)}" --unset PYTHONPATH '' +
optionalString (withRuby)
''--suffix PATH : \"${rubyEnv}/bin\" --set GEM_HOME \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" '';
neovim = stdenv.mkDerivation rec {
name = "neovim-${version}";
@ -128,21 +133,23 @@ let
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
'';
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
echo patching $out/bin/nvim
postInstall = stdenv.lib.optionalString stdenv.isLinux ''
sed -i -e "s|'xsel|'${xsel}/bin/xsel|" $out/share/nvim/runtime/autoload/provider/clipboard.vim
'' + stdenv.lib.optionalString (withJemalloc && stdenv.isDarwin) ''
install_name_tool -change libjemalloc.1.dylib \
${jemalloc}/lib/libjemalloc.1.dylib \
$out/bin/nvim
sed -i -e "s|'xsel|'${xsel}/bin/xsel|" $out/share/nvim/runtime/autoload/provider/clipboard.vim
'' + optionalString withPython ''
ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
'' + optionalString withPython3 ''
ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3
'' + optionalString withPython3 ''
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
'' + optionalString withPyGUI ''
makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \
--prefix PATH : "$out/bin"
'' + optionalString withPython3 ''
ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3
'' + optionalString (withPython || withPython3 || withRuby) ''
wrapProgram $out/bin/nvim ${rubyWrapper + pythonFlags}
wrapProgram $out/bin/nvim ${additionalFlags}
'';
meta = {

4
pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
View file

@ -2,8 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
msgpack (1.1.0)
neovim (0.5.1)
multi_json (1.12.2)
neovim (0.6.1)
msgpack (~> 1.0)
multi_json (~> 1.0)
PLATFORMS
ruby

16
pkgs/applications/editors/neovim/ruby_provider/gemset.nix
View file

@ -7,13 +7,21 @@
};
version = "1.1.0";
};
neovim = {
dependencies = ["msgpack"];
multi_json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08xn7r4g13wl4bhvkmp4hx3x0ppvifs1x2iiqh8jl9f1jb4jhfcp";
sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
type = "gem";
};
version = "0.5.1";
version = "1.12.2";
};
neovim = {
dependencies = ["msgpack" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dnv2pdl8lwwy4av8bqc6kdlgxw88dmajm4fkdk6hc7qdx1sw234";
type = "gem";
};
version = "0.6.1";
};
}

1
pkgs/applications/kde/default.nix
View file

@ -127,6 +127,7 @@ let
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};
kruler = callPackage ./kruler.nix {};
ktnef = callPackage ./ktnef.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
libgravatar = callPackage ./libgravatar.nix {};

17
pkgs/applications/kde/kruler.nix Normal file
View file

@ -0,0 +1,17 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
knotifications, kwindowsystem, kxmlgui, qtx11extras
}:
mkDerivation {
name = "kruler";
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.vandenoever ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kwindowsystem knotifications kxmlgui qtx11extras
];
}

6
pkgs/applications/misc/rescuetime/default.nix
View file

@ -5,18 +5,18 @@ let
if stdenv.system == "i686-linux" then fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
sha256 = "0nkbi05pr5kznj4vjqhsrxcqdmjdf2zsbirslxgm4jbh87skl6fm";
sha256 = "06q1jwqsrjvlj820dd4vl80jznwafsqshsg0p6si8qx4721blryz";
} else fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
sha256 = "1xjwaqz0gs12ndgw7c2f1nkvj0nqcl0bxhd54pwk0dwrx9pn9avz";
sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab";
};
in
stdenv.mkDerivation {
# https://www.rescuetime.com/updates/linux_release_notes.html
name = "rescuetime-2.9.11.1300";
name = "rescuetime-2.10.0.1322";
inherit src;
buildInputs = [ dpkg makeWrapper ];
unpackPhase = ''

4
pkgs/applications/misc/sdcv/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib gettext readline ];
preInstall = ''
touch locale
mkdir locale
'';
NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
description = "Console version of StarDict";
maintainers = with maintainers; [ lovek323 ];
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

7
pkgs/applications/misc/xiphos/default.nix
View file

@ -8,20 +8,21 @@
, gtkhtml, libglade, scrollkeeper
, webkitgtk
, dbus_glib, enchant, isocodes, libuuid, icu
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "xiphos-${version}";
version = "4.0.6";
version = "4.0.7";
src = fetchFromGitHub {
owner = "crosswire";
repo = "xiphos";
rev = "${version}";
sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f";
sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt
sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];

30
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -8,21 +8,28 @@
, google_talk_plugin, fribid, gnome3/*.gnome_shell*/
, esteidfirefoxplugin
, vlc_npapi
, browserpass
, libudev
, kerberos
}:
## configurability of the wrapper itself
browser:
{ browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
, name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
, desktopName ? # browserName with first letter capitalized
(lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
, nameSuffix ? ""
, icon ? browserName
}:
let
wrapper =
{ browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
, name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
, desktopName ? # browserName with first letter capitalized
(lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
, nameSuffix ? ""
, icon ? browserName
, extraPlugins ? []
, extraNativeMessagingHosts ? []
}:
let
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false;
ffmpegSupport = browser.ffmpegSupport or false;
@ -46,9 +53,12 @@ let
++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
++ lib.optional (cfg.enableVLC or false) vlc_npapi
++ extraPlugins
);
nativeMessagingHosts =
([ ]
++ lib.optional (cfg.enableBrowserpass or false) browserpass
++ extraNativeMessagingHosts
);
libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
++ lib.optional gssSupport kerberos
@ -59,7 +69,7 @@ let
gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
gtk_modules = [ libcanberra_gtk2 ];
in stdenv.mkDerivation {
in stdenv.mkDerivation {
inherit name;
desktopItem = makeDesktopItem {
@ -152,4 +162,6 @@ in stdenv.mkDerivation {
hydraPlatforms = [];
priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
};
}
};
in
lib.makeOverridable wrapper

21
pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix Normal file
View file

@ -0,0 +1,21 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/docker/machine";
fetch = {
type = "git";
url = "https://github.com/docker/machine";
rev = "5b274558ea6ca822c06dd407a4e774a0105c3f60";
sha256 = "1wdq9h4bx7awgclh969gvmcnl9jvgv7ldfklnclh5iv47mi7q22d";
};
}
{
goPackagePath = "github.com/zchee/libhyperkit";
fetch = {
type = "git";
url = "https://github.com/zchee/libhyperkit";
rev = "1a19a7693fac32b46ec6cdd22da6fbec974447fc";
sha256 = "119f5gcl24znwnmi837jk667asd3lirx32jldpd4mbyb3sm9nz24";
};
}
]

27
pkgs/applications/networking/cluster/docker-machine/xhyve.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }:
buildGoPackage rec {
name = "docker-machine-xhyve-${version}";
version = "0.3.3";
goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
goDeps = ./xhyve-deps.nix;
src = fetchFromGitHub {
rev = "v${version}";
owner = "zchee";
repo = "docker-machine-driver-xhyve";
sha256 = "0rj6pyqp4yv4j28bglqjs95rip5i77vv8mrkmqv1rxrsl3i8aqqy";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ Hypervisor vmnet ];
meta = with stdenv.lib; {
homepage = https://github.com/zchee/docker-machine-driver-xhyve;
description = "Xhyve driver for docker-machine.";
license = licenses.bsd3;
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;
};
}

6
pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
View file

@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
name = "git-codeowners-${version}";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "softprops";
repo = "git-codeowners";
rev = "v${version}";
sha256 = "0imxbi6y1165bi2rik0n98v79fkgp8alb615qh41idg1p2krzyy5";
sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
};
cargoSha256 = "0h831rf5vlvpzfm4sr3fvwlc0ys776fqis90y414mczphkxvz437";
cargoSha256 = "0rdmv9s86xba1zkl2j5rgix6k7pkkxqmpar03sak2fjrd7mh8iz0";
meta = with lib; {
homepage = "https://github.com/softprops/git-codeowners";

83
pkgs/applications/virtualization/docker/default.nix
View file

@ -13,18 +13,8 @@ rec {
, runcRev, runcSha256
, containerdRev, containerdSha256
, tiniRev, tiniSha256
} : stdenv.mkDerivation rec {
inherit version rev;
name = "docker-${version}";
src = fetchFromGitHub {
owner = "docker";
repo = "docker-ce";
rev = "v${version}";
sha256 = sha256;
};
} :
let
docker-runc = runc.overrideAttrs (oldAttrs: rec {
name = "docker-runc";
src = fetchFromGitHub {
@ -36,6 +26,7 @@ rec {
# docker/runc already include these patches / are not applicable
patches = [];
});
docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
name = "docker-containerd";
src = fetchFromGitHub {
@ -51,6 +42,7 @@ rec {
mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/
'' + oldAttrs.preBuild;
});
docker-tini = tini.overrideAttrs (oldAttrs: rec {
name = "docker-init";
src = fetchFromGitHub {
@ -68,17 +60,10 @@ rec {
"-DMINIMAL=ON"
];
});
in
stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) rec {
# Optimizations break compilation of libseccomp c bindings
hardeningDisable = [ "fortify" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
makeWrapper removeReferencesTo go-md2man go
sqlite devicemapper btrfs-progs systemd libtool libseccomp
];
dontStrip = true;
inherit docker-runc docker-containerd docker-proxy docker-tini;
DOCKER_BUILDTAGS = []
++ optional (systemd != null) [ "journald" ]
@ -86,14 +71,38 @@ rec {
++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"
++ optional (libseccomp != null) "seccomp";
buildPhase = ''
}) // rec {
inherit version rev;
name = "docker-${version}";
src = fetchFromGitHub {
owner = "docker";
repo = "docker-ce";
rev = "v${version}";
sha256 = sha256;
};
# Optimizations break compilation of libseccomp c bindings
hardeningDisable = [ "fortify" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
makeWrapper removeReferencesTo go-md2man go libtool
] ++ optionals (stdenv.isLinux) [
sqlite devicemapper btrfs-progs systemd libtool libseccomp
];
dontStrip = true;
buildPhase = (optionalString (stdenv.isLinux) ''
# build engine
cd ./components/engine
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${rev}"
./hack/make.sh dynbinary
cd -
'') + ''
# build cli
cd ./components/cli
# Mimic AUTO_GOPATH
@ -110,27 +119,24 @@ rec {
# systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
patchPhase = ''
substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" ""
'' + optionalString (stdenv.isLinux) ''
patchShebangs .
substituteInPlace ./components/engine/hack/make.sh --replace libsystemd-journal libsystemd
substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" ""
'';
outputs = ["out" "man"];
extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ];
installPhase = ''
install -Dm755 ./components/cli/docker $out/libexec/docker/docker
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]);
installPhase = optionalString (stdenv.isLinux) ''
if [ -d "./components/engine/bundles/${version}" ]; then
install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
else
install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
fi
makeWrapper $out/libexec/docker/docker $out/bin/docker \
--prefix PATH : "$out/libexec/docker:$extraPath"
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
--prefix PATH : "$out/libexec/docker:$extraPath"
@ -143,6 +149,11 @@ rec {
# systemd
install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
'' + ''
install -Dm755 ./components/cli/docker $out/libexec/docker/docker
makeWrapper $out/libexec/docker/docker $out/bin/docker \
--prefix PATH : "$out/libexec/docker:$extraPath"
# completion (cli)
install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker
@ -174,17 +185,19 @@ rec {
'';
preFixup = ''
find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' +
find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' +
'' + optionalString (stdenv.isLinux) ''
find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' +
'';
meta = {
homepage = https://www.docker.com/;
description = "An open source project to pack, ship and run any application as a lightweight container";
license = licenses.asl20;
maintainers = with maintainers; [ nequissimus offline tailhook vdemeester ];
platforms = platforms.linux;
};
maintainers = with maintainers; [ nequissimus offline tailhook vdemeester periklis ];
platforms = with platforms; linux ++ darwin;
};
});
# Get revisions from
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits

2
pkgs/applications/virtualization/lkl/default.nix
View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
overhead
'';
homepage = https://github.com/lkl/linux/;
platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it
platforms = [ "x86_64-linux" "aarch64-linux" ]; # Darwin probably works too but I haven't tested it
license = licenses.gpl2;
maintainers = with maintainers; [ copumpkin ];
};

1
pkgs/build-support/release/source-tarball.nix
View file

@ -94,6 +94,7 @@ stdenv.mkDerivation (
touch now
touch -d "1970-01-01 00:00:00 UTC" then
find $sourceRoot ! -newer then -print0 | xargs -0r touch --reference now
rm now then
eval "$nextPostUnpack"
'';

1
pkgs/build-support/vm/default.nix
View file

@ -64,6 +64,7 @@ rec {
''
mknod -m 666 ${dev}/null c 1 3
mknod -m 666 ${dev}/zero c 1 5
mknod -m 666 ${dev}/full c 1 7
mknod -m 666 ${dev}/random c 1 8
mknod -m 666 ${dev}/urandom c 1 9
mknod -m 666 ${dev}/tty c 5 0

44
pkgs/data/fonts/migmix/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "migmix-${version}";
version = "20150712";
srcs = [
(fetchzip {
url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1p-${version}.zip";
sha256 = "0wp44axcalaak04nj3dgpx0vk13nqa3ihx2vjv4acsgv83x8ciph";
})
(fetchzip {
url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2p-${version}.zip";
sha256 = "0y7s3rbxrp5bv56qgihk8b847lqgibfhn2wlkzx7z655fbzdgxw9";
})
(fetchzip {
url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1m-${version}.zip";
sha256 = "1sfym0chy8ilyd9sr3mjc0bf63vc33p05ynpdc11miivxn4qsshx";
})
(fetchzip {
url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2m-${version}.zip";
sha256 = "0hg04rvm39fh4my4akmv4rhfc14s3ipz2aw718h505k9hppkhkch";
})
];
unpackPhase = ":";
installPhase = ''
mkdir -p $out/share/fonts/truetype/migmix
find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migmix
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1fhh8wg6lxwrnsg9rl4ihffl0bsp1wqa5gps9fx60kr6j9wpvmbg";
meta = with stdenv.lib; {
description = "A high-quality Japanese font based on M+ fonts and IPA fonts";
homepage = http://mix-mplus-ipa.osdn.jp/migmix;
license = licenses.ipa;
platforms = platforms.unix;
maintainers = [ maintainers.mikoim ];
};
}

10
pkgs/data/misc/dns-root-data/default.nix
View file

@ -3,7 +3,13 @@
let
rootHints = fetchurl {
url = "https://www.internic.net/domain/named.root";
# Original source https://www.internic.net/domain/named.root
# occasionally suffers from pointless hash changes,
# and having stable sources for older versions has advantages, too.
urls = map (prefix: prefix + "cc5e14a264912/etc/root.hints") [
"https://gitlab.labs.nic.cz/knot/knot-resolver/raw/"
"https://raw.githubusercontent.com/CZ-NIC/knot-resolver/"
];
sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl";
};
@ -24,6 +30,6 @@ stdenv.mkDerivation {
meta = with lib; {
description = "DNS root data including root zone and DNSSEC key";
maintainers = with maintainers; [ fpletz ];
maintainers = with maintainers; [ fpletz vcunat ];
};
}

8
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -152,7 +152,7 @@ self: super: {
extraLibraries = [ pkgs.openblasCompat ];
});
LambdaHack = super.LambdaHack.override { sdl2-ttf = super.sdl2-ttf_2_0_1; };
LambdaHack = super.LambdaHack.override { sdl2-ttf = super.sdl2-ttf_2_0_2; };
# The Haddock phase fails for one reason or another.
acme-one = dontHaddock super.acme-one;
@ -957,12 +957,6 @@ self: super: {
optparse-applicative = self.optparse-applicative_0_14_0_0;
});
# Break "hpack >=0.17.0 && <0.19".
stack = doJailbreak super.stack;
# https://github.com/mgajda/json-autotype/issues/15
json-autotype = doJailbreak super.json-autotype;
# Depends on broken fluid.
fluid-idl-http-client = markBroken super.fluid-idl-http-client;
fluid-idl-scotty = markBroken super.fluid-idl-scotty;

72
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 9.13
# LTS Haskell 9.14
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -466,10 +466,10 @@ default-package-overrides:
- cryptohash-cryptoapi ==0.1.4
- cryptohash-md5 ==0.11.100.1
- cryptohash-sha1 ==0.11.100.1
- cryptohash-sha256 ==0.11.100.1
- cryptohash-sha256 ==0.11.101.0
- cryptohash-sha512 ==0.11.100.1
- cryptonite ==0.23
- cryptonite-conduit ==0.2.0
- cryptonite-conduit ==0.2.2
- cryptonite-openssl ==0.6
- crypto-pubkey-types ==0.4.3
- crypto-random ==0.0.9
@ -585,7 +585,7 @@ default-package-overrides:
- dotenv ==0.3.4.0
- dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.2.0
- download ==0.3.2.5
- download ==0.3.2.6
- dpor ==0.2.0.0
- drawille ==0.1.2.0
- DRBG ==0.5.5
@ -973,7 +973,7 @@ default-package-overrides:
- hashtables ==1.2.2.1
- haskeline ==0.7.4.0
- haskell-gi ==0.20.3
- haskell-gi-base ==0.20.4
- haskell-gi-base ==0.20.5
- haskell-gi-overloading ==1.0
- haskell-import-graph ==1.0.3
- haskell-lexer ==1.0.1
@ -1027,7 +1027,7 @@ default-package-overrides:
- hebrew-time ==0.1.1
- hedgehog ==0.5
- hedgehog-quickcheck ==0.1
- hedis ==0.9.11
- hedis ==0.9.12
- here ==1.2.11
- heredoc ==0.2.0.0
- heterocephalus ==1.0.5.1
@ -1072,6 +1072,7 @@ default-package-overrides:
- hourglass ==0.2.10
- hourglass-orphans ==0.1.0.0
- hp2pretty ==0.8.0.2
- hpack ==0.18.1
- hpc-coveralls ==1.0.10
- hPDB ==1.2.0.9
- hPDB-examples ==1.2.0.7
@ -1093,8 +1094,8 @@ default-package-overrides:
- hsebaysdk ==0.4.0.0
- hse-cpp ==0.2
- hsemail ==2
- HSet ==0.0.1
- hset ==2.2.0
- HSet ==0.0.1
- hsexif ==0.6.1.4
- hs-GeoIP ==0.3
- hsignal ==0.2.7.5
@ -1139,10 +1140,10 @@ default-package-overrides:
- html-conduit ==1.2.1.2
- html-email-validate ==0.2.0.0
- htoml ==1.0.0.3
- HTTP ==4000.3.7
- HTTP ==4000.3.8
- http2 ==1.6.3
- http-api-data ==0.3.7.1
- http-client ==0.5.7.0
- http-client ==0.5.7.1
- http-client-openssl ==0.2.1.1
- http-client-tls ==0.3.5.1
- http-common ==0.8.2.0
@ -1218,7 +1219,7 @@ default-package-overrides:
- intero ==0.1.23
- interpolate ==0.1.1
- interpolatedstring-perl6 ==1.0.0
- interpolation ==0.1.0.1
- interpolation ==0.1.0.2
- IntervalMap ==0.5.3.1
- intervals ==0.8.1
- intro ==0.3.0.1
@ -1424,7 +1425,7 @@ default-package-overrides:
- mime-mail ==0.4.14
- mime-mail-ses ==0.3.2.3
- mime-types ==0.1.0.7
- minio-hs ==0.3.1
- minio-hs ==0.3.2
- mintty ==0.1.1
- miso ==0.4.0.0
- missing-foreign ==0.1.1
@ -1615,7 +1616,7 @@ default-package-overrides:
- partial-order ==0.1.2.1
- patat ==0.5.2.2
- path ==0.5.13
- path-extra ==0.0.5
- path-extra ==0.0.6
- path-io ==1.2.2
- path-pieces ==0.2.1
- pathtype ==0.8
@ -1737,7 +1738,7 @@ default-package-overrides:
- prometheus-metrics-ghc ==0.2.0
- prompt ==0.1.1.2
- protobuf ==0.2.1.1
- protobuf-simple ==0.1.0.4
- protobuf-simple ==0.1.0.5
- protocol-buffers ==2.4.5
- protocol-buffers-descriptor ==2.4.5
- proto-lens ==0.2.1.0
@ -2010,7 +2011,7 @@ default-package-overrides:
- Spock-lucid ==0.4.0.1
- Spock-worker ==0.3.1.0
- spool ==0.1
- spreadsheet ==0.1.3.5
- spreadsheet ==0.1.3.6
- sqlite-simple ==0.4.14.0
- sqlite-simple-errors ==0.6.0.0
- sql-words ==0.1.5.1
@ -2101,7 +2102,7 @@ default-package-overrides:
- tar-conduit ==0.1.1
- tardis ==0.4.1.0
- tasty ==0.11.3
- tasty-ant-xml ==1.1.0
- tasty-ant-xml ==1.1.1
- tasty-auto ==0.2.0.0
- tasty-dejafu ==0.6.0.0
- tasty-discover ==3.0.2
@ -2457,7 +2458,7 @@ default-package-overrides:
- xturtle ==0.2.0.0
- yackage ==0.8.1
- yahoo-finance-api ==0.2.0.2
- yaml ==0.8.24
- yaml ==0.8.25
- Yampa ==0.10.6.2
- YampaSynth ==0.2
- yesod ==1.4.5
@ -2852,7 +2853,27 @@ dont-distribute-packages:
amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-athena: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-batch: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-clouddirectory: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-cloudhsmv2: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-codestar: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-cur: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-dynamodb-dax: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-glue: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-greengrass: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-lex-models: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-lex-runtime: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-marketplace-entitlement: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-mechanicalturk: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-migrationhub: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-mobile: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-organizations: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-pricing: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-resourcegroupstagging: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-waf-regional: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-workdocs: [ i686-linux, x86_64-linux, x86_64-darwin ]
amby: [ i686-linux, x86_64-linux, x86_64-darwin ]
AMI: [ i686-linux, x86_64-linux, x86_64-darwin ]
ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2867,6 +2888,7 @@ dont-distribute-packages:
angel: [ i686-linux, x86_64-linux, x86_64-darwin ]
angle: [ i686-linux, x86_64-linux, x86_64-darwin ]
Animas: [ i686-linux, x86_64-linux, x86_64-darwin ]
animate: [ i686-linux, x86_64-linux, x86_64-darwin ]
annah: [ i686-linux, x86_64-linux, x86_64-darwin ]
Annotations: [ i686-linux, x86_64-linux, x86_64-darwin ]
anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2892,6 +2914,7 @@ dont-distribute-packages:
apiary-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
apiary-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
apiary-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ]
apiary-redis: [ i686-linux, x86_64-linux, x86_64-darwin ]
apiary-session: [ i686-linux, x86_64-linux, x86_64-darwin ]
apiary-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ]
apiary: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3341,6 +3364,7 @@ dont-distribute-packages:
categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ]
category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ]
category: [ i686-linux, x86_64-linux, x86_64-darwin ]
catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ]
cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3637,6 +3661,7 @@ dont-distribute-packages:
courier: [ i686-linux, x86_64-linux, x86_64-darwin ]
court: [ i686-linux, x86_64-linux, x86_64-darwin ]
coverage: [ i686-linux, x86_64-linux, x86_64-darwin ]
cparsing: [ i686-linux, x86_64-linux, x86_64-darwin ]
CPBrainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ]
cpio-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
cplex-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4284,6 +4309,7 @@ dont-distribute-packages:
fixplate: [ "x86_64-darwin" ]
flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ]
flac: [ i686-linux, x86_64-linux, x86_64-darwin ]
flaccuraterip: [ i686-linux, x86_64-linux, x86_64-darwin ]
flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ]
flamingra: [ i686-linux, x86_64-linux, x86_64-darwin ]
flat-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4394,6 +4420,7 @@ dont-distribute-packages:
function-instances-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ]
functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ]
functor-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
functor: [ i686-linux, x86_64-linux, x86_64-darwin ]
functorm: [ i686-linux, x86_64-linux, x86_64-darwin ]
Fungi: [ i686-linux, x86_64-linux, x86_64-darwin ]
funion: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5022,6 +5049,7 @@ dont-distribute-packages:
headergen: [ i686-linux, x86_64-linux, x86_64-darwin ]
hecc: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ]
hedis-config: [ i686-linux, x86_64-linux, x86_64-darwin ]
hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ]
hedis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
hedis-tags: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5069,6 +5097,7 @@ dont-distribute-packages:
hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexpress: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ]
heyefi: [ i686-linux, x86_64-linux, x86_64-darwin ]
hF2: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfann: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfd: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5391,6 +5420,7 @@ dont-distribute-packages:
HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ]
hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ]
hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ]
hslua-module-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ]
HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5483,6 +5513,7 @@ dont-distribute-packages:
htune: [ i686-linux, x86_64-linux, x86_64-darwin ]
htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ]
hubris: [ i686-linux, x86_64-linux, x86_64-darwin ]
huck: [ i686-linux, x86_64-linux, x86_64-darwin ]
huckleberry: [ "x86_64-darwin" ]
HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ]
huff: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5736,6 +5767,7 @@ dont-distribute-packages:
json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
json-autotype: [ i686-linux, x86_64-linux, x86_64-darwin ]
json-b: [ i686-linux, x86_64-linux, x86_64-darwin ]
json-bytes-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
JSON-Combinator-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
JSON-Combinator: [ i686-linux, x86_64-linux, x86_64-darwin ]
json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6288,6 +6320,8 @@ dont-distribute-packages:
mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ]
ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ]
mlist: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmark-ext: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmark: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6895,6 +6929,7 @@ dont-distribute-packages:
polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ]
polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ]
pomaps: [ i686-linux, x86_64-linux, x86_64-darwin ]
pomodoro: [ i686-linux, x86_64-linux, x86_64-darwin ]
ponder: [ i686-linux, x86_64-linux, x86_64-darwin ]
pong-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7004,6 +7039,7 @@ dont-distribute-packages:
prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
proxy-kindness: [ i686-linux, x86_64-linux, x86_64-darwin ]
psc-ide: [ i686-linux, x86_64-linux, x86_64-darwin ]
ptr: [ i686-linux, x86_64-linux, x86_64-darwin ]
publicsuffixlistcreate: [ i686-linux, x86_64-linux, x86_64-darwin ]
pubnub: [ i686-linux, x86_64-linux, x86_64-darwin ]
pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7740,6 +7776,7 @@ dont-distribute-packages:
spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ]
SpacePrivateers: [ i686-linux, x86_64-linux, x86_64-darwin ]
spaceprobe: [ i686-linux, x86_64-linux, x86_64-darwin ]
spake2: [ i686-linux, x86_64-linux, x86_64-darwin ]
spanout: [ i686-linux, x86_64-linux, x86_64-darwin ]
sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ]
sparse: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8039,6 +8076,7 @@ dont-distribute-packages:
tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ]
texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8138,6 +8176,7 @@ dont-distribute-packages:
tomato-rubato-openal: [ i686-linux, x86_64-linux, x86_64-darwin ]
toml: [ i686-linux, x86_64-linux, x86_64-darwin ]
Top: [ i686-linux, x86_64-linux, x86_64-darwin ]
top: [ i686-linux, x86_64-linux, x86_64-darwin ]
topkata: [ i686-linux, x86_64-linux, x86_64-darwin ]
torch: [ i686-linux, x86_64-linux, x86_64-darwin ]
touched: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8358,6 +8397,7 @@ dont-distribute-packages:
vect-floating-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ]
vect-floating: [ i686-linux, x86_64-linux, x86_64-darwin ]
vect-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-bytes-instances: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-clock: [ i686-linux, x86_64-linux, x86_64-darwin ]

3294
pkgs/development/haskell-modules/hackage-packages.nix
View file

File diff suppressed because it is too large Load diff

2
pkgs/development/libraries/SDL_mixer/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-music-ogg-shared" ]
++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"
++ lib.optional stdenv.isDarwin "--disable-sdltest";
++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];
meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library";

29
pkgs/development/libraries/bullet/bullet283.nix
View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl, cmake, mesa, freeglut }:
stdenv.mkDerivation rec {
name = "bullet-2.83.7"; # vdrift 2012-07-22 doesn't build with 2.81
src = fetchurl {
url = "https://github.com/bulletphysics/bullet3/archive/2.83.7.tar.gz";
sha256 = "0hqjnmlb2p29yiasrm7kvgv0nklz5zkwhfk4f78zz1gf0vrdil80";
};
buildInputs = [ cmake mesa freeglut ];
configurePhase = ''
cmake -DBUILD_SHARED_LIBS=ON -DINSTALL_EXTRA_LIBS=TRUE \
-DCMAKE_INSTALL_PREFIX=$out .
'';
enableParallelBuilding = true;
meta = {
description = "A professional free 3D Game Multiphysics Library";
longDescription = ''
Bullet 3D Game Multiphysics Library provides state of the art collision
detection, soft body and rigid body dynamics.
'';
homepage = https://github.com/bulletphysics/bullet3;
license = stdenv.lib.licenses.zlib;
maintainers = with stdenv.lib.maintainers; [ aforemny ];
platforms = with stdenv.lib.platforms; linux;
};
}

10
pkgs/development/libraries/bullet/default.nix
View file

@ -21,14 +21,18 @@ stdenv.mkDerivation rec {
sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
'';
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ] ++
stdenv.lib.optionals stdenv.isDarwin [
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_CPU_DEMOS=OFF"
"-DINSTALL_EXTRA_LIBS=ON"
] ++ stdenv.lib.optionals stdenv.isDarwin [
"-DMACOSX_DEPLOYMENT_TARGET=\"10.9\""
"-DOPENGL_FOUND=true"
"-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
"-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
"-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
"-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"];
"-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"
];
enableParallelBuilding = true;

16
pkgs/development/libraries/flite/default.nix
View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl, pkgconfig }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "flite-1.9.0";
name = "flite-2.0.0";
src = fetchurl {
url = "http://www.festvox.org/bard/${name}-current.tar.bz2";
sha256 = "197cc2a1f045b1666a29a9b5f035b3d676db6db94a4439d99a03b65e551ae2e0";
url = "http://www.festvox.org/flite/packed/flite-2.0/${name}-release.tar.bz2";
sha256 = "04g4r83jh4cl0irc8bg7njngcah7749956v9s6sh552kzmh3i337";
};
nativeBuildInputs = [ pkgconfig ];
patches = [ ./fix-rpath.patch ];
configureFlags = ''
--enable-shared
'';
configureFlags = [ "--enable-shared" ];
enableParallelBuilding = true;
meta = {
description = "A small, fast run-time speech synthesis engine";

5
pkgs/development/libraries/flite/fix-rpath.patch Normal file
View file

@ -0,0 +1,5 @@
--- a/main/Makefile
+++ b/main/Makefile
@@ -81 +80,1 @@ ifdef SHFLAGS
-flite_LIBS_flags += -Wl,-rpath $(LIBDIR)
+flite_LIBS_flags += -Wl,-rpath,$(INSTALLLIBDIR)

6
pkgs/development/libraries/libstroke/default.nix
View file

@ -4,8 +4,8 @@ stdenv.mkDerivation {
name = "libstroke-0.5.1";
src = fetchurl {
url = http://etla.net/libstroke/libstroke-0.5.1.tar.gz;
sha256 = "0da9f5fde66feaf6697ba069baced8fb3772c3ddc609f39861f92788f5c7772d";
url = https://web.archive.org/web/20161204100704/http://etla.net/libstroke/libstroke-0.5.1.tar.gz;
sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d";
};
buildInputs = [ automake autoconf x11 ];
@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = {
description = "Libstroke, a library for simple gesture recognition";
homepage = http://etla.net/libstroke/;
homepage = https://web.archive.org/web/20161204100704/http://etla.net/libstroke/;
license = stdenv.lib.licenses.gpl2;
longDescription =

8
pkgs/development/libraries/pkcs11helper/default.nix
View file

@ -2,20 +2,22 @@
stdenv.mkDerivation rec {
name = "pkcs11-helper-${version}";
version = "1.21";
version = "1.22";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "pkcs11-helper";
rev = "${name}";
sha256 = "17a2cssycl7fh44xikmhszigx57vvn0h2sjsnmsy3772kfj796b1";
sha256 = "01v3zv6sr5phqhr2f21fl2rmcnmkp9518dkq82g1v2y9ysjksg7q";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ openssl ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;
homepage = https://github.com/OpenSC/pkcs11-helper;
license = with licenses; [ bsd3 gpl2 ];
description = "Library that simplifies the interaction with PKCS#11 providers";
platforms = platforms.unix;

8
pkgs/development/lisp-modules/asdf/default.nix
View file

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="asdf";
version="3.3.0";
version="3.3.1";
name="${baseName}-${version}";
hash="16qphj2ilds4plzr36jbnrxxl5s21q53m9vasv3208gb5wjwcnv8";
url="http://common-lisp.net/project/asdf/archives/asdf-3.3.0.tar.gz";
sha256="16qphj2ilds4plzr36jbnrxxl5s21q53m9vasv3208gb5wjwcnv8";
hash="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g";
url="http://common-lisp.net/project/asdf/archives/asdf-3.3.1.tar.gz";
sha256="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g";
};
buildInputs = [
texinfo texLive perl

32
pkgs/development/node-packages/node-packages-v4.nix
View file

@ -2119,13 +2119,13 @@ let
sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
};
};
"ajv-5.3.0" = {
"ajv-5.4.0" = {
name = "ajv";
packageName = "ajv";
version = "5.3.0";
version = "5.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz";
sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda";
url = "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz";
sha1 = "32d1cf08dbc80c432f426f12e10b2511f6b46474";
};
};
"har-schema-2.0.0" = {
@ -2623,13 +2623,13 @@ let
sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
};
};
"big-integer-1.6.25" = {
"big-integer-1.6.26" = {
name = "big-integer";
packageName = "big-integer";
version = "1.6.25";
version = "1.6.26";
src = fetchurl {
url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.25.tgz";
sha1 = "1de45a9f57542ac20121c682f8d642220a34e823";
url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz";
sha1 = "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8";
};
};
"camelcase-keys-2.1.0" = {
@ -3343,13 +3343,13 @@ let
sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28";
};
};
"nan-2.7.0" = {
"nan-2.8.0" = {
name = "nan";
packageName = "nan";
version = "2.7.0";
version = "2.8.0";
src = fetchurl {
url = "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz";
sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46";
url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz";
sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a";
};
};
"node-pre-gyp-0.6.39" = {
@ -4835,7 +4835,7 @@ in
})
(sources."har-validator-5.0.3" // {
dependencies = [
(sources."ajv-5.3.0" // {
(sources."ajv-5.4.0" // {
dependencies = [
sources."co-4.6.0"
sources."fast-deep-equal-1.0.0"
@ -4986,7 +4986,7 @@ in
dependencies = [
(sources."bplist-parser-0.1.1" // {
dependencies = [
sources."big-integer-1.6.25"
sources."big-integer-1.6.26"
];
})
(sources."meow-3.7.0" // {
@ -5267,7 +5267,7 @@ in
})
(sources."v8-debug-1.0.1" // {
dependencies = [
sources."nan-2.7.0"
sources."nan-2.8.0"
(sources."node-pre-gyp-0.6.39" // {
dependencies = [
(sources."mkdirp-0.5.1" // {
@ -5514,7 +5514,7 @@ in
})
(sources."v8-profiler-5.7.0" // {
dependencies = [
sources."nan-2.7.0"
sources."nan-2.8.0"
(sources."node-pre-gyp-0.6.39" // {
dependencies = [
(sources."mkdirp-0.5.1" // {

1
pkgs/development/node-packages/node-packages-v6.json
View file

@ -6,6 +6,7 @@
, "browserify"
, "castnow"
, "coffee-script"
, "coinmon"
, "cordova"
, "csslint"
, "dhcp"

2065
pkgs/development/node-packages/node-packages-v6.nix
View file

File diff suppressed because it is too large Load diff

6
pkgs/development/python-modules/hupper/default.nix
View file

@ -1,4 +1,4 @@
{ buildPythonPackage, fetchPypi, python
{ stdenv, buildPythonPackage, fetchPypi, python
, pytest, pytestcov, watchdog, mock
}:
@ -16,5 +16,7 @@ buildPythonPackage rec {
py.test
'';
checkInputs = [ pytest pytestcov watchdog mock ];
# FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent
# segfaults in the testsuite that end up failing the tests in a background thread (in myapp)
checkInputs = [ pytest pytestcov mock ] ++ stdenv.lib.optional (!stdenv.isDarwin) watchdog;
}

17
pkgs/development/python-modules/nbxmpp/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "nbxmpp";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "0x495yb0abkdspyziw7dyyjwxx6ivnv5zznk92wa3mcind5s9757";
};
meta = with stdenv.lib; {
homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
description = "Non-blocking Jabber/XMPP module";
license = licenses.gpl3;
};
}

3
pkgs/development/python-modules/pyqt/5.x.nix
View file

@ -1,6 +1,7 @@
{ lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake
, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
, withWebSockets ? false, qtwebsockets
, withConnectivity ? false, qtconnectivity
}:
let
@ -27,7 +28,7 @@ in buildPythonPackage {
buildInputs = [
lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
] ++ lib.optional withWebSockets qtwebsockets;
] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;
propagatedBuildInputs = [ sip ];

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "2.90";
version = "2.91";
src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
sha256 = "15h1abcvr8b5n8l4kqivxncvc9dwz66pmdy9ycs3qaz4nrypws8z";
sha256 = "04ck1sq73v94xz1293qgypzahjdn5xlhl7ya7x0rzyf3x4zz6q5y";
};
buildCommand = ''

13
pkgs/development/tools/misc/xxdiff/tip.nix
View file

@ -15,16 +15,13 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
preConfigure = ''
ln -s ${qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
ln -s ${qtbase.dev}/bin/* ../__nix_qt*__/bin || true
cd src
make -f Makefile.bootstrap
'';
NIX_CFLAGS_COMPILE="-I${qtbase.dev}/include/QtCore -I${qtbase.dev}/include/QtGui -I${qtbase.dev}/include/QtWidgets";
configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap";
installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
postInstall = ''
install -D ../bin/xxdiff $out/bin/xxdiff
'';
meta = with stdenv.lib; {
homepage = http://furius.ca/xxdiff/;

2
pkgs/games/wesnoth/default.nix
View file

@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
homepage = http://www.wesnoth.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ kkallio abbradar ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

1
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -571,6 +571,7 @@ with stdenv.lib;
${optionalString (versionOlder version "4.14") ''
MEDIA_RC_SUPPORT y
''}
MEDIA_CONTROLLER y
MEDIA_USB_SUPPORT y
MEDIA_PCI_SUPPORT y
MEDIA_ANALOG_TV_SUPPORT y

4
pkgs/os-specific/linux/kernel/linux-4.13.nix
View file

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.13.14";
version = "4.13.15";
extraMeta.branch = "4.13";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "10rjrh5yg6mdfg44xnyd5r4fc91c3b0hqf2yy7qzy7z1kr22lixs";
sha256 = "1cnixf90pi9xsb8p1sncwcnl5acp8b46xxxmsizk335knmn919g4";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View file

@ -3,7 +3,7 @@
with stdenv.lib;
import ./generic.nix (args // rec {
version = "4.14";
version = "4.14.1";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@ -13,6 +13,6 @@ import ./generic.nix (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "19wn1wswvivhlxxixnqi962jamxy9wpw13g1gj2k18chgr3mj7gq";
sha256 = "1rsdrdapjw8lhm8dyckwxfihykirbkincm5k0lwwx1pr09qgdfbg";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View file

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.99";
version = "4.4.100";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0mkyipq1l0lh04shavanx61z75c5r66xh33x47pswvhr2j6mjqxf";
sha256 = "0kyi3cplkd839alyd6vsw2cqkb523zfsrjb2d6ygcddxqjcwsdlr";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View file

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.9.63";
version = "4.9.64";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "18rfvzsxgjr9223r3lznbrj6fh533d68nizpcz556d7x6dpkij91";
sha256 = "1h1h71nyiwvx2jy3j3yjazya6gz3k47bhm00mm311syaplhp0qhr";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
View file

@ -3,9 +3,9 @@
with stdenv.lib;
let
version = "4.13.13";
version = "4.13.14";
revision = "a";
sha256 = "1bph0cvmms16mi5iczr6q1wrz7fp5gl2kz5lk8b3cx04wpj65jfl";
sha256 = "16bb1jvip50v62slp6cy96zncjhjzp3hvh29jc8ilcpxgyipmhlc";
# modVersion needs to be x.y.z, will automatically add .0 if needed
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

2
pkgs/os-specific/linux/kernel/manual-config.nix
View file

@ -110,7 +110,7 @@ let
make $makeFlags prepare
actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"
if [ "$actualModDirVersion" != "${modDirVersion}" ]; then
echo "Error: modDirVersion specified in the Nix expression is wrong, it should be: $actualModDirVersion"
echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"
exit 1
fi

55
pkgs/os-specific/linux/libwebcam/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ lib
, stdenv
, fetchurl
, cmake
, pkgconfig
, libxml2
}:
stdenv.mkDerivation rec {
pname = "libwebcam";
version = "0.2.5";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/source/${pname}-src-${version}.tar.gz";
sha256 = "0hcxv8di83fk41zjh0v592qm7c0v37a3m3n3lxavd643gff1k99w";
};
patches = [
./uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
];
buildInputs = [
cmake
pkgconfig
libxml2
];
postPatch = ''
substituteInPlace ./uvcdynctrl/CMakeLists.txt \
--replace "/lib/udev" "$out/lib/udev"
substituteInPlace ./uvcdynctrl/udev/scripts/uvcdynctrl \
--replace 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \
--replace 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl"
substituteInPlace ./uvcdynctrl/udev/rules/80-uvcdynctrl.rules \
--replace "/lib/udev" "$out/lib/udev"
'';
preConfigure = ''
cmakeFlagsArray=(
$cmakeFlagsArray
"-DCMAKE_INSTALL_PREFIX=$out"
)
'';
meta = with lib; {
description = "The webcam-tools package";
platforms = platforms.linux;
licenses = with licenses; [ lgpl3 ];
maintainers = with maintainers; [ jraygauthier ];
};
}

65
pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch Normal file
View file

@ -0,0 +1,65 @@
diff --git a/uvcdynctrl/main.c b/uvcdynctrl/main.c
index b7befd1..f3a768c 100644
--- a/uvcdynctrl/main.c
+++ b/uvcdynctrl/main.c
@@ -674,27 +674,31 @@ get_filename (const char *dir_path, const char *vid)
printf ( "checking dir: %s \n", dir_path);
while ((dp = readdir(dir)) != NULL)
{
- if((dp->d_type == DT_DIR) && (fnmatch("[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]", dp->d_name, 0) == 0))
+ if((dp->d_type == DT_DIR || dp->d_type == DT_LNK ) && (fnmatch("[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]", dp->d_name, 0) == 0))
{
if( strcasecmp(vid, dp->d_name) != 0)
{
/*doesn't match - clean up and move to the next entry*/
continue;
}
-
+
char *tmp = path_cat (dir_path, dp->d_name);
- printf("found dir: %s \n", dp->d_name);
+
DIR * subdir = opendir(tmp);
- while ((sdp = readdir(subdir)) != NULL)
+ if ( subdir != NULL )
{
- if( fnmatch("*.xml", sdp->d_name, 0) == 0 )
+ printf("found dir: %s \n", dp->d_name);
+ while ((sdp = readdir(subdir)) != NULL)
{
- file_list[nf-1] = path_cat (tmp, sdp->d_name);
- printf("found: %s \n", file_list[nf-1]);
- nf++;
- file_list = realloc(file_list,nf*sizeof(file_list));
- file_list[nf-1] = NULL;
- }
+ if( fnmatch("*.xml", sdp->d_name, 0) == 0 )
+ {
+ file_list[nf-1] = path_cat (tmp, sdp->d_name);
+ printf("found: %s \n", file_list[nf-1]);
+ nf++;
+ file_list = realloc(file_list,nf*sizeof(file_list));
+ file_list[nf-1] = NULL;
+ }
+ }
}
closedir(subdir);
free (tmp);
@@ -869,9 +873,15 @@ main (int argc, char **argv)
pid_set = 1; /*flag pid.xml check*/
//printf("vid:%s pid:%s\n", vid, pid);
}
-
+
+ const char* dataDir = getenv( "NIX_UVCDYNCTRL_DATA_DIR" );
+ // When unavailable, fallback on data dir specified at build time.
+ if ( !dataDir ) {
+ dataDir = DATA_DIR;
+ }
+
/* get xml file list from DATA_DIR/vid/ */
- char **xml_files = get_filename (DATA_DIR, vid);
+ char **xml_files = get_filename (dataDir, vid);
/*check for pid.xml*/
char fname[9];

6
pkgs/os-specific/linux/microcode/intel.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "microcode-intel-${version}";
version = "20170707";
version = "20171117";
src = fetchurl {
url = "https://downloadmirror.intel.com/26925/eng/microcode-${version}.tgz";
sha256 = "14zf7fbhg0msa3bm0kl139pclmkfm83s6l86x48sr9sjpxllgm2g";
url = "https://downloadmirror.intel.com/27337/eng/microcode-${version}.tgz";
sha256 = "1p14ypbg28bdkbza6dx6dpjrdr5p13vmgrh2cw0y1v2qzalivgck";
};
buildInputs = [ libarchive ];

4
pkgs/servers/samba/4.x.nix
View file

@ -19,11 +19,11 @@ with lib;
stdenv.mkDerivation rec {
name = "samba-${version}";
version = "4.6.8";
version = "4.6.11";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
sha256 = "0pap686cl0j5c9v1v09krpqdk416x3851fbcap5ysp1zajrfw7aq";
sha256 = "07gd41y4ajdiansfqa8c5wvrincgddfzyfgh1pf7g388zaq7l6q5";
};
outputs = [ "out" "dev" "man" ];

26
pkgs/servers/sql/sqlite/jdbc/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "3.20.0";
pname = "sqlite-jdbc";
name = "${pname}-${version}";
src = fetchurl {
url = "https://bitbucket.org/xerial/${pname}/downloads/${name}.jar";
sha256 = "0wxfxnq2ghiwy2mwz3rljgmy1lciafhrw80lprvqz6iw8l51qfql";
};
phases = [ "installPhase" ];
installPhase = ''
install -D "${src}" "$out/share/java/${name}.jar"
'';
meta = with lib; {
homepage = "https://github.com/xerial/sqlite-jdbc";
description = "SQLite JDBC Driver";
license = licenses.asl20;
maintainers = with maintainers; [ jraygauthier ];
};
}

4
pkgs/shells/nix-bash-completions/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "0.4";
version = "0.5";
name = "nix-bash-completions-${version}";
src = fetchFromGitHub {
owner = "hedning";
repo = "nix-bash-completions";
rev = "v${version}";
sha256 = "08gl9xnk738p180hpn3l7ggrz5zlky4pam7v74kb0gavjxm4fa2f";
sha256 = "095dbbqssaxf0y85xw73gajif6lzy2aja4scg3plplng3k9zbldz";
};
installPhase = ''

4
pkgs/shells/nix-zsh-completions/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
let
version = "0.3.3";
version = "0.3.5";
in
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "spwhitt";
repo = "nix-zsh-completions";
rev = "${version}";
sha256 = "0gvqm6grz3s0llz20sa18n5d2anmsrk892lcv7blv8rai151whpw";
sha256 = "1fp565qbzbbwj99rq3c28gpq8gcnlxb2glj05382zimas1dfd0y9";
};
installPhase = ''

35
pkgs/shells/xonsh/default.nix
View file

@ -2,39 +2,34 @@
python3Packages.buildPythonApplication rec {
name = "xonsh-${version}";
version = "0.4.3";
version = "0.5.12";
src = fetchFromGitHub {
owner = "scopatz";
repo = "xonsh";
rev = version;
sha256= "1lx95i468px908y18fa9fmfgmjsydhkpas89dxbwfnybqxxyd3ls";
sha256= "1s733ay5vcpcl14x23n0amnddyjfla55irddalvw52vijhd2aljz";
};
## The logo xonsh prints during build contains unicode characters, and this
## fails because locales have not been set up in the build environment.
## We can fix this on Linux by setting:
## export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
## but this would not be a cross platform solution, so it's simpler to just
## patch the setup.py script to not print the logo during build.
#prePatch = ''
# substituteInPlace setup.py --replace "print(logo)" ""
#'';
patchPhase = ''
LC_ALL = "en_US.UTF-8";
postPatch = ''
rm xonsh/winutils.py
sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
sed -ie 's|test_win_ipconfig|_test_win_ipconfig|g' tests/test_execer.py
sed -ie 's|test_ipconfig|_test_ipconfig|g' tests/test_execer.py
rm tests/test_main.py
rm tests/test_man.py
rm tests/test_replay.py
sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh
patchShebangs .
'';
checkPhase = ''
HOME=$TMPDIR XONSH_INTERACTIVE=0 nosetests -x
HOME=$TMPDIR XONSH_INTERACTIVE=0 \
pytest \
-k 'not test_man_completion and not test_printfile and not test_sourcefile and not test_printname ' \
tests
'';
buildInputs = with python3Packages; [ glibcLocales nose pytest ];
checkInputs = with python3Packages; [ pytest glibcLocales ];
propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit ];
meta = with stdenv.lib; {

6
pkgs/shells/zsh-prezto/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, fetchFromGitHub }:
{ stdenv, fetchpatch, fetchgit, fetchFromGitHub }:
let
# https://github.com/spwhitt/nix-zsh-completions/pull/2
@ -18,9 +18,9 @@ in stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
(fetchurl {
(fetchpatch {
url = "https://github.com/sorin-ionescu/prezto/pull/1028.patch";
sha256 = "0n2s7kfp9ljrq8lw5iibv0vyv66awrkzkqbyvy7hlcl06d8aykjv";
sha256 = "0yrj72s1hiaq13374xa82hxdig4s0kvqjn9apkmw0h7kzggxjfn3";
})
];
buildPhase = ''

48
pkgs/tools/archivers/wimlib/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ stdenv, fetchurl, makeWrapper
, pkgconfig, openssl, fuse, libxml2
, cabextract ? null
, cdrkit ? null
, mtools ? null
, ntfs3g ? null
, syslinux ? null
}:
stdenv.mkDerivation rec {
version = "1.12.0";
name = "wimlib-${version}";
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ openssl fuse libxml2 ntfs3g ];
src = fetchurl {
url = "https://wimlib.net/downloads/${name}.tar.gz";
sha256 = "852cf59d682a91974f715f09fa98cab621b740226adcfea7a42360be0f86464f";
};
preBuild = ''
substituteInPlace programs/mkwinpeimg.in \
--replace '/usr/lib/syslinux' "${syslinux}/share/syslinux"
'';
postInstall = let
path = stdenv.lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ];
in ''
for prog in $out/bin/*; do
wrapProgram $prog --prefix PATH : ${path}
done
'';
doCheck = true;
preCheck = ''
patchShebangs tests
'';
meta = with stdenv.lib; {
homepage = https://wimlib.net;
description = "A library and program to extract, create, and modify WIM files";
platforms = platforms.unix;
maintainers = with maintainers; [ andir ];
license = with licenses; [ gpl3 lgpl3 cc0 ];
};
}

25
pkgs/tools/backup/rdedup/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libsodium, lzma }:
rustPlatform.buildRustPackage rec {
name = "rdedup-${version}";
version = "2.0.0";
src = fetchFromGitHub {
owner = "dpc";
repo = "rdedup";
rev = "v${version}";
sha256 = "14r6x1wi5mwadarm0vp6qnr5mykv4g0kxz9msq76fhwghwb9k1d9";
};
buildInputs = [ pkgconfig libsodium lzma ];
cargoSha256 = "0wyswc4b4hkiw20gz0w94vv1qgcb2zq0cdaj9zxvyr5l0abxip9w";
meta = with stdenv.lib; {
description = "Data deduplication with compression and public key encryption";
homepage = https://github.com/dpc/rdedup;
license = licenses.mpl20;
maintainers = with maintainers; [ dywedir ];
platforms = platforms.all;
};
}

4
pkgs/tools/filesystems/glusterfs/default.nix
View file

@ -15,10 +15,10 @@ let
# The command
# find /nix/store/...-glusterfs-.../ -name '*.py' -executable
# can help with finding new Python scripts.
version = "3.12.1";
version = "3.12.3";
name="${baseName}-${version}";
url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
sha256 = "14l6p2zyjsrnjvf0lipq32p517zk813nqv06pjq6kcqkmy038wdv";
sha256 = "16ra4qr4ds011mmxaqdhdj7slcx8yv0xh6ww7bwsz7f1gn9sr10h";
};
buildInputs = [
fuse bison flex_2_5_35 openssl ncurses readline

4
pkgs/tools/misc/mlocate/default.nix
View file

@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
version = "0.26";
src = fetchurl {
url = "http://fedorahosted.org/releases/m/l/mlocate/${name}.tar.xz";
url = "https://releases.pagure.org/mlocate/${name}.tar.xz";
sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
};
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Merging locate is an utility to index and quickly search for files";
homepage = https://fedorahosted.org/mlocate/;
homepage = https://pagure.io/mlocate;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ ];

28
pkgs/tools/misc/screenfetch/default.nix
View file

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused
{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused
, bc, findutils, xdpyinfo, xprop, gnugrep, ncurses
, darwin
}:
stdenv.mkDerivation {
@ -21,13 +22,22 @@ stdenv.mkDerivation {
# Fix all of the depedencies of screenfetch
patchShebangs $out/bin/screenfetch
wrapProgram "$out/bin/screenfetch" \
--set PATH ${stdenv.lib.makeBinPath [
coreutils gawk procps gnused findutils xdpyinfo
xprop gnugrep ncurses bc
]}
--set PATH ${lib.makeBinPath ([
coreutils gawk gnused findutils
gnugrep ncurses bc
] ++ lib.optionals stdenv.isLinux [
procps
xdpyinfo
xprop
] ++ lib.optionals stdenv.isDarwin (with darwin; [
adv_cmds
DarwinTools
system_cmds
"/usr" # some commands like defaults is not available to us
]))}
'';
meta = {
meta = with lib; {
description = "Fetches system/theme information in terminal for Linux desktop screenshots";
longDescription = ''
screenFetch is a "Bash Screenshot Information Tool". This handy Bash
@ -39,9 +49,9 @@ stdenv.mkDerivation {
screenshot upon displaying info, and even customizing the screenshot
command! This script is very easy to add to and can easily be extended.
'';
license = stdenv.lib.licenses.gpl3;
license = licenses.gpl3;
homepage = http://git.silverirc.com/cgit.cgi/screenfetch-dev.git/;
maintainers = with stdenv.lib.maintainers; [relrod];
platforms = stdenv.lib.platforms.all;
maintainers = with maintainers; [relrod];
platforms = platforms.all;
};
}

43
pkgs/tools/security/opencryptoki/default.nix
View file

@ -1,38 +1,41 @@
{ stdenv, fetchurl, openssl, trousers, automake, autoconf, libtool, bison, flex }:
{ stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }:
stdenv.mkDerivation rec {
version = "3.2";
name = "opencryptoki-${version}";
version = "3.8.1";
src = fetchurl {
url = "mirror://sourceforge/opencryptoki/opencryptoki/v${version}/opencryptoki-v${version}.tgz";
sha256 = "06r6zp299vxdspl6k65myzgjv0bihg7kc500v7s4jd3mcrkngd6h";
src = fetchFromGitHub {
owner = "opencryptoki";
repo = "opencryptoki";
rev = "v${version}";
sha256 = "1m618pjfzw18irmh6i4pfq1gvcxgyfh9ikjn33nrdj55v2l27g31";
};
buildInputs = [ automake autoconf libtool openssl trousers bison flex ];
nativeBuildInputs = [ autoreconfHook libtool bison flex ];
buildInputs = [ openssl trousers ];
preConfigure = ''
substituteInPlace configure.in --replace "chown" "true"
substituteInPlace configure.in --replace "chgrp" "true"
sh bootstrap.sh --prefix=$out
postPatch = ''
substituteInPlace configure.ac \
--replace "usermod" "true" \
--replace "groupadd" "true" \
--replace "chmod" "true" \
--replace "chgrp" "true"
substituteInPlace usr/lib/Makefile.am --replace "DESTDIR" "out"
'';
configureFlags = [ "--disable-ccatok" "--disable-icatok" ];
configureFlags = [
"--prefix=$(out)"
"--disable-ccatok"
"--disable-icatok"
];
makeFlags = "DESTDIR=$(out)";
# work around the build script of opencryptoki
postInstall = ''
cp -r $out/$out/* $out
rm -r $out/nix
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "PKCS#11 implementation for Linux";
homepage = http://opencryptoki.sourceforge.net/;
homepage = https://github.com/opencryptoki/opencryptoki;
license = licenses.cpl10;
maintainers = [ maintainers.tstrobel ];
platforms = platforms.unix;
};
}

24
pkgs/tools/security/simple-tpm-pk11/default.nix
View file

@ -1,17 +1,20 @@
{ stdenv, fetchgit, trousers, openssl, opencryptoki, automake, autoconf, libtool }:
{ stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }:
stdenv.mkDerivation rec {
name = "simple-tpm-pk11-2016-07-12";
name = "simple-tpm-pk11-${version}";
version = "0.06";
src = fetchgit {
url = "https://github.com/ThomasHabets/simple-tpm-pk11";
rev = "6f1f7a6b96ac82965e977cfecb88d930f1d70243";
sha256 = "06vf3djp29slh7hrh4hlh3npyl277fy7d77jv9mxa1sk1idjklxc";
src = fetchFromGitHub {
owner = "ThomasHabets";
repo = "simple-tpm-pk11";
rev = version;
sha256 = "0vpbaklr4r1a2am0pqcm6m41ph22mkcrq33y8ab5h8qkhkvhd6a6";
};
buildInputs = [ trousers openssl opencryptoki automake autoconf libtool ];
nativeBuildInputs = [ autoreconfHook libtool ];
buildInputs = [ trousers openssl opencryptoki ];
preConfigure = "sh bootstrap.sh";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Simple PKCS11 provider for TPM chips";
@ -19,9 +22,8 @@ stdenv.mkDerivation rec {
A simple library for using the TPM chip to secure SSH keys.
'';
homepage = https://github.com/ThomasHabets/simple-tpm-pk11;
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib; [ maintainers.tstrobel ];
license = licenses.asl20;
maintainers = with maintainers; [ tstrobel ];
platforms = platforms.unix;
};
}

41
pkgs/tools/text/languagetool/default.nix
View file

@ -1,30 +1,27 @@
{ stdenv, lib, fetchurl, unzip, jdk }:
{ stdenv, fetchzip, jre, makeWrapper }:
stdenv.mkDerivation rec {
pname = "LanguageTool";
version = "3.7";
name = pname + "-" + version;
src = fetchurl {
name = "LanguageTool-${version}";
version = "3.9";
src = fetchzip {
url = "https://www.languagetool.org/download/${name}.zip";
sha256 = "04i49z022k3nyyr8hnlxima9k5id8qvh2nr3dv8zgcqm5sin6xx9";
sha256 = "0hqb4hbl7iryw1xk8q1i606azzgzdr17sy6xfr1zpas4r2pnvhfq";
};
buildInputs = [ unzip jdk ];
installPhase =
''
mkdir -p $out/{bin,share}
mv * $out/share/.
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
installPhase = ''
mkdir -p $out/share
mv * $out/share/
for lt in languagetool{,-commandline,-server};do
cat > $out/bin/$lt <<EXE
#!${stdenv.shell}
${jdk}/bin/java -cp $out/share/ -jar $out/share/$lt.jar "\$@"
EXE
chmod +x $out/bin/$lt
makeWrapper ${jre}/bin/java $out/bin/$lt \
--add-flags "-cp $out/share/ -jar $out/share/$lt.jar"
done
cat > $out/bin/languagetool-http-server <<EXE
#!${stdenv.shell}
${jdk}/bin/java -cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer "\$@"
EXE
chmod +x $out/bin/languagetool-http-server
makeWrapper ${jre}/bin/java $out/bin/languagetool-http-server \
--add-flags "-cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer"
'';
meta = with stdenv.lib; {
@ -34,6 +31,6 @@ stdenv.mkDerivation rec {
edwtjo
jgeerds
];
descrption = "A proofreading program for English, French German, Polish, and more";
description = "A proofreading program for English, French German, Polish, and more";
};
}

16
pkgs/top-level/all-packages.nix
View file

@ -5150,6 +5150,8 @@ with pkgs;
wicd = callPackage ../tools/networking/wicd { };
wimlib = callPackage ../tools/archivers/wimlib { };
wipe = callPackage ../tools/security/wipe { };
wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
@ -9727,6 +9729,8 @@ with pkgs;
libvorbis = callPackage ../development/libraries/libvorbis { };
libwebcam = callPackage ../os-specific/linux/libwebcam { };
libwebp = callPackage ../development/libraries/libwebp { };
libwmf = callPackage ../development/libraries/libwmf { };
@ -10748,6 +10752,8 @@ with pkgs;
sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin;
sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
readline = null;
ncurses = null;
@ -13473,6 +13479,8 @@ with pkgs;
meslo-lg = callPackage ../data/fonts/meslo-lg {};
migmix = callPackage ../data/fonts/migmix {};
miscfiles = callPackage ../data/misc/miscfiles { };
media-player-info = callPackage ../data/misc/media-player-info {};
@ -14252,6 +14260,9 @@ with pkgs;
docker-machine = callPackage ../applications/networking/cluster/docker-machine { };
docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { };
docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix {
inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
};
docker-distribution = callPackage ../applications/virtualization/docker-distribution { };
@ -16445,6 +16456,8 @@ with pkgs;
rdesktop = callPackage ../applications/networking/remote/rdesktop { };
rdedup = callPackage ../tools/backup/rdedup { };
rdup = callPackage ../tools/backup/rdup { };
realpine = callPackage ../applications/networking/mailreaders/realpine {
@ -16932,6 +16945,7 @@ with pkgs;
enableKDE = config.tomahawk.enableKDE or false;
enableTelepathy = config.tomahawk.enableTelepathy or false;
quazip = quazip_qt4;
boost = boost155;
};
topydo = callPackage ../applications/misc/topydo {};
@ -18169,7 +18183,6 @@ with pkgs;
};
stuntrally = callPackage ../games/stuntrally {
bullet = bullet283;
mygui = mygui.override {
withOgre = true;
};
@ -19861,7 +19874,6 @@ with pkgs;
};
bullet = callPackage ../development/libraries/bullet {};
bullet283 = callPackage ../development/libraries/bullet/bullet283.nix {};
spdlog = callPackage ../development/libraries/spdlog { };

2
pkgs/top-level/dotnet-packages.nix
View file

@ -219,7 +219,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
SmartIrc4net = fetchNuGet {
baseName = "SmartIrc4net";
version = "0.4.5.1";
sha256 = "1k6zc6xsqfzj7nc9479d32akj6d37jq6i1qirmz1i66p52zb5hm1";
sha256 = "1d531sj39fvwmj2wgplqfify301y3cwp7kwr9ai5hgrq81jmjn2b";
outputFiles = [ "lib/*" ];
};

16
pkgs/top-level/python-packages.nix
View file

@ -11852,21 +11852,7 @@ in {
nbmerge = callPackage ../development/python-modules/nbmerge { };
nbxmpp = buildPythonPackage rec {
name = "nbxmpp-${version}";
version = "0.5.5";
src = pkgs.fetchurl {
url = "mirror://pypi/n/nbxmpp/${name}.tar.gz";
sha256 = "1gnzrzrdl4nii1sc5x8p5iw2ya5sl70j3nn34abqsny51p2pzmv6";
};
meta = {
homepage = "https://python-nbxmpp.gajim.org/";
description = "Non-blocking Jabber/XMPP module";
license = licenses.gpl3;
};
};
nbxmpp = callPackage ../development/python-modules/nbxmpp { };
sleekxmpp = buildPythonPackage rec {
name = "sleekxmpp-${version}";