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: 2b51171fb6ea
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: d5ba826821ae
Choose a head ref
  • 12 commits
  • 8 files changed
  • 7 contributors

Commits on May 9, 2020

  1. Copy the full SHA
    a4c43d9 View commit details

Commits on May 10, 2020

  1. openbazaar: init at 0.14.2

    prusnak committed May 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    Copy the full SHA
    731cbde View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    Copy the full SHA
    47df73b View commit details

Commits on May 11, 2020

  1. lite: init at 1.03

    prusnak committed May 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    Copy the full SHA
    15a2a6d View commit details

Commits on May 12, 2020

  1. linux-rpi: use bcm2709 on arm32 rpi3

    “bcmrpi3_defconfig” isn’t provided for arm32, so we need to use
    bcm2709_config. When on arm64, we can still use bcmrpi3_defconfig
    matthewbauer committed May 12, 2020
    Copy the full SHA
    c78ad0f View commit details

Commits on May 13, 2020

  1. Copy the full SHA
    741c8c2 View commit details
  2. Copy the full SHA
    056ab3d View commit details
  3. Merge pull request #87576 from xtruder/pkgs/libvirtd/polkit

    libvirtd: polkit integration, security fixes
    offlinehacker authored May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9a29fe5 View commit details
  4. Merge pull request #87691 from matthewbauer/linux-rpi3-arm32

    linux-rpi: use bcm2709 on arm32 rpi3
    matthewbauer authored May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    233e60c View commit details
  5. Merge pull request #87434 from prusnak/lite

    lite: init at 1.03
    mmahut authored May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d977371 View commit details
  6. Merge pull request #87075 from prusnak/openbazaar

    openbazaar: init at 0.14.2
    mmahut authored May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dd2fffd View commit details
  7. Merge pull request #87332 from r-ryantm/auto-update/python2.7-Flask-H…

    …TTPAuth
    
    python27Packages.flask-httpauth: 3.3.0 -> 4.0.0
    ryantm authored May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d5ba826 View commit details
15 changes: 11 additions & 4 deletions nixos/modules/virtualisation/libvirtd.nix
Original file line number Diff line number Diff line change
@@ -7,10 +7,8 @@ let
cfg = config.virtualisation.libvirtd;
vswitch = config.virtualisation.vswitch;
configFile = pkgs.writeText "libvirtd.conf" ''
unix_sock_group = "libvirtd"
unix_sock_rw_perms = "0770"
auth_unix_ro = "none"
auth_unix_rw = "none"
auth_unix_ro = "polkit"
auth_unix_rw = "polkit"
${cfg.extraConfig}
'';
qemuConfigFile = pkgs.writeText "qemu.conf" ''
@@ -269,5 +267,14 @@ in {

systemd.sockets.libvirtd .wantedBy = [ "sockets.target" ];
systemd.sockets.libvirtd-tcp.wantedBy = [ "sockets.target" ];

security.polkit.extraConfig = ''
polkit.addRule(function(action, subject) {
if (action.id == "org.libvirt.unix.manage" &&
subject.isInGroup("libvirtd")) {
return polkit.Result.YES;
}
});
'';
};
}
58 changes: 58 additions & 0 deletions pkgs/applications/editors/lite/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{ stdenv
, fetchFromGitHub
, SDL2
, lua52Packages
, pkg-config
, makeWrapper
} :

stdenv.mkDerivation rec {
pname = "lite";
version = "1.03";

src = fetchFromGitHub {
owner = "rxi";
repo = pname;
rev = "v${version}";
sha256 = "1h8z4fav5ns9sm92axs3k9v6jgkqq0vg9mixza14949blr426mlj";
};

nativeBuildInputs = [ makeWrapper pkg-config ];

buildInputs = [ SDL2 lua52Packages.lua ];

postPatch = ''
# use system Lua 5.2
rm -rf src/lib/lua52
substituteInPlace src/api/api.h \
--replace '"lib/lua52/lua.h"' '<lua.h>' \
--replace '"lib/lua52/lauxlib.h"' '<lauxlib.h>' \
--replace '"lib/lua52/lualib.h"' '<lualib.h>'
'';

buildPhase = ''
# extracted and adapted from build.sh
CC=$NIX_CC/bin/cc
CFLAGS="-Wall -O3 -g -std=gnu11 -Isrc -DLUA_USE_POPEN $(pkg-config --cflags lua sdl2)"
LDFLAGS="$(pkg-config --libs lua sdl2)"
for f in $(find src -name "*.c"); do
$CC -c $CFLAGS $f -o "''${f//\//_}.o"
done
$CC *.o $LDFLAGS -o lite
'';

installPhase = ''
mkdir -p $out/bin $out/lib/${pname}
cp -a lite $out/lib/${pname}
cp -a data $out/lib/${pname}
makeWrapper $out/lib/${pname}/lite $out/bin/lite
'';

meta = with stdenv.lib; {
description = "A lightweight text editor written in Lua";
homepage = "https://github.com/rxi/lite";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
platforms = platforms.unix;
};
}
57 changes: 57 additions & 0 deletions pkgs/applications/networking/openbazaar/client.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{ stdenv
, fetchurl
, gcc-unwrapped
, dpkg
, bash
, nodePackages
, makeWrapper
, electron_6
}:

stdenv.mkDerivation rec {
pname = "openbazaar-client";
version = "2.4.4";

src = fetchurl {
url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb";
sha256 = "146vqwc1gv5zqcz60np8v9ps44m0d2yyjzqpmd4s0pcywvvwdvn6";
};

dontBuild = true;
dontConfigure = true;

nativeBuildInputs = [ makeWrapper ];

unpackPhase = ''
${dpkg}/bin/dpkg-deb -x $src .
'';

installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/{${pname},applications,pixmaps}
cp -a usr/lib/openbazaar2client/{locales,resources} $out/share/${pname}
cp -a usr/share/applications/openbazaar2client.desktop $out/share/applications/${pname}.desktop
cp -a usr/share/pixmaps/openbazaar2client.png $out/share/pixmaps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'openbazaar2client' 'openbazaar-client'
runHook postInstall
'';

postFixup = ''
makeWrapper ${electron_6}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
'';

meta = with stdenv.lib; {
description = "Decentralized Peer to Peer Marketplace for Bitcoin - client";
homepage = "https://www.openbazaar.org/";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
platforms = [ "x86_64-linux" ];
};
}
48 changes: 48 additions & 0 deletions pkgs/applications/networking/openbazaar/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{ stdenv
, fetchurl
}:

stdenv.mkDerivation rec {
pname = "openbazaar";
version = "0.14.2";

suffix = {
i686-linux = "linux-386";
x86_64-darwin = "darwin-10.6-amd64";
x86_64-linux = "linux-amd64";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

src = fetchurl {
url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}";
sha256 = {
i686-linux = "02kl4ci2pz86qqsll7578q0acygncsyylaschjzzii34c86f1aym";
x86_64-darwin = "1v5m94x4x0nc6i8zlcwb36ps1zpgqgcsz81x1ghkz5c9xzszgzbp";
x86_64-linux = "0m0digw66rzhwl2im88qavli9cc5vxd9pwj6ix86dcf98r93xsrp";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

dontUnpack = true;
dontConfigure = true;
dontBuild = true;
dontStrip = true;
dontPatchELF = true;
preferLocalBuild = true;

installPhase = ''
install -D $src $out/bin/openbazaard
'';

postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/bin/openbazaard
'';

meta = with stdenv.lib; {
description = "Decentralized Peer to Peer Marketplace for Bitcoin - daemon";
homepage = "https://www.openbazaar.org/";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ];
};
}
5 changes: 3 additions & 2 deletions pkgs/development/libraries/libvirt/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus
, enableXen ? false, xen ? null
, enableIscsi ? false, openiscsi
, enableCeph ? false, ceph
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ];
buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus
] ++ optionals stdenv.isLinux [
libpciaccess lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted
@@ -74,6 +74,7 @@ in stdenv.mkDerivation rec {
"--with-test"
"--with-esx"
"--with-remote"
"--with-polkit"
] ++ optionals stdenv.isLinux [
"QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
"QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/flask-httpauth/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "Flask-HTTPAuth";
version = "3.3.0";
version = "4.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "1fb1kr1iw6inkwfv160rpjx54vv1q9b90psdyyghyy1f6dhvgy3f";
sha256 = "1z3ad8sm24xl2lazdia92br1a2nigqwaf1lfsa77j5pz6gf2xmj7";
};

propagatedBuildInputs = [ flask ];
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/linux-rpi.nix
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ lib.overrideDerivation (buildLinux (args // {
defconfig = {
"1" = "bcmrpi_defconfig";
"2" = "bcm2709_defconfig";
"3" = "bcmrpi3_defconfig";
"3" = if stdenv.hostPlatform.isAarch64 then "bcmrpi3_defconfig" else "bcm2709_defconfig";
"4" = "bcm2711_defconfig";
}.${toString rpiVersion};

5 changes: 5 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -1974,6 +1974,8 @@ in

linuxptp = callPackage ../os-specific/linux/linuxptp { };

lite = callPackage ../applications/editors/lite { };

loadwatch = callPackage ../tools/system/loadwatch { };

loccount = callPackage ../development/tools/misc/loccount { };
@@ -5612,6 +5614,9 @@ in
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { };
openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { };

openbazaar = callPackage ../applications/networking/openbazaar { };
openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { };

opencc = callPackage ../tools/text/opencc { };

opencl-info = callPackage ../tools/system/opencl-info { };