Commit graph

7 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
Marek Mahut
f061fb6412 fpp: requires python3 2019-08-20 20:12:53 +02:00
R. RyanTM
d0f27576d8 fpp: 0.7.2 -> 0.8.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fpp/versions
2019-08-19 20:39:52 -07: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
Miguel Madrid Mencía
c46523e8c8
fpp: 0.7.1 -> 0.7.2 2018-01-07 11:58:52 +01:00
Frederik Rietdijk
efb6052f40 Python: fixup modules that were removed 2016-10-13 22:11:30 +02:00
Marc Scholten
6bbead5e12
fpp: init at 0.7.1
With fixups by joachifm

Closes #15468
2016-05-15 17:21:00 +02:00