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: 8fe63a0c1e72
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: 68c70cfe9e6e
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Oct 16, 2018

  1. blivet: fix reference to selinux python modules

    @rbvermaa
    rbvermaa committed Oct 16, 2018
    Copy the full SHA
    7ceea6f View commit details

  2. nixpart0.blivet: fix reference to selinux python modules

    @rbvermaa
    rbvermaa committed Oct 16, 2018
    Copy the full SHA
    7194185 View commit details

  3. libssh: 0.7.5 -> 0.7.6 

    Fixes CVE-2018-10933:

libssh versions 0.6 and above have an authentication bypass
vulnerability in the server code. By presenting the server an
SSH2_MSG_USERAUTH_SUCCESS message in place of the
SSH2_MSG_USERAUTH_REQUEST message which the server would expect to
initiate authentication, the attacker could successfully authentciate
without any credentials.

Source:
https://www.libssh.org/2018/10/16/libssh-0-8-4-and-0-7-6-security-and-bugfix-release/
(cherry picked from commit eca4628)
    @lheckemann
    lheckemann committed Oct 16, 2018
    Copy the full SHA
    4a74821 View commit details

  4. terraform-providers.libvirt: fix plugin output (#48577) 

    Terraform depends on this binary name format to detect the provider
version.

(cherry picked from commit 7786575)
    @zimbatm
    zimbatm committed Oct 16, 2018
    Copy the full SHA
    68c70cf View commit details
6 changes: 5 additions & 1 deletion pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
# USAGE:
# install the following package globally or in nix-shell:
#
# (terraform.withPlugins (old: [terraform-provider-libvirt]))
# (terraform.withPlugins (p: [p.libvirt]))
#
# configuration.nix:
#
@@ -36,6 +36,10 @@ buildGoPackage rec {
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
propagatedBuildInputs = [ cdrtools ];

# Terraform allow checking the provider versions, but this breaks
# if the versions are not provided via file paths.
postBuild = "mv go/bin/terraform-provider-libvirt{,_v${version}}";

meta = with stdenv.lib; {
homepage = https://github.com/dmacvicar/terraform-provider-libvirt;
description = "Terraform provider for libvirt";
6 changes: 3 additions & 3 deletions pkgs/development/libraries/libssh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }:

stdenv.mkDerivation rec {
name = "libssh-0.7.5";
name = "libssh-0.7.6";

src = fetchurl {
url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz";
sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l";
url = "https://www.libssh.org/files/0.7/libssh-0.7.6.tar.xz";
sha256 = "14hhdpn2hflywsi9d5bz2pfjxqkyi07znjij89cpakr7b4w7sq0x";
};

patches = [
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/blivet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ in buildPythonPackage rec {
'';

propagatedBuildInputs = [
pykickstart pyparted pyblock pyudev selinuxWithPython cryptsetupWithPython
pykickstart pyparted pyblock pyudev selinuxWithPython.py cryptsetupWithPython
six
];

2 changes: 1 addition & 1 deletion pkgs/tools/filesystems/nixpart/0.4/blivet.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ buildPythonApplication rec {
'';

propagatedBuildInputs = [
pykickstart pyparted pyblock libselinux cryptsetup
pykickstart pyparted pyblock libselinux.py cryptsetup
] ++ stdenv.lib.optional useNixUdev systemd;

# tests are currently _heavily_ broken upstream