1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
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
R. RyanTM 4db5a101e8 dvdstyler: 3.1 -> 3.1.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/dvdstyler/versions
2019-08-18 23:32:26 -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
R. RyanTM 0890e94321 dvdstyler: 3.0.4 -> 3.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dvdstyler/versions
2019-07-20 12:59:15 +02:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Ryan Mulligan ff67268406 dvdstyler: 3.0.3 -> 3.0.4
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/dvdstyler --help` got 0 exit code
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/dvdstyler --version` and found version 3.0.4
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped -h` got 0 exit code
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped --help` got 0 exit code
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped -v` and found version 3.0.4
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped --version` and found version 3.0.4
- ran `/nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4/bin/.dvdstyler-wrapped -h` and found version 3.0.4
- found 3.0.4 with grep in /nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4
- found 3.0.4 in filename of file in /nix/store/199jnnl507db7vsacx638sp3ql5m02av-dvdstyler-3.0.4
2018-02-25 20:29:45 -08:00
AndersonTorres 9ef30ce570
dvdstyler: init at 3.0.3 2017-03-06 17:36:28 +01:00