Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5ca87e253619
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09b9d4d612b6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 11, 2020

  1. PerconaToolkit: use shortenPerlShebang (#91921) 

    (cherry picked from commit ae16459)
    @framp @veprbl
    framp authored and veprbl committed Jul 11, 2020
    Copy the full SHA
    009c509 View commit details

  2. texlive.bin: fix poppler compatibility patch urls (#91890) 

    (cherry picked from commit 4ab0be8)
    @dylex @veprbl
    dylex authored and veprbl committed Jul 11, 2020
    Copy the full SHA
    09b9d4d View commit details
Showing with 7 additions and 3 deletions.
  1. +5 −1 pkgs/development/perl-modules/Percona-Toolkit/default.nix
  2. +2 −2 pkgs/tools/typesetting/tex/texlive/bin.nix
6 changes: 5 additions & 1 deletion pkgs/development/perl-modules/Percona-Toolkit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey }:
{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey, shortenPerlShebang }:

buildPerlPackage {
pname = "Percona-Toolkit";
@@ -10,7 +10,11 @@ buildPerlPackage {
sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y";
};
outputs = [ "out" ];
nativeBuildInputs = [ shortenPerlShebang ];
buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ];
postInstall = ''
shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*)
'';
meta = {
description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.'';
homepage = http://www.percona.com/software/percona-toolkit;
4 changes: 2 additions & 2 deletions pkgs/tools/typesetting/tex/texlive/bin.nix
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ let
};
in fetchurl {
name = "pdftoepdf-poppler${popplerVersion}.cc";
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co";
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959";
sha256 = "0pngvw1jgnm4cqskrzf5a3z8rj4ssl10007n3wbblj50hvvzjph3";
postFetch = ''
# The trunk added some extra arguments to certain functions so we need to revert that
@@ -56,7 +56,7 @@ let
};
pdftosrc = fetchurl {
name = "pdftosrc-poppler${popplerVersion}.cc";
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co";
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959";
sha256 = "0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g06380";
};
in ''