Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e7ef62dae8ab
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 64a8f2e48d53
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 17, 2019

  1. p4v: explicitly depend on openssl 1.0 series 

    The 2017.3 version of p4v is linked against `libssl.so.1.0.0`.  Since
the default openssl in NixOS 2019.09 has been changed to openssl 1.1,
the p4v package must now import the openssl_1_0_2 derivation.
    @nathyong
    nathyong committed Oct 17, 2019
    Copy the full SHA
    1ced63d View commit details

Commits on Nov 4, 2019

  1. Merge pull request #71301 from nathyong/p4v-openssl-patch 

    p4v: explicitly depend on openssl 1.0 series
    @roberth
    roberth authored Nov 4, 2019
    Copy the full SHA
    64a8f2e View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/version-management/p4v/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/p4v/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }:
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl_1_0_2, xkeyboard_config, wrapQtAppsHook }:

stdenv.mkDerivation rec {
pname = "p4v";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
qtscript
qtsensors
qtwebkit
openssl
openssl_1_0_2
];

dontWrapQtApps = true;
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
homepage = https://www.perforce.com;
license = stdenv.lib.licenses.unfreeRedistributable;
platforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.nioncode ];
maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ];
};
}