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: f412e19996f0
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: 718ee42eb974
Choose a head ref

Commits on Aug 14, 2018

  1. nixos/switch-to-configuration: reload user units

    When rebuilding you have to manually run `systemctl --user
    daemon-reload`. It gathers all authenticated users using
    `loginctl list-user` and runs `daemon-reload` for each of them.
    
    This is a first step towards a `nixos-rebuild` which is able to reload
    user units from systemd. The entire task is fairly hard, however I
    consider this patch usable as it allows to restart units without running
    `daemon-reload` for each authenticated user.
    Ma27 committed Aug 14, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    fc2bde6 View commit details

Commits on Aug 19, 2018

  1. Copy the full SHA
    17876c2 View commit details

Commits on Aug 22, 2018

  1. strace: check machine personalities for all non-x86 architectures

    This allows strace to be built for ppc64le as well.
    Jona Stubbe committed Aug 22, 2018
    Copy the full SHA
    ee152d5 View commit details
  2. sudo: 1.8.23 -> 1.8.24 (#45476)

    dtzWill authored and xeji committed Aug 22, 2018
    Copy the full SHA
    7c62994 View commit details
  3. busybox: 1.29.1 -> 1.29.2 (#45473)

    Website's summary of changes:
    
    > Bug fix release. 1.29.2 has fixes for fdisk (compat fixes, allow 2TB+ sizes), gzip (FEATURE_GZIP_LEVELS was producing badly-compressed .gz), hexedit (segfault fix).
    dtzWill authored and xeji committed Aug 22, 2018
    Copy the full SHA
    7deef2e View commit details

Commits on Aug 23, 2018

  1. Merge pull request #45472 from CrystalGamma/strace_3

    strace: check machine personalities for all non-x86 architectures
    Mic92 authored Aug 23, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    97bfb34 View commit details
  2. texlive-bin: disable mfluajit on ppc64(le) (#45475)

    LuaJIT currently has no 64-bit Power support and so breaks the build on such platforms.
    CrystalGamma authored and xeji committed Aug 23, 2018
    Copy the full SHA
    43eb8b9 View commit details

Commits on Aug 24, 2018

  1. makeWrapper: document --set-default

    alyssais authored and globin committed Aug 24, 2018
    Copy the full SHA
    f4745be View commit details

Commits on Aug 25, 2018

  1. Merge master into staging

    FRidh committed Aug 25, 2018
    Copy the full SHA
    8fbe3a4 View commit details
  2. Merge staging into staging-next

    FRidh committed Aug 25, 2018
    Copy the full SHA
    6d35919 View commit details

Commits on Aug 26, 2018

  1. Merge master into staging-next

    FRidh committed Aug 26, 2018
    Copy the full SHA
    9cae0fe View commit details

Commits on Aug 27, 2018

  1. mandoc: 1.13.4 -> 1.14.4

    bb010g committed Aug 27, 2018
    Copy the full SHA
    a28dc89 View commit details
  2. Copy the full SHA
    23bf21f View commit details
  3. Copy the full SHA
    cf54311 View commit details
  4. Merge pull request #45643 from NixOS/staging-next

    Staging next
    FRidh authored Aug 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    87e44b0 View commit details
  5. mandoc: fix cc detection

    Mic92 committed Aug 27, 2018
    Copy the full SHA
    df4696c View commit details
  6. Merge pull request #45665 from worldofpeace/solargraph/0.25.1

    solargraph: 0.23.6 -> 0.25.1
    srhb authored Aug 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    614e789 View commit details
  7. Merge pull request #45642 from bb010g/update-mandoc

    mandoc: 1.13.4 -> 1.14.4
    Mic92 authored Aug 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    78efb59 View commit details
  8. Merge pull request #45664 from worldofpeace/lollypop/0.9.522

    lollypop: 0.9.521 -> 0.9.522
    Mic92 authored Aug 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    71a8778 View commit details
  9. udftools: 1.0.0b3 -> 2.0 (#45583)

    This path also migrates to the github repo.
    dguibert authored and xeji committed Aug 27, 2018
    Copy the full SHA
    2f6cc89 View commit details
  10. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    213f7ec View commit details
  11. Merge pull request #45667 from adisbladis/weechat-matrix-bridge

    weechat-matrix-bridge: 2018-01-10 -> 2018-05-29
    adisbladis authored Aug 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0c8f860 View commit details
  12. Copy the full SHA
    4e365aa View commit details
  13. Merge pull request #45281 from Gerschtli/zsh-completion

    nixos/zsh: Adds enableGlobalCompInit option
    Mic92 authored Aug 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    831ecca View commit details
  14. navit: add supports, xkdb, and many fixes

    Bignaux Ronan committed Aug 27, 2018
    Copy the full SHA
    866f9bb View commit details
  15. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    fca8135 View commit details
  16. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    8f07a0b View commit details
  17. Merge pull request #44990 from Ma27/reload-user-units-during-activation

    nixos/switch-to-configuration: reload user units
    Mic92 authored Aug 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a6ced42 View commit details
  18. Merge pull request #45657 from bignaux/navit

    navit: add supports, xkdb, and many fixes
    Mic92 authored Aug 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    718ee42 View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -425,6 +425,11 @@
github = "Baughn";
name = "Svein Ove Aas";
};
bb010g = {
email = "me@bb010g.com";
github = "bb010g";
name = "Brayden Banks";
};
bbarker = {
email = "brandon.barker@gmail.com";
github = "bbarker";
7 changes: 7 additions & 0 deletions nixos/doc/manual/release-notes/rl-1809.xml
Original file line number Diff line number Diff line change
@@ -470,6 +470,13 @@ inherit (pkgs.nixos {
The module option <option>nix.useSandbox</option> is now defaulted to <literal>true</literal>.
</para>
</listitem>
<listitem>
<para>
The config activation script of <literal>nixos-rebuild</literal> now
<link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link>
all user units for each authenticated user.
</para>
</listitem>
</itemizedlist>
</section>
</section>
15 changes: 14 additions & 1 deletion nixos/modules/programs/zsh/zsh.nix
Original file line number Diff line number Diff line change
@@ -87,6 +87,19 @@ in
type = types.bool;
};


enableGlobalCompInit = mkOption {
default = cfg.enableCompletion;
description = ''
Enable execution of compinit call for all interactive zsh shells.
This option can be disabled if the user wants to extend its
<literal>fpath</literal> and a custom <literal>compinit</literal>
call in the local config is required.
'';
type = types.bool;
};

};

};
@@ -159,7 +172,7 @@ in
fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
done
${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}
${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"}
${cfge.interactiveShellInit}
12 changes: 12 additions & 0 deletions nixos/modules/system/activation/switch-to-configuration.pl
Original file line number Diff line number Diff line change
@@ -412,6 +412,18 @@ sub filterUnits {
# Make systemd reload its units.
system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;

# Reload user units
open my $listActiveUsers, '-|', '@systemd@/bin/loginctl', 'list-users', '--no-legend';
while (my $f = <$listActiveUsers>) {
next unless $f =~ /^\s*(?<uid>\d+)\s+(?<user>\S+)/;
my ($uid, $name) = ($+{uid}, $+{user});
print STDERR "reloading user units for $name...\n";

system("su", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
}

close $listActiveUsers;

# Set the new tmpfiles
print STDERR "setting up tmpfiles\n";
system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3;
4 changes: 2 additions & 2 deletions pkgs/applications/audio/lollypop/default.nix
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
, python36Packages, gnome3, glib, gst_all_1 }:

stdenv.mkDerivation rec {
version = "0.9.521";
version = "0.9.522";
name = "lollypop-${version}";

src = fetchgit {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "1iwv0fj50h0xynv152anisbq29jfbmb9hpm60kaa9a9hdiypskcc";
sha256 = "0f2brwv884cvmxj644jcj9sg5hix3wvnjy2ndg0fh5cxyqz0kwn5";
};

nativeBuildInputs = with python36Packages; [
13 changes: 13 additions & 0 deletions pkgs/applications/misc/navit/CMakeLists.txt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 763f75b..defa74a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,7 @@ CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H)
CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H)
CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND)
-CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD)
+CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD)
CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET)
CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM)
CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF)
65 changes: 48 additions & 17 deletions pkgs/applications/misc/navit/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined,
libXmu, freeglut, pcre, dbus-glib, glib, librsvg, freeimage, libxslt,
qtbase, qtquickcontrols, qtsvg, qtdeclarative, qtlocation, qtsensors, qtmultimedia, qtspeech, espeak,
cairo, gdk_pixbuf, pango, atk, patchelf, fetchurl, bzip2,
python, gettext, quesoglc, gd, postgresql, cmake, shapelib, SDL_ttf, fribidi}:
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2
, SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib
, librsvg, freeimage, libxslt, cairo, gdk_pixbuf, pango
, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc
, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper
, qtquickcontrols, qtmultimedia, qtspeech, qtsensors
, qtlocation, qtdeclarative, qtsvg
, qtSupport ? false, qtbase #need to fix qt_qpainter
, sdlSupport ? true, SDL
, xkbdSupport ? true, xkbd
, espeakSupport ? true, espeak
, postgresqlSupport ? false, postgresql
, speechdSupport ? false, speechd ? null
}:

assert speechdSupport -> speechd != null;

with stdenv.lib;
stdenv.mkDerivation rec {
name = "navit-${version}";
version = "0.5.1";
@@ -21,34 +33,53 @@ stdenv.mkDerivation rec {
sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d";
};

#hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
patches = [ ./CMakeLists.txt.patch ];

NIX_CFLAGS_COMPILE = optional sdlSupport "-I${SDL.dev}/include/SDL"
++ optional speechdSupport "-I${speechd}/include/speech-dispatcher";

# TODO: fix speech options.
cmakeFlags = [ "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-Dsupport/espeak=FALSE" "-Dspeech/qt5_espeak=FALSE" ];
# we choose only cmdline and speech-dispatcher speech options.
# espeak builtins is made for non-cmdline OS as winCE
cmakeFlags = [
"-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
"-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE"
];

buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined freeimage libxslt
libXmu freeglut python gettext quesoglc gd postgresql qtbase SDL_ttf fribidi pcre qtquickcontrols
espeak qtmultimedia qtspeech qtsensors qtlocation qtdeclarative qtsvg dbus-glib librsvg shapelib glib
cairo gdk_pixbuf pango atk ];
buildInputs = [
gtk2 fontconfig freetype imlib2 libGLU_combined freeimage
libxslt libXmu freeglut python gettext quesoglc gd
fribidi pcre dbus dbus-glib librsvg shapelib glib
cairo gdk_pixbuf pango atk
] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ]
++ optional postgresqlSupport postgresql
++ optional speechdSupport speechd
++ optionals qtSupport [
qtquickcontrols qtmultimedia qtspeech qtsensors
qtbase qtlocation qtdeclarative qtsvg
];

nativeBuildInputs = [ pkgconfig cmake patchelf bzip2 ];
nativeBuildInputs = [ makeWrapper pkgconfig cmake patchelf bzip2 ];

# we dont want blank screen by defaut
postInstall = ''
# emulate DSAMPLE_MAP
mkdir -p $out/share/navit/maps/maps
mkdir -p $out/share/navit/maps/
bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"
'';

# TODO: fix upstream?
postFixup = ''
for lib in $(find "$out/lib/navit/" -iname "*.so" ); do
patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} $lib
patchelf --set-rpath ${makeLibraryPath buildInputs} $lib
done
wrapProgram $out/bin/navit \
--prefix PATH : ${makeBinPath (
optional xkbdSupport xkbd
++ optional espeakSupport espeak
++ optional speechdSupport speechd ) }
'';

meta = with stdenv.lib; {
meta = {
homepage = http://www.navit-project.org;
description = "Car navigation system with routing engine using OSM maps";
license = licenses.gpl2;
794 changes: 397 additions & 397 deletions pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix

Large diffs are not rendered by default.

794 changes: 397 additions & 397 deletions pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }:

stdenv.mkDerivation {
name = "weechat-matrix-bridge-2018-01-10";
name = "weechat-matrix-bridge-2018-05-29";
src = fetchFromGitHub {
owner = "torhve";
repo = "weechat-matrix-protocol-script";
rev = "a8e4ce04665c09ee7f24d6b319cd85cfb56dfbd7";
sha256 = "0822xcxvwanwm8qbzqhn3f1m6hhxs29pyf8lnv6v29bl8136vcq3";
rev = "ace3fefc0e35a627f8a528032df2e3111e41eb1b";
sha256 = "1snf8vn5n9wzrnqnvdrcli4199s5p114jbjlgrj5c27i53173wqw";
};

patches = [
21 changes: 12 additions & 9 deletions pkgs/build-support/setup-hooks/make-wrapper.sh
Original file line number Diff line number Diff line change
@@ -11,15 +11,18 @@ assertExecutable() {
# makeWrapper EXECUTABLE ARGS

# ARGS:
# --argv0 NAME : set name of executed process to NAME
# (otherwise it’s called …-wrapped)
# --set VAR VAL : add VAR with value VAL to the executable’s environment
# --unset VAR : remove VAR from the environment
# --run COMMAND : run command before the executable
# The command can push extra flags to a magic list variable
# extraFlagsArray, which are then added to the invocation
# of the executable
# --add-flags FLAGS : add FLAGS to invocation of executable
# --argv0 NAME : set name of executed process to NAME
# (otherwise it’s called …-wrapped)
# --set VAR VAL : add VAR with value VAL to the executable’s
# environment
# --set-default VAR VAL : like --set, but only adds VAR if not already set in
# the environment
# --unset VAR : remove VAR from the environment
# --run COMMAND : run command before the executable
# The command can push extra flags to a magic list
# variable extraFlagsArray, which are then added to
# the invocation of the executable
# --add-flags FLAGS : add FLAGS to invocation of executable

# --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP
# --suffix
8 changes: 4 additions & 4 deletions pkgs/development/ruby-modules/solargraph/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
solargraph (0.23.6)
ruby-progressbar (1.10.0)
solargraph (0.25.1)
coderay (~> 1.1)
eventmachine (~> 1.2, >= 1.2.5)
htmlentities (~> 4.3, >= 4.3.4)
@@ -40,7 +40,7 @@ GEM
thor (0.20.0)
tilt (2.0.8)
unicode-display_width (1.4.0)
yard (0.9.15)
yard (0.9.16)

PLATFORMS
ruby
@@ -49,4 +49,4 @@ DEPENDENCIES
solargraph!

BUNDLED WITH
1.16.2
1.16.3
12 changes: 6 additions & 6 deletions pkgs/development/ruby-modules/solargraph/gemset.nix
Original file line number Diff line number Diff line change
@@ -118,19 +118,19 @@
ruby-progressbar = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
type = "gem";
};
version = "1.9.0";
version = "1.10.0";
};
solargraph = {
dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01lh5vibr277vhhrgk6zl09ivb262c1qpk54ahzhc40zs309842b";
sha256 = "1b5dljgskjpkpv2l0jpb6i8j73hidskcbp2v7fhjp7kpx94x6php";
type = "gem";
};
version = "0.23.6";
version = "0.25.1";
};
thor = {
source = {
@@ -159,9 +159,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "145pbc0x95s6x296kh1wp5ykwy6srfcz946dgj83s35g8p52z4q4";
sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67";
type = "gem";
};
version = "0.9.15";
version = "0.9.16";
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/misc/strace/default.nix
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k

configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";
configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";

# fails 1 out of 523 tests with
# "strace-k.test: failed test: ../../strace -e getpid -k ../stack-fcall output mismatch"
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/busybox/default.nix
Original file line number Diff line number Diff line change
@@ -32,14 +32,14 @@ let
in

stdenv.mkDerivation rec {
name = "busybox-1.29.1";
name = "busybox-1.29.2";

# Note to whoever is updating busybox: please verify that:
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
# still builds after the update.
src = fetchurl {
url = "https://busybox.net/downloads/${name}.tar.bz2";
sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw";
sha256 = "0qax9926qx9lpxiw75f4hkknz1pg0zcn5pkjx5gqfibs2ipgmlk7";
};

hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
19 changes: 14 additions & 5 deletions pkgs/tools/filesystems/udftools/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{ stdenv, fetchurl, ncurses, readline }:
{ stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }:

stdenv.mkDerivation rec {
name = "udftools-${version}";
version = "1.0.0b3";
src = fetchurl {
url = "mirror://sourceforge/linux-udf/udftools/${version}/${name}.tar.gz";
sha256 = "180414z7jblby64556i8p24rcaas937zwnyp1zg073jdin3rw1y5";
version = "2.0";
src = fetchFromGitHub {
owner = "pali";
repo = "udftools";
rev = "${version}";
sha256 = "0mz04h3rki6ljwfs15z83gf4vv816w7xgz923waiqgmfj9xpvx87";
};

buildInputs = [ ncurses readline ];
nativeBuildInputs = [ autoreconfHook ];

hardeningDisable = [ "fortify" ];

@@ -21,6 +24,12 @@ stdenv.mkDerivation rec {
sed -e '38i#include <string.h>' -i wrudf/wrudf-cdrw.c
sed -e '12i#include <string.h>' -i wrudf/wrudf-cdr.c
sed -e '37i#include <stdlib.h>' -i wrudf/ide-pc.c
sed -e "s@\$(DESTDIR)/lib/udev/rules.d@$out/lib/udev/rules.d@" -i pktsetup/Makefile.am
'';

postFixup = ''
sed -i -e "s@/usr/sbin/pktsetup@$out/sbin/pktsetup@" $out/lib/udev/rules.d/80-pktsetup.rules
'';

meta = with stdenv.lib; {
16 changes: 11 additions & 5 deletions pkgs/tools/misc/mandoc/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "mandoc-${version}";
version = "1.13.4";
version = "1.14.4";

src = fetchurl {
url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz";
sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a";
url = "https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz";
sha256 = "24eb72103768987dcc63b53d27fdc085796330782f44b3b40c4660b1e1ee9b9c";
};

buildInputs = [ zlib ];
@@ -19,17 +19,23 @@ stdenv.mkDerivation rec {
HAVE_MANPATH=1
LD_OHASH="-lutil"
BUILD_DB=0
CC=${stdenv.cc.targetPrefix}cc
'';

patches = [
./remove-broken-cc-check.patch
];

preConfigure = ''
echo $configureLocal > configure.local
'';

meta = with stdenv.lib; {
homepage = http://mdocml.bsd.lv/;
homepage = https://mandoc.bsd.lv/;
description = "suite of tools compiling mdoc and man";
downloadPage = "http://mandoc.bsd.lv/snapshots/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ ramkromberg ];
maintainers = with maintainers; [ bb010g ramkromberg ];
};
}
11 changes: 11 additions & 0 deletions pkgs/tools/misc/mandoc/remove-broken-cc-check.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- mandoc-1.14.4.org/configure 2018-08-08 15:51:51.000000000 +0100
+++ mandoc-1.14.4/configure 2018-08-27 08:19:40.391912427 +0100
@@ -40,7 +40,7 @@
OSNAME=
UTF8_LOCALE=

-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
+CC=
CFLAGS=
LDADD=
LDFLAGS=
4 changes: 2 additions & 2 deletions pkgs/tools/security/sudo/default.nix
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@
}:

stdenv.mkDerivation rec {
name = "sudo-1.8.23";
name = "sudo-1.8.24";

src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
sha256 = "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq";
sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l";
};

prePatch = ''
5 changes: 3 additions & 2 deletions pkgs/tools/typesetting/tex/texlive/bin.nix
Original file line number Diff line number Diff line change
@@ -95,12 +95,13 @@ core = stdenv.mkDerivation rec {

configureFlags = common.configureFlags
++ [ "--without-x" ] # disable xdvik and xpdfopen
++ map (what: "--disable-${what}") [
++ map (what: "--disable-${what}") ([
"dvisvgm" "dvipng" # ghostscript dependency
"luatex" "luajittex" "mp" "pmp" "upmp" "mf" # cairo would bring in X and more
"xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small
]
] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit")
++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure

;

enableParallelBuilding = true;