3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

40 commits

Author SHA1 Message Date
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
ajs124 40b2fa6a10 ejabberd: 19.05 -> 19.08 2019-08-20 11:09:39 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Izorkin cecfd0652c ejabberd: 19.02 -> 19.05 2019-06-02 00:39:32 +03:00
Izorkin 86059b4f42 ejabberd: 18.12.1 -> 19.02 2019-02-27 16:25:12 +03:00
Izorkin e680dd42b4 ejabberd: 18.06 -> 18.12.1 2019-01-11 12:00:27 +03:00
ajs124 8910795eee ejabberd: 18.01 -> 18.06 (#44158)
ejabberd switched from imagemagick to eimp, which loads libpng, libjpeg
and libwebp at runtime. These were therefore added as dependencies and
the relevant binary was wrapped to be able to find them.
2018-08-05 18:02:40 +02:00
Ryan Mulligan 038a0c9a60 treewide: http to https 2018-04-30 21:39:20 -07:00
Matthew Bauer ce8ce600ae unix-tools: introduce unix-tools.nix
unix-tools.nix has a collection of tools that are commonly installed
by default in Unix derivatives. This is intended to provide
compatibility between macOS and Linux users. Three Linux-only
derivations are provided for compatbility:

- procps
- utillinux
- nettools

More tools are also provided.

Also: treewide: use unixtools

Non-comprehensive replace of Linux-only procps and util-linux with
'unixtools'.
2018-03-26 17:40:55 -05:00
Nikolay Amiantov f22a050a1a ejabberd: 17.07 -> 18.01 2018-02-25 22:24:09 +03:00
John Ericson 888404f11b treewide: Fix deps in a few other fixed output derivations 2018-01-10 11:18:44 -05:00
Nikolay Amiantov e9520bab01 ejabberd: 17.01 -> 17.07 2017-07-27 17:07:45 +03:00
Nikolay Amiantov 37e2c5378f ejabberd: 16.09 -> 17.01 2017-01-31 03:26:25 +03:00
Nikolay Amiantov 3a05ea5376 ejabberd: 16.08 -> 16.09 2016-11-20 19:06:40 +03:00
Tuomas Tynkkynen f6640842fe treewide: Make explicit that 'dev' output of sqlite is used 2016-08-23 03:52:07 +03:00
Nikolay Amiantov 5524d29f1b ejabberd: 16.04 -> 16.08 2016-08-14 22:36:03 +03:00
Nikolay Amiantov 6f7bace3b8 ejabberd: attempt to fix dependencies' determinism 2016-07-02 19:06:48 +03:00
Andrey Pavlov c38a08f95a elixir: 1.2.5 -> 1.2.6 2016-06-07 10:34:20 +03:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Tuomas Tynkkynen e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Nikolay Amiantov aa2ba7ffe5 ejabberd: cleanup build 2016-04-30 03:48:52 +03:00
Nikolay Amiantov 190eaea739 ejabberd: 16.02 -> 16.04 2016-04-30 03:12:31 +03:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Nikolay Amiantov 364423f38c ejabberd: 16.01 -> 16.02 2016-03-04 14:46:45 +03:00
Nikolay Amiantov 37e1a9c844 ejabberd: 15.11 -> 16.01 2016-02-11 02:36:33 +03:00
Nikolay Amiantov 757857613a ejabberd: 2.1.13 -> 15.11 2016-01-10 21:28:27 +03:00
Sander van der Burg 382f175f10 ejabberd: fix problem with missing shell while loading a backup 2015-02-21 16:08:55 +00:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Rok Garbas 6d059b2ee5 ejabberd: updated to 2.1.13 2013-11-02 01:46:30 +01:00
Sander van der Burg b54d8fc58d Updated ejabberd to version 2.1.10
svn path=/nixpkgs/trunk/; revision=31854
2012-01-26 13:57:57 +00:00
Michael Raskin 1b0fe61154 Update ejabberd
svn path=/nixpkgs/trunk/; revision=22475
2010-07-05 12:39:00 +00:00
Sander van der Burg 52e9488541 Upgraded ejabberd to the latest stable 2.1.0 and also claimed maintainership since I really need this for one of my experiments
svn path=/nixpkgs/trunk/; revision=18396
2009-11-17 16:54:04 +00:00
Michael Raskin bc3c78536e Update ejabberd source revision
svn path=/nixpkgs/trunk/; revision=17788
2009-10-13 20:43:14 +00:00
Michael Raskin 5fff65dce9 As newest ejabberd will not run with Erlang R13B, use SVN version
svn path=/nixpkgs/trunk/; revision=15655
2009-05-19 17:08:10 +00:00
Michael Raskin 60dceccc9f Use PAM in ejabberd
svn path=/nixpkgs/trunk/; revision=15008
2009-04-13 09:36:07 +00:00
Sander van der Burg 8d679b6351 Created simplified ejabberd Nix expression
svn path=/nixpkgs/trunk/; revision=12899
2008-09-22 14:07:25 +00:00
Sander van der Burg ad0f90ccc0 Updated to the stable 2.0.0
svn path=/nixpkgs/trunk/; revision=10920
2008-03-02 22:11:19 +00:00
Michael Raskin 4df190c703 Various fixes and updates to build that all.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10568
2008-02-10 16:44:43 +00:00
Yury G. Kudryashov da57804fff Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
2008-01-23 18:11:03 +00:00