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

Commits on Dec 29, 2020

  1. libiscsi: init at 1.19.0

    @misuzu
    misuzu committed Dec 29, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c205883 View commit details

  2. qemu: libiscsi support

    @misuzu
    misuzu committed Dec 29, 2020
    Copy the full SHA
    c5dd597 View commit details

Commits on Jan 17, 2021

  1. Merge pull request #95274 from misuzu/qemu-iscsi

    @SuperSandro2000
    SuperSandro2000 authored Jan 17, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1afec60 View commit details
Showing with 28 additions and 0 deletions.
  1. +3 −0 pkgs/applications/virtualization/qemu/default.nix
  2. +23 −0 pkgs/development/libraries/libiscsi/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
3 changes: 3 additions & 0 deletions pkgs/applications/virtualization/qemu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@
, cephSupport ? false, ceph
, openGLSupport ? sdlSupport, mesa, epoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer
, libiscsiSupport ? true, libiscsi
, smbdSupport ? false, samba
, tpmSupport ? true
, hostCpuOnly ? false
@@ -72,6 +73,7 @@ stdenv.mkDerivation rec {
++ optionals cephSupport [ ceph ]
++ optionals openGLSupport [ mesa epoxy libdrm ]
++ optionals virglSupport [ virglrenderer ]
++ optionals libiscsiSupport [ libiscsi ]
++ optionals smbdSupport [ samba ];

enableParallelBuilding = true;
@@ -148,6 +150,7 @@ stdenv.mkDerivation rec {
++ optional openGLSupport "--enable-opengl"
++ optional virglSupport "--enable-virglrenderer"
++ optional tpmSupport "--enable-tpm"
++ optional libiscsiSupport "--enable-libiscsi"
++ optional smbdSupport "--smbd=${samba}/bin/smbd";

doCheck = false; # tries to access /dev
23 changes: 23 additions & 0 deletions pkgs/development/libraries/libiscsi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:

stdenv.mkDerivation rec {
pname = "libiscsi";
version = "1.19.0";

src = fetchFromGitHub {
owner = "sahlberg";
repo = "libiscsi";
rev = version;
sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7";
};

nativeBuildInputs = [ autoreconfHook ];

meta = with stdenv.lib; {
description = "iscsi client library and utilities";
homepage = "https://github.com/sahlberg/libiscsi";
license = licenses.lgpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ misuzu ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5796,6 +5796,8 @@ in

libircclient = callPackage ../development/libraries/libircclient { };

libiscsi = callPackage ../development/libraries/libiscsi { };

libisds = callPackage ../development/libraries/libisds { };

libite = callPackage ../development/libraries/libite { };