diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-10-22 01:23:16 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-10-22 01:23:16 +0300 |
| commit | 16e7374533b48059fe65eaa9b473cb856bc78f19 (patch) | |
| tree | 382cb42d1caab5d2789437fe901c0eb6a05bb47d /pkgs/os-specific | |
| parent | f70118b91c109ea3d16a6abecc3ae916233060d1 (diff) | |
| parent | 0966f8282a22bb38d301db22e198954eacb90d52 (diff) | |
| download | nixpkgs-16e7374533b48059fe65eaa9b473cb856bc78f19.tar nixpkgs-16e7374533b48059fe65eaa9b473cb856bc78f19.tar.gz nixpkgs-16e7374533b48059fe65eaa9b473cb856bc78f19.tar.bz2 nixpkgs-16e7374533b48059fe65eaa9b473cb856bc78f19.tar.lz nixpkgs-16e7374533b48059fe65eaa9b473cb856bc78f19.tar.xz nixpkgs-16e7374533b48059fe65eaa9b473cb856bc78f19.tar.zst nixpkgs-16e7374533b48059fe65eaa9b473cb856bc78f19.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/nvme-cli/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sssd/default.nix | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 94fc9ca05e7..7912c67aa0b 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvme-cli-${version}"; - version = "0.9"; + version = "1.4"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "16n0gg1zx4fgadcq94kx6bgysqw60jvybjwynk7mj3fzdbvzrqyh"; + sha256 = "00jrr1mya9wkapiapph3nch3kpqas6vlc8kl8dbrjjfb5hg35gqf"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; description = "NVM-Express user space tooling for Linux"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ tavyc ]; + maintainers = with maintainers; [ primeos tavyc ]; }; } diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index ea49f9e4029..834476da0ca 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -3,7 +3,8 @@ python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper, - nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson }: + nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson + , withSudo ? false }: let docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; @@ -41,6 +42,8 @@ stdenv.mkDerivation rec { --with-ldb-lib-dir=$out/modules/ldb --with-nscd=${glibc.bin}/sbin/nscd ) + '' + stdenv.lib.optionalString withSudo '' + configureFlagsArray+=("--with-sudo") ''; enableParallelBuilding = true; |