Commit graph

13 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
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +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
R. RyanTM e8ee15f56e gitAndTools.diff-so-fancy: 1.2.5 -> 1.2.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions
2019-07-03 09:30:31 +02:00
R. RyanTM 3f864c454a gitAndTools.diff-so-fancy: 1.2.0 -> 1.2.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions
2019-02-03 08:59:31 +00:00
Miguel Madrid Mencía 0905d1ebce
diff-so-fancy: 1.1.1 -> 1.2.0 2018-01-20 10:15:09 +01:00
mimadrid efb2b32bd7 gitAndTools.diff-so-fancy: 1.1.0 -> 1.1.1 2017-08-01 00:13:31 +02:00
Franz Pletz 75d53270cb
gitAndTools.diff-so-fancy: 0.11.4 -> 1.1.0 2017-07-18 18:04:16 +02:00
ndowens ff4fa6387e diff-so-fancy: 0.11.1 -> 0.11.4 (#24562) 2017-04-02 22:22:32 +02:00
Miguel Madrid bd20aaa767 diff-so-fancy: 0.10.1 -> 0.11.1 (#17691) 2016-08-12 15:12:29 +02:00
Miguel Madrid 1b9f6732c7 diff-so-fancy: 0.10.0 -> 0.10.1 (#17033) 2016-07-17 17:53:51 +02:00
mimadrid beec2ba127
diff-so-fancy: 0.9.3 -> 0.10.0 2016-07-05 22:54:14 +02:00
Alexey Lebedeff 552388f8df diff-so-fancy: init at 0.9.3
Script was mentioned at GitHub blog -
https://github.com/blog/2188-git-2-9-has-been-released :)
2016-06-17 13:38:59 +03:00