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: b828d00ffdae
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: 48856a91c02b
Choose a head ref
  • 11 commits
  • 17 files changed
  • 8 contributors

Commits on Mar 22, 2018

  1. openpts: remove 

    Broken, dead prject that only was a PoC implementation.

(cherry picked from commit 678211b)
    @globin
    globin committed Mar 22, 2018
    Copy the full SHA
    a614f9f View commit details

  2. streamripper: Don't use included libmad 

    streamripper ships its own version of libmad, which does not compile on
clang, due to the usage of incompatible compiler flags. We can get the
build working by using the already packaged libmad, which includes
patches for clang.

(cherry picked from commit e770712)
    @knedlsepp @LnL7
    knedlsepp authored and LnL7 committed Mar 22, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    361bd59 View commit details

  3. kernel: enable CGROUP_NET_PRIO 

    It's required by systemd 238 because of a bug, otherwise systemd aborts.

(cherry picked from commit e31c3f8)
    @abbradar @fpletz
    abbradar authored and fpletz committed Mar 22, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01cce78 View commit details

  4. systemd: 237 -> 238 

    (cherry picked from commit 0ccab49)
    @abbradar @fpletz
    abbradar authored and fpletz committed Mar 22, 2018
    Copy the full SHA
    2d2ab94 View commit details

  5. ntbtls: fix darwin build 

    /cc ZHF #36454

(cherry picked from commit 366bf3a)
    @LnL7
    LnL7 committed Mar 22, 2018
    Copy the full SHA
    31ba589 View commit details

Commits on Mar 23, 2018

  1. libftdi1: add darwin platform 

    (cherry picked from commit d0df007)
    @thefloweringash @bjornfor
    thefloweringash authored and bjornfor committed Mar 23, 2018

    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
    eef14cb View commit details

  2. avrdude: add darwin platform 

    (cherry picked from commit b488848)
    @thefloweringash @bjornfor
    thefloweringash authored and bjornfor committed Mar 23, 2018
    Copy the full SHA
    01204cf View commit details

  3. vis: patch shebang to use system bash 

    (cherry picked from commit 0203a62)
    @Mic92
    Mic92 committed Mar 23, 2018

    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
    3cf448f View commit details

  4. Remove HIE package set until automation can be put in place. 

    (cherry picked from commit ead2ba8)
    @shlevy
    shlevy committed Mar 23, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rycee Robert Helgesson
    GPG key ID: 36BDAA14C2797E89
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9e804ba View commit details

  5. wine: disable bindnow hardening 

    (cherry picked from commit ba960ac)
    @xzfc @dezgeg
    xzfc authored and dezgeg committed Mar 23, 2018

    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
    cdb9735 View commit details

  6. systemd: use stable tree 

    This fixes a bug with changed qemu network interface names and also generally
should be preferred to using a release tag.

(cherry picked from commit 6b9771e)
    @abbradar @fpletz
    abbradar authored and fpletz committed Mar 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    ehamberg Erlend Hamberg
    GPG key ID: 839A1C97961D54B3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48856a9 View commit details
4 changes: 2 additions & 2 deletions nixos/modules/system/boot/systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -137,7 +137,6 @@ let

# Slices / containers.
"slices.target"
"system.slice"
"user.slice"
"machine.slice"
"machines.target"
@@ -821,7 +820,8 @@ in

system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled
[ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET"
"SYSFS" "PROC_FS" "FHANDLE" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL"
"SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC"
"CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL"
"TMPFS_XATTR" "SECCOMP"
];

5 changes: 2 additions & 3 deletions pkgs/applications/audio/streamripper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }:
{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }:

stdenv.mkDerivation rec {
name = "streamripper-${version}";
@@ -10,13 +10,12 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libogg libvorbis ];
buildInputs = [ glib libogg libvorbis libmad ];

meta = with stdenv.lib; {
homepage = http://streamripper.sourceforge.net/;
description = "Application that lets you record streaming mp3 to your hard drive";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ the-kenny ];
};
}
4 changes: 4 additions & 0 deletions pkgs/applications/editors/vis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
libselinux
];

postPatch = ''
patchShebangs ./configure
'';

LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";

Loading