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: eda44a6d29bd
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: 02380e784167
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Nov 15, 2019

  1. nixos/lorri: add to environment.systemPackages 

    most likely, people enabling the lorri module also want to use it,
without explicitly having to add it to users.users.<username>.packages.

cc @curiousleo @Profpatsch

(cherry picked from commit fd7d88f)
    @flokli
    flokli committed Nov 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    78486a8 View commit details

  2. pythonPackages.nixpart: unmark broken 

    (cherry picked from commit 75667c2)
    @lheckemann
    lheckemann committed Nov 15, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d76f279 View commit details

  3. 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.

(cherry picked from commit 1ced63d)

cc #71301
Closes: #73456
    @nathyong @veprbl
    nathyong authored and veprbl committed Nov 15, 2019
    Copy the full SHA
    02380e7 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −0 nixos/modules/services/development/lorri.nix
  2. +3 −3 pkgs/applications/version-management/p4v/default.nix
  3. +0 −1 pkgs/tools/filesystems/nixpart/default.nix
2 changes: 2 additions & 0 deletions nixos/modules/services/development/lorri.nix
View file
Original file line number Diff line number Diff line change
@@ -41,5 +41,7 @@ in {
Restart = "on-failure";
};
};

environment.systemPackages = [ pkgs.lorri ];
};
}
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 ];
};
}
1 change: 0 additions & 1 deletion pkgs/tools/filesystems/nixpart/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,5 @@ buildPythonApplication rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.aszlig ];
platforms = stdenv.lib.platforms.linux;
broken = true;
};
}