1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

14 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
eyjhbb@gmail.com d85ee0df1b sl: 5.04 -> 5.05 2019-08-19 10:14:09 +02: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
Mitsuhiro Nakamura bcce173f25 sl: use appropriate compiler 2019-04-22 23:39:34 +09:00
Peter Hoeg 9588e74f5a sl: add missing man pages 2019-04-07 21:14:23 +08:00
eyjhbb@gmail.com a8654f8858 sl: 5.02 -> 5.04 2019-03-19 21:06:08 +01:00
Matthew Bauer 94ad63a1aa sl: fix darwin build 2016-08-16 19:25:45 +00:00
Tuomas Tynkkynen 4cf60b3452 sl: 3.03 -> 5.02
- Source moved to GitHub
- No need to patch Makefile
- Install manpage
2015-09-20 02:55:55 +03:00
Spencer Whitt d5225d54ad sl: build on Darwin 2015-04-04 02:07:54 -04:00
Vladimír Čunát ae7153b9b0 sl: fix license (close #3072)
From https://github.com/fistonbettens/nixpkgs/commit/7b6591b551afc6a17b
but it failed to apply for me, so I hand-added and corrected the change.
2014-08-14 21:28:33 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Lluís Batlle i Rossell 26ec1abf41 Adding Steam Locomotive, for the fun 2013-03-25 14:57:45 +01:00