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: bc5e2df902bb
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: 002ad2e56110
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 11, 2019

  1. perlPackages.CGIMinimal: init at 1.29 (#59318) 

    (cherry picked from commit 26db6d87d805b21acaf5a1d15909afbe4a2753ad)
    @aanderse @xeji
    aanderse authored and xeji committed Apr 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    acdlite Andrew Clark
    SSH Key Fingerprint: kMgJy+7AI/mxxpuyx1Qgc7NZY55dREBRubChEAYfi7I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    22aebaf View commit details

  2. perlPackages.DBDOracle: init at 1.76 (#59319) 

    (cherry picked from commit 73d45ab1b0618c273e0d9212ad9568f42247ea14)
    @aanderse @xeji
    aanderse authored and xeji committed Apr 11, 2019
    Copy the full SHA
    877504b View commit details

  3. pythonPackages.qscintilla: fix build 

    (cherry picked from commit 029aba9)
    @lsix @xeji
    lsix authored and xeji committed Apr 11, 2019
    Copy the full SHA
    002ad2e View commit details
Showing with 32 additions and 1 deletion.
  1. +15 −0 pkgs/development/perl-modules/DBD-Oracle/default.nix
  2. +3 −1 pkgs/development/python-modules/qscintilla/default.nix
  3. +14 −0 pkgs/top-level/perl-packages.nix
15 changes: 15 additions & 0 deletions pkgs/development/perl-modules/DBD-Oracle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{ fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }:

buildPerlPackage rec {
name = "DBD-Oracle-1.76";

src = fetchurl {
url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz";
sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3";
};

ORACLE_HOME = "${oracle-instantclient}/lib";

buildInputs = [ TestNoWarnings oracle-instantclient ] ;
propagatedBuildInputs = [ DBI ];
}
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/qscintilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,9 @@ disabledIf (isPy3k || isPyPy)

src = pkgs.qscintilla.src;

buildInputs = [ pkgs.xorg.lndir pyqt4.qt pyqt4 ];
nativeBuildInputs = [ pkgs.xorg.lndir ];

buildInputs = [ pyqt4.qt pyqt4 ];

preConfigure = ''
mkdir -p $out
14 changes: 14 additions & 0 deletions pkgs/top-level/perl-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1752,6 +1752,18 @@ let
propagatedBuildInputs = [ CGI ];
};

CGIMinimal = buildPerlPackage rec {
name = "CGI-Minimal-1.29";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SN/SNOWHARE/${name}.tar.gz";
sha256 = "36c785ffacf5cdee4f1a7219ca1848b7e1700bdd71cd9116e1f00545ec88475d";
};
meta = {
description = "A lightweight CGI form processing package";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};

CGIPSGI = buildPerlPackage {
name = "CGI-PSGI-0.15";
src = fetchurl {
@@ -4002,6 +4014,8 @@ let

DBDmysql = callPackage ../development/perl-modules/DBD-mysql { };

DBDOracle = callPackage ../development/perl-modules/DBD-Oracle { };

DBDPg = callPackage ../development/perl-modules/DBD-Pg { };

DBDsybase = callPackage ../development/perl-modules/DBD-sybase { };