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: 9149da788f9d
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: db96124d3d5a
Choose a head ref

Commits on Sep 18, 2019

  1. Copy the full SHA
    7854b86 View commit details
  2. fprintd: 0.8.1 -> 0.9.0

    Resolves issues with StateDirectory not being set in
    systemd unit.
    
    https://gitlab.freedesktop.org/libfprint/fprintd/-/tags/V_0_9_0
    worldofpeace committed Sep 18, 2019
    Copy the full SHA
    e264403 View commit details

Commits on Sep 27, 2019

  1. libdigidocpp: 3.13.7 -> 3.14.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/libdigidocpp/versions
    r-ryantm committed Sep 27, 2019
    Copy the full SHA
    5855ba8 View commit details
  2. libsolv: 0.7.5 -> 0.7.6

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/libsolv/versions
    r-ryantm committed Sep 27, 2019
    Copy the full SHA
    b7d7389 View commit details
  3. neo4j: 3.5.8 -> 3.5.11

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/neo4j/versions
    r-ryantm committed Sep 27, 2019
    Copy the full SHA
    4ac8b05 View commit details
  4. obs-studio: 23.2.1 -> 24.0.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/obs-studio/versions
    r-ryantm committed Sep 27, 2019
    Copy the full SHA
    15da9ce View commit details
  5. powerdns: 4.1.13 -> 4.2.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/powerdns/versions
    r-ryantm committed Sep 27, 2019
    Copy the full SHA
    d8f5f0e View commit details
  6. openapi-generator-cli: 4.1.0 -> 4.1.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/openapi-generator-cli/versions
    r-ryantm committed Sep 27, 2019
    Copy the full SHA
    1d67d64 View commit details
  7. go-ethereum: 1.9.3 -> 1.9.5

    xrelkd committed Sep 27, 2019
    Copy the full SHA
    042597a View commit details

Commits on Sep 28, 2019

  1. parlatype: 1.6.1 -> 1.6.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/parlatype/versions
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    4008ba7 View commit details
  2. phoronix-test-suite: 8.8.1 -> 9.0.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/phoronix-test-suite/versions
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    801268a View commit details
  3. python37Packages.canmatrix: 0.7 -> 0.8

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-canmatrix/versions
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    44b7c0a View commit details
  4. python37Packages.azure-batch: 7.0.0 -> 8.0.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-azure-batch/versions
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    30414d6 View commit details
  5. python37Packages.azure-mgmt-signalr: 0.2.0 -> 0.3.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-azure-mgmt-signalr/versions
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    484fa51 View commit details
  6. python37Packages.flask-restplus: 0.12.1 -> 0.13.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-flask-restplus/versions
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    d56f066 View commit details

Commits on Sep 30, 2019

  1. sdImage: add option to enable bzip2 compression

    also make SD image compression the default setup.
    Fixes issues with output size such as: https://hydra.nixos.org/build/102163603
    AmineChikhaoui committed Sep 30, 2019
    Copy the full SHA
    6ce605e View commit details
  2. Merge pull request #69865 from AmineChikhaoui/sd-image-compression

    sdImage: add option to enable bzip2 compression
    samueldr authored Sep 30, 2019
    Copy the full SHA
    ece3eba View commit details
  3. Merge pull request #69771 from r-ryantm/auto-update/python3.7-flask-r…

    …estplus
    
    python37Packages.flask-restplus: 0.12.1 -> 0.13.0
    Jon authored Sep 30, 2019
    Copy the full SHA
    149600c View commit details

Commits on Oct 1, 2019

  1. Merge pull request #69767 from r-ryantm/auto-update/python3.7-azure-m…

    …gmt-signalr
    
    python37Packages.azure-mgmt-signalr: 0.2.0 -> 0.3.0
    Jon authored Oct 1, 2019
    Copy the full SHA
    c71efe0 View commit details
  2. Merge pull request #69759 from r-ryantm/auto-update/python3.7-azure-b…

    …atch
    
    python37Packages.azure-batch: 7.0.0 -> 8.0.0
    Jon authored Oct 1, 2019
    Copy the full SHA
    3924ad2 View commit details
  3. Merge pull request #69757 from r-ryantm/auto-update/python3.7-canmatrix

    python37Packages.canmatrix: 0.7 -> 0.8
    Jon authored Oct 1, 2019
    Copy the full SHA
    c6785de View commit details
  4. Merge pull request #69738 from r-ryantm/auto-update/phoronix-test-suite

    phoronix-test-suite: 8.8.1 -> 9.0.0
    Jon authored Oct 1, 2019
    Copy the full SHA
    64271dc View commit details
  5. Merge pull request #69724 from xrelkd/update/go-ethereum

    go-ethereum: 1.9.3 -> 1.9.5
    Jon authored Oct 1, 2019
    Copy the full SHA
    2be1eac View commit details
  6. Merge pull request #69726 from r-ryantm/auto-update/parlatype

    parlatype: 1.6.1 -> 1.6.2
    Jon authored Oct 1, 2019
    Copy the full SHA
    0480cb2 View commit details
  7. Merge pull request #69694 from r-ryantm/auto-update/neo4j

    neo4j: 3.5.8 -> 3.5.11
    Jon authored Oct 1, 2019
    Copy the full SHA
    90c7ea4 View commit details
  8. Merge pull request #69701 from r-ryantm/auto-update/obs-studio

    obs-studio: 23.2.1 -> 24.0.1
    Jon authored Oct 1, 2019
    Copy the full SHA
    5a2eaf5 View commit details
  9. Merge pull request #69708 from r-ryantm/auto-update/openapi-generator…

    …-cli
    
    openapi-generator-cli: 4.1.0 -> 4.1.2
    Jon authored Oct 1, 2019
    Copy the full SHA
    2009c26 View commit details
  10. Merge pull request #69707 from r-ryantm/auto-update/powerdns

    powerdns: 4.1.13 -> 4.2.0
    Jon authored Oct 1, 2019
    Copy the full SHA
    5dd2ff3 View commit details
  11. llvm/compiler-rt: fix on i686

    Only turn on cross related flags when useLLVM = true.
    
    Fixes #66693
    matthewbauer committed Oct 1, 2019
    Copy the full SHA
    d303a2f View commit details
  12. llvm/compiler: preserve hashes

    Don’t require a mass rebuild for this fix.
    matthewbauer committed Oct 1, 2019
    Copy the full SHA
    a7dc5c6 View commit details
  13. Copy the full SHA
    1f95c9c View commit details
  14. Merge pull request #69908 from matthewbauer/fix-clang-i686

    llvm/compiler-rt: fix on i686
    matthewbauer authored Oct 1, 2019
    Copy the full SHA
    0ce8688 View commit details
  15. Merge pull request #69651 from r-ryantm/auto-update/libdigidocpp

    libdigidocpp: 3.13.7 -> 3.14.0
    Jon authored Oct 1, 2019
    Copy the full SHA
    3eb7f10 View commit details
  16. Merge pull request #69654 from r-ryantm/auto-update/libsolv

    libsolv: 0.7.5 -> 0.7.6
    Jon authored Oct 1, 2019
    Copy the full SHA
    dd57c16 View commit details
  17. blueman: no optional networkmanager

    blueman declares NetworkManager gi bindings
    as a required runtime dependency [0]
    
    Fixes #69555
    
    [0]: https://github.com/blueman-project/blueman/blob/531da47b06de3617492cc5ae5530ca8b3f2e12a4/Dependencies.md
    worldofpeace committed Oct 1, 2019
    Copy the full SHA
    fcb84c5 View commit details
  18. python37Packages.marshmallow-sqlalchemy: 0.17.0 -> 0.19.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-marshmallow-sqlalchemy/versions
    r-ryantm authored and Jon committed Oct 1, 2019
    Copy the full SHA
    187cf4a View commit details
  19. python37Packages.meld3: 1.0.2 -> 2.0.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-meld3/versions
    r-ryantm authored and Jon committed Oct 1, 2019
    Copy the full SHA
    549c0ee View commit details
  20. python27Packages.pycdio: 2.0.0 -> 2.1.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python2.7-pycdio/versions
    r-ryantm authored and Jon committed Oct 1, 2019
    Copy the full SHA
    90c6fba View commit details
  21. python37Packages.python-gitlab: 1.9.0 -> 1.11.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-python-gitlab/versions
    r-ryantm authored and Jon committed Oct 1, 2019
    Copy the full SHA
    a86acc7 View commit details
  22. mawk: 1.3.4-20171017 -> 1.3.4-20190203

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/mawk/versions
    r-ryantm authored and Jon committed Oct 1, 2019
    Copy the full SHA
    494b1d5 View commit details
  23. python37Packages.dbf: 0.98.2 -> 0.98.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-dbf/versions
    r-ryantm authored and Jon committed Oct 1, 2019
    Copy the full SHA
    72e8043 View commit details
  24. quassel: Fix use of mkDerivation

    The `with stdenv;` would override the `mkDerivation` to be the regular
    one, instead of the libsForQt5 one.
    
    This simply removes the dangerous use of the all-encompassing `with`,
    and prefers using a more precise inherit for `lib`.
    
    See #65399
    
    Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
    samueldr and worldofpeace committed Oct 1, 2019
    Copy the full SHA
    c52b5b8 View commit details
  25. Merge pull request #67746 from samueldr/pkgs/quassel/fix-wrapQtAppsHook

    quassel: Fix use of `mkDerivation`
    worldofpeace authored Oct 1, 2019
    Copy the full SHA
    0daea5f View commit details
  26. davix: 0.7.4 -> 0.7.5

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/davix/versions
    r-ryantm authored and Jon committed Oct 1, 2019
    Copy the full SHA
    3fea7b5 View commit details
  27. Merge pull request #70149 from worldofpeace/blueman-fix

    blueman: no optional networkmanager
    worldofpeace authored Oct 1, 2019
    Copy the full SHA
    fb17018 View commit details
  28. flatpak-builder: 1.0.8 -> 1.0.9

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/flatpak-builder/versions
    r-ryantm authored and Jon committed Oct 1, 2019
    Copy the full SHA
    13ccc86 View commit details
  29. epson-escpr2: 1.0.29 -> 1.1.1

    The build was failing because the source rpm does not exist
    on epsons servers anymore.
    
    Thus bumping it to an existing version
    https://hydra.nixos.org/build/101990975/nixlog/5
    d-goldin authored and worldofpeace committed Oct 1, 2019
    Copy the full SHA
    e338105 View commit details
  30. Merge pull request #69376 from d-goldin/bump-epson-escpr2

    epson-escpr2: 1.0.29 -> 1.1.1
    worldofpeace authored Oct 1, 2019
    Copy the full SHA
    1ac5e08 View commit details
  31. Merge pull request #68995 from worldofpeace/bump/libfprint

    fprintd: 0.8.1 -> 0.9.0, libfprint: 0.99 -> 1.0
    worldofpeace authored Oct 1, 2019
    Copy the full SHA
    db96124 View commit details
Showing with 168 additions and 103 deletions.
  1. +1 −1 nixos/doc/manual/release-notes/rl-2003.xml
  2. +17 −2 nixos/modules/installer/cd-dvd/sd-image.nix
  3. +0 −7 nixos/modules/services/security/fprintd.nix
  4. +2 −2 pkgs/applications/audio/parlatype/default.nix
  5. +2 −2 pkgs/applications/blockchains/go-ethereum.nix
  6. +9 −6 pkgs/applications/networking/irc/quassel/default.nix
  7. +2 −2 pkgs/applications/video/obs-studio/default.nix
  8. +5 −5 pkgs/development/compilers/llvm/7/compiler-rt.nix
  9. +3 −4 pkgs/development/compilers/llvm/8/compiler-rt.nix
  10. +2 −3 pkgs/development/compilers/llvm/9/compiler-rt.nix
  11. +2 −2 pkgs/development/libraries/libdigidocpp/default.nix
  12. +43 −10 pkgs/development/libraries/libfprint/default.nix
  13. +2 −2 pkgs/development/libraries/libsolv/default.nix
  14. +2 −2 pkgs/development/python-modules/azure-batch/default.nix
  15. +2 −2 pkgs/development/python-modules/azure-mgmt-signalr/default.nix
  16. +2 −2 pkgs/development/python-modules/canmatrix/default.nix
  17. +2 −2 pkgs/development/python-modules/dbf/default.nix
  18. +2 −2 pkgs/development/python-modules/flask-restplus/default.nix
  19. +2 −2 pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
  20. +2 −2 pkgs/development/python-modules/meld3/default.nix
  21. +2 −2 pkgs/development/python-modules/pycdio/default.nix
  22. +2 −2 pkgs/development/python-modules/python-gitlab/default.nix
  23. +2 −2 pkgs/development/tools/flatpak-builder/default.nix
  24. +6 −3 pkgs/misc/drivers/epson-escpr2/default.nix
  25. +2 −2 pkgs/servers/dns/powerdns/default.nix
  26. +2 −2 pkgs/servers/nosql/neo4j/default.nix
  27. +3 −6 pkgs/tools/bluetooth/blueman/default.nix
  28. +2 −2 pkgs/tools/misc/phoronix-test-suite/default.nix
  29. +3 −3 pkgs/tools/networking/davix/default.nix
  30. +2 −2 pkgs/tools/networking/openapi-generator-cli/default.nix
  31. +36 −13 pkgs/tools/security/fprintd/default.nix
  32. +2 −2 pkgs/tools/text/mawk/default.nix
2 changes: 1 addition & 1 deletion nixos/doc/manual/release-notes/rl-2003.xml
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@

<itemizedlist>
<listitem>
<para />
<para>SD images are now compressed by default using <literal>bzip2</literal>.</para>
</listitem>
</itemizedlist>
</section>
19 changes: 17 additions & 2 deletions nixos/modules/installer/cd-dvd/sd-image.nix
Original file line number Diff line number Diff line change
@@ -98,6 +98,16 @@ in
populate the ./files/boot (/boot) directory.
'';
};

compressImage = mkOption {
type = types.bool;
default = true;
description = ''
Whether the SD image should be compressed using
<command>bzip2</command>.
'';
};

};

config = {
@@ -118,10 +128,12 @@ in

sdImage.storePaths = [ config.system.build.toplevel ];

system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux }: stdenv.mkDerivation {
system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux, bzip2 }: stdenv.mkDerivation {
name = config.sdImage.imageName;

nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux ];
nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 ];

inherit (config.sdImage) compressImage;

buildCommand = ''
mkdir -p $out/nix-support $out/sd-image
@@ -168,6 +180,9 @@ in
# Verify the FAT partition before copying it.
fsck.vfat -vn firmware_part.img
dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
if test -n "$compressImage"; then
bzip2 $img
fi
'';
}) {};

7 changes: 0 additions & 7 deletions nixos/modules/services/security/fprintd.nix
Original file line number Diff line number Diff line change
@@ -50,13 +50,6 @@ in

systemd.packages = [ cfg.package ];


# The upstream unit does not use StateDirectory, and will
# fail if the directory it needs is not present. Should be
# fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5
# is merged.
systemd.services.fprintd.serviceConfig.StateDirectory = "fprint";

};

}
4 changes: 2 additions & 2 deletions pkgs/applications/audio/parlatype/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "parlatype";
version = "1.6.1";
version = "1.6.2";

src = fetchFromGitHub {
owner = "gkarsay";
repo = pname;
rev = "v${version}";
sha256 = "0b811lwiylrjirx88gi9az1b1b71j2i5a4a6g56wp9qxln6lzjj2";
sha256 = "157423f40l8nd5da6y0qjmg4l3125zailp98w2hda3mxxn1j5ix3";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/go-ethereum.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
pname = "go-ethereum";
version = "1.9.3";
version = "1.9.5";

goPackagePath = "github.com/ethereum/go-ethereum";

@@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "0lv6gxp34j26hqazcvyr4c7rsl1vljm6cfzkcmlapsjdgym505bg";
sha256 = "1h1c02dgazlcgp9lrm0zsig80nfj0c9553jy9nsvjyzf95ym1542";
};

meta = with stdenv.lib; {
15 changes: 9 additions & 6 deletions pkgs/applications/networking/irc/quassel/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
, static ? false # link statically

, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf
, qtbase, qtscript
, mkDerivation, qtbase, qtscript
, phonon, libdbusmenu, qca-qt5

, withKDE ? true # enable KDE integration
@@ -20,6 +20,7 @@
}:

let
inherit (stdenv) lib;
buildClient = monolithic || client;
buildCore = monolithic || enableDaemon;
in
@@ -31,7 +32,7 @@ assert !buildClient -> !withKDE; # KDE is used by the client only
let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];

in with stdenv; mkDerivation rec {
in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
name = "quassel${tag}-${version}";
version = "0.13.1";

@@ -67,13 +68,15 @@ in with stdenv; mkDerivation rec {
++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE";

preFixup =
dontWrapQtApps = true;

postFixup =
lib.optionalString enableDaemon ''
wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
'' +
lib.optionalString buildClient ''
wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/applications/video/obs-studio/default.nix
Original file line number Diff line number Diff line change
@@ -37,13 +37,13 @@ let
optional = stdenv.lib.optional;
in mkDerivation rec {
pname = "obs-studio";
version = "23.2.1";
version = "24.0.1";

src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = version;
sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz";
sha256 = "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5";
};

nativeBuildInputs = [ cmake
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/7/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

cmakeFlags = [
cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false || stdenv.isDarwin) [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
@@ -26,7 +26,7 @@ stdenv.mkDerivation {

patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
] ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) ./crtbegin-and-end.patch
++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;

# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/config-ix.cmake \
--replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
'' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
'' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
substituteInPlace lib/builtins/int_util.c \
--replace "#include <stdlib.h>" ""
substituteInPlace lib/builtins/clear_cache.c \
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
# Hack around weird upsream RPATH bug
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
ln -s "$out/lib"/*/* "$out/lib"
'' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
'' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
7 changes: 3 additions & 4 deletions pkgs/development/compilers/llvm/8/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

cmakeFlags = [
cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
@@ -37,7 +36,7 @@ stdenv.mkDerivation {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch;
++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) ./crtbegin-and-end.patch;

# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
@@ -47,7 +46,7 @@ stdenv.mkDerivation {
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/config-ix.cmake \
--replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
'' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
'' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
substituteInPlace lib/builtins/int_util.c \
--replace "#include <stdlib.h>" ""
substituteInPlace lib/builtins/clear_cache.c \
5 changes: 2 additions & 3 deletions pkgs/development/compilers/llvm/9/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

cmakeFlags = [
cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
@@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/config-ix.cmake \
--replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
'' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
'' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
substituteInPlace lib/builtins/int_util.c \
--replace "#include <stdlib.h>" ""
substituteInPlace lib/builtins/clear_cache.c \
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libdigidocpp/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@
, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:

stdenv.mkDerivation rec {
version = "3.13.7";
version = "3.14.0";
pname = "libdigidocpp";

src = fetchurl {
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
sha256 = "1d8yx8avijp55p53fz4pd4ihjz6nyap0g8dq23bwg33411mdiqff";
sha256 = "0klbr881d56661d1lqlv4ivxhxcv2q16ivlz7r0rb901wilq5jyl";
};

nativeBuildInputs = [ cmake pkgconfig xxd ];
53 changes: 43 additions & 10 deletions pkgs/development/libraries/libfprint/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
{ thinkpad ? false, stdenv, fetchFromGitHub, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3
, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43, openssl ? null }:
{ thinkpad ? false
, stdenv
, fetchFromGitHub
, fetchurl
, pkgconfig
, meson
, ninja
, libusb
, pixman
, glib
, nss
, gtk3
, coreutils
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_43
, openssl ? null
}:

assert thinkpad -> openssl != null;

stdenv.mkDerivation rec {
pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "0.99.0";
version = "1.0";

src = {
libfprint-thinkpad =
@@ -16,19 +32,36 @@ stdenv.mkDerivation rec {
sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
};
libfprint = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz";
sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187";
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
};
}.${pname};

buildInputs = [ libusb pixman glib nss gtk3 ]
++ stdenv.lib.optional thinkpad openssl;
nativeBuildInputs = [
pkgconfig
meson
ninja
gtk-doc
docbook_xsl
docbook_xml_dtd_43
];

nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ];
buildInputs = [
libusb
pixman
glib
nss
gtk3
]
++ stdenv.lib.optional thinkpad openssl
;

mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ];
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
"-Dx11-examples=false"
];

preConfigure = ''
postPatch = ''
substituteInPlace libfprint/meson.build \
--replace /bin/echo ${coreutils}/bin/echo
'';
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libsolv/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:

stdenv.mkDerivation rec {
version = "0.7.5";
version = "0.7.6";
pname = "libsolv";

src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
sha256 = "0khks19i01s9h297c7af4bpq448abs2pqw55scf56xfdvxpv23aw";
sha256 = "0rrf7i2zs2kbz6k2sj1mg30i05h2msl1q9h95dp5brq2k0w94rna";
};

cmakeFlags = [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/azure-batch/default.nix
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

buildPythonPackage rec {
pname = "azure-batch";
version = "7.0.0";
version = "8.0.0";

src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1q8mdjdbz408z2j0y1zxqg9zg8j1v84p0dnh621vq73a2x1g298j";
sha256 = "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi";
};

propagatedBuildInputs = [
Original file line number Diff line number Diff line change
@@ -9,12 +9,12 @@

buildPythonPackage rec {
pname = "azure-mgmt-signalr";
version = "0.2.0";
version = "0.3.0";

src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0k39hf6r2rfy2wyxd9czha2mwmcqf6sc1v69jyh6ml3slbliivlz";
sha256 = "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a";
};

propagatedBuildInputs = [
Loading