Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f54cb38d8515
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 36af9cbb4c53
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Oct 8, 2018

  1. libbsd: 0.8.7 -> 0.9.1 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libbsd
    @matthewbauer
    R. RyanTM authored and matthewbauer committed Oct 8, 2018
    Copy the full SHA
    a29f2f2 View commit details

Commits on Oct 13, 2018

  1. libbsd: update patches

    @matthewbauer
    matthewbauer committed Oct 13, 2018
    Copy the full SHA
    7c61bb6 View commit details

  2. Merge pull request #48344 from matthewbauer/auto-update/libbsd 

    Auto update/libbsd
    @matthewbauer
    matthewbauer authored Oct 13, 2018
    Copy the full SHA
    36af9cb View commit details
222 changes: 0 additions & 222 deletions pkgs/development/libraries/libbsd/cdefs.patch
View file

This file was deleted.

752 changes: 205 additions & 547 deletions pkgs/development/libraries/libbsd/darwin.patch
View file

Large diffs are not rendered by default.

15 changes: 3 additions & 12 deletions pkgs/development/libraries/libbsd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,27 +2,18 @@

stdenv.mkDerivation rec {
name = "libbsd-${version}";
version = "0.8.7";
version = "0.9.1";

src = fetchurl {
url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz";
sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m";
sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
};

# darwin changes configure.ac which means we need to regenerate
# the configure scripts
nativeBuildInputs = [ autoreconfHook ];

patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch
# Suitable for all, but limited to musl to avoid rebuilds
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
# https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490
./non-glibc.patch
# https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd
./cdefs.patch
# https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404
./features.patch
];
patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch;

meta = with stdenv.lib; {
description = "Common functions found on BSD systems";
26 changes: 0 additions & 26 deletions pkgs/development/libraries/libbsd/features.patch
View file

This file was deleted.

74 changes: 0 additions & 74 deletions pkgs/development/libraries/libbsd/non-glibc.patch
View file

This file was deleted.