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: 9c691e6fd72f
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: ac2e87944c3b
Choose a head ref
  • 20 commits
  • 18 files changed
  • 16 contributors

Commits on Nov 15, 2019

  1. Add configuration for GitHub stale bot

    The configuration added is taken from RFC 0051, and is the first step
    toward implementing it. Next, we will have to enable the stale bot by
    installing the GitHub application.
    
    https://github.com/NixOS/rfcs/blob/master/rfcs/0051-mark-stale-issues.md
    ryantm committed Nov 15, 2019
    Copy the full SHA
    dc4339d View commit details

Commits on Nov 16, 2019

  1. Copy the full SHA
    3344f3e View commit details
  2. multibootusb: Fix QT and refactor

    Also removed myself as maintainer because I don't care about this
    software anymore.
    jD91mZM2 authored and bjornfor committed Nov 16, 2019
    Copy the full SHA
    227c4c8 View commit details
  3. Copy the full SHA
    d0aec3b View commit details
  4. retroarch: 1.7.8.4 -> 1.8.1

    WayaOS authored and bjornfor committed Nov 16, 2019
    Copy the full SHA
    08a8976 View commit details
  5. Copy the full SHA
    17e0d73 View commit details
  6. gpxsee: 7.16 -> 7.17

    sikmir authored and bjornfor committed Nov 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    1421eee View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8c42dba View commit details
  8. steam: use 32bit version of libva

    Jonathan Ringer authored and FRidh committed Nov 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    87c674d View commit details
  9. cargo-bloat: 0.9.0 -> 0.9.1

    xrelkd authored and bjornfor committed Nov 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0b21ea6 View commit details
  10. fbida: extend description

    Add the tools names to the package description to make it discoverable
    by e.g. `nix search`
    vojta001 authored and bjornfor committed Nov 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    16281a9 View commit details
  11. Merge pull request #68914 from dtzWill/update/broot-0.9.5

    broot: 0.9.4 -> 0.10.2
    dtzWill authored Nov 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ed2819a View commit details
  12. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7889ec6 View commit details
  13. vimPlugins: update

    timokau committed Nov 16, 2019
    Copy the full SHA
    1defbf4 View commit details
  14. deployAndroidPackage: prefer local builds

    These derivations just unzip something and maybe do a little patching,
    so there's no benefit to sending the zip file off to a build server and
    then downloading the unzipped results again.
    jameysharp authored and bjornfor committed Nov 16, 2019
    Copy the full SHA
    5d1c9ce View commit details
  15. john: copy rules

    copy rules so that they are available to john at runtime
    without this, john fails when run with default settings
    livnev authored and bjornfor committed Nov 16, 2019
    Copy the full SHA
    efd3b45 View commit details
  16. gaia: restrict to X86 platforms

    ARM Hydra build keeps failing
    c0bw3b authored Nov 16, 2019
    Copy the full SHA
    bc77ec7 View commit details
  17. Merge pull request #73498 from timokau/vimPlugins-2019-11-16

    vimPlugins: update
    timokau authored Nov 16, 2019
    Copy the full SHA
    b41e2cf View commit details
  18. efitools: fix build with gnu-efi >= 3.0.11

     (#73503)
    c0bw3b authored Nov 16, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    3bd26af View commit details
  19. Merge pull request #73444 from ryantm/stale

    Add configuration for GitHub stale bot
    ryantm authored Nov 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ac2e879 View commit details
32 changes: 32 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 180
# Number of days of inactivity before a stale issue is closed
daysUntilClose: false
# Issues with these labels will never be considered stale
exemptLabels:
- 1.severity: security
# Label to use when marking an issue as stale
staleLabel: 2.status: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
Thank you for your contributions.
This has been automatically marked as stale because it has had no
activity for 180 days.
If this is still important to you, we ask that you leave a
comment below. Your comment can be as simple as "still important
to me". This lets people see that at least one person still cares
about this. Someone will have to do this at most twice a year if
there is no other activity.
Here are suggestions that might help resolve this more quickly:
1. Search for maintainers and people that previously touched the
related code and @ mention them in a comment.
2. Ask on the [NixOS Discourse](https://discourse.nixos.org/).
3. Ask on the [#nixos channel](irc://irc.freenode.net/#nixos) on
[irc.freenode.net](https://freenode.net).
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
4 changes: 2 additions & 2 deletions pkgs/applications/editors/texstudio/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg,
poppler, zlib, pkgconfig }:
wrapQtAppsHook, poppler, zlib, pkgconfig }:

mkDerivation rec {
pname = "texstudio";
@@ -12,7 +12,7 @@ mkDerivation rec {
sha256 = "0ck65fvz6mzfpqdb1ndgyvgxdnslrwhdr1swgck4gaghcrgbg3gq";
};

nativeBuildInputs = [ qmake pkgconfig ];
nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];
buildInputs = [ qtbase qtscript qtsvg poppler zlib ];

qmakeFlags = [ "NO_APPDATA=True" ];
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/fbida/default.nix
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
description = "Image viewing and manipulation programs";
description = "Image viewing and manipulation programs including fbi, fbgs, ida, exiftran and thumbnail.cgi";
homepage = https://www.kraxel.org/blog/linux/fbida/;
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gpxsee/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

mkDerivation rec {
pname = "gpxsee";
version = "7.16";
version = "7.17";

src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "1mkfhb2c9qafjpva600nyn6yik49l4q1k6id1xvrci37wsn6ijav";
sha256 = "10mch709m4ws73yzkrx9lm2hwzl179ggpk6xkbhkvnl7rsd2yz08";
};

nativeBuildInputs = [ qmake ];
78 changes: 50 additions & 28 deletions pkgs/applications/misc/multibootusb/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }:
{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps,
python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }:

# Note: Multibootusb is tricky to maintain. It relies on the
# $PYTHONPATH variable containing some of their code, so that
# something like:
#
# from scripts import config
#
# works. It also relies on the current directory to find some runtime
# resources thanks to a use of __file__.
#
# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59

python36Packages.buildPythonApplication rec {
pname = "multibootusb";
name = "${pname}-${version}";
version = "9.2.0";

nativeBuildInputs = [
wrapQtAppsHook
];

buildInputs = [
python36Packages.dbus-python
python36Packages.pyqt5
python36Packages.pytest-shutil
python36Packages.python
python36Packages.pyudev
python36Packages.six
libxcb
mtools
p7zip
parted
procps
python36Packages.python
qt5.full
utillinux
];
@@ -28,32 +40,42 @@ python36Packages.buildPythonApplication rec {
sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3";
};

# Skip the fixup stage where stuff is shrinked (can't shrink text files)
phases = [ "unpackPhase" "installPhase" ];

installPhase = ''
share="$out/share/${pname}"
mkdir -p "$share"
cp -r data "$share/data"
cp -r scripts "$share/scripts"
cp "${pname}" "$share/${pname}"
mkdir "$out/bin"
cat > "$out/bin/${pname}" <<EOF
#!${runtimeShell}
cd "$share"
export PYTHONPATH="$PYTHONPATH:$share"
export PATH="$PATH:${parted}/bin:${procps}/bin"
"${python36Packages.python}/bin/python" "${pname}"
EOF
chmod +x "$out/bin/${pname}"
# Tests can't run inside the NixOS sandbox
# "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"
doCheck = false;

pythonPath = [
python36Packages.dbus-python
python36Packages.pyqt5
python36Packages.pytest-shutil
python36Packages.pyudev
python36Packages.six
];

makeWrapperArgs = [
# Firstly, add all necessary QT variables
"\${qtWrapperArgs[@]}"

# Then, add the installed scripts/ directory to the python path
"--prefix" "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages"

# Finally, move to directory that contains data
"--run" "\"cd $out/share/${pname}\""
];

postInstall = ''
# This script doesn't work and it doesn't add much anyway
rm $out/bin/multibootusb-pkexec
# The installed data isn't sufficient for whatever reason, missing gdisk/gdisk.exe
mkdir -p "$out/share/${pname}"
cp -r data "$out/share/${pname}/data"
'';

meta = with stdenv.lib; {
description = "Multiboot USB creator for Linux live disks";
homepage = http://multibootusb.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ jD91mZM2 ];
maintainers = []; # Looking for a maintainer!
};
}
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gaia/default.nix
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/MTG/gaia";
description = "General library to work with points in a semimetric space";
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.all;
platforms = platforms.x86; # upstream assume SSE2 / fails on ARM
license = licenses.agpl3;
};
}
3 changes: 3 additions & 0 deletions pkgs/development/libraries/jitterentropy/default.nix
Original file line number Diff line number Diff line change
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {

preInstall = ''
mkdir -p $out/include
substituteInPlace Makefile \
--replace "install -m 0755 -s" \
'install -m 0755 -s --strip-program $(STRIP)'
'';

installFlags = [
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ stdenv.mkDerivation ({
name = package.name + "-" + package.revision;
src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all;
buildInputs = [ unzip ] ++ buildInputs;
preferLocalBuild = true;

# Most Android Zip packages have a root folder, but some don't. We unpack
# the zip file in a folder and we try to discover whether it has a single root
35 changes: 8 additions & 27 deletions pkgs/development/ocaml-modules/facile/default.nix
Original file line number Diff line number Diff line change
@@ -1,38 +1,19 @@
{ stdenv, fetchurl, ocaml, findlib }:
{ lib, fetchurl, buildDunePackage }:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-facile-${version}";

version = "1.1.3";
buildDunePackage rec {
pname = "facile";
version = "1.1.4";

src = fetchurl {
url = "http://opti.recherche.enac.fr/facile/distrib/facile-${version}.tar.gz";
sha256 = "1v4apqcw4gm36ph5xwf1wxaaza0ggvihvgsdslnf33fa1pdkvdjw";
url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz";
sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp";
};

dontAddPrefix = 1;

buildInputs = [ ocaml findlib ];

createFindlibDestdir = true;

installFlags = [ "FACILEDIR=$(OCAMLFIND_DESTDIR)/facile" ];

postInstall = ''
cat > $OCAMLFIND_DESTDIR/facile/META <<EOF
version = "${version}"
name = "facile"
description = "A Functional Constraint Library"
requires = ""
archive(byte) = "facile.cma"
archive(native) = "facile.cmxa"
EOF
'';
doCheck = true;

meta = {
homepage = "http://opti.recherche.enac.fr/facile/";
license = stdenv.lib.licenses.lgpl21Plus;
license = lib.licenses.lgpl21Plus;
description = "A Functional Constraint Library";
platforms = stdenv.lib.platforms.unix;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/tools/rust/cargo-bloat/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-bloat";
version = "0.9.0";
version = "0.9.1";

src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
sha256 = "03pzp5d9kzbx62jpjzgww0x3qv9f08blvl8f4yg5hrlyaaa06xsd";
sha256 = "0wzsc8azxgvavsbsdpd1i6g8i4sp07wn9iayr8dp8072ig5c4fhy";
};

cargoSha256 = "1jc1lx0yk8galkyc4a67d39ywsfrgc2sjjsz08p47gpz7228d64w";
2 changes: 1 addition & 1 deletion pkgs/games/steam/chrootenv.nix
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ in buildFHSUserEnv rec {
xorg.libX11
xorg.libXfixes
libGL
libva
pkgsi686Linux.libva

# Not formally in runtime but needed by some games
at-spi2-atk
12 changes: 8 additions & 4 deletions pkgs/misc/emulators/retroarch/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,14 @@
, ffmpeg, libGLU_combined, freetype, libxml2, python3
, libobjc, AppKit, Foundation
, alsaLib ? null
, libdrm ? null
, libpulseaudio ? null
, libv4l ? null
, libX11 ? null
, libXdmcp ? null
, libXext ? null
, libXxf86vm ? null
, mesa ? null
, SDL2 ? null
, udev ? null
, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
@@ -27,12 +29,12 @@ let

in stdenv.mkDerivation rec {
pname = "retroarch-bare";
version = "1.7.8.4";
version = "1.8.1";

src = fetchFromGitHub {
owner = "libretro";
repo = "RetroArch";
sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph";
sha256 = "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7";
rev = "v${version}";
};

@@ -43,11 +45,13 @@ in stdenv.mkDerivation rec {
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
++ optional withVulkan [ vulkan-loader ]
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
++ optionals stdenv.isLinux [ alsaLib libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm udev ];
++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm mesa udev ];

enableParallelBuilding = true;

configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else "";

postInstall = optionalString withVulkan ''
wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
'' + optionalString stdenv.targetPlatform.isDarwin ''
Loading