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: 3c67a29608d8
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: e46ee5e09d70
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 25, 2018

  1. libhandy: 0.0.5 -> 0.0.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/libhandy/versions
    @r-ryantm
    r-ryantm committed Dec 25, 2018
    Copy the full SHA
    f53e751 View commit details

  2. libuchardet: 0.0.5 → 0.0.6

    @jtojnar
    jtojnar committed Dec 25, 2018
    Copy the full SHA
    e32a9ca View commit details

  3. gtest: build shared library 

    Arch provides shared library as well.
    @jtojnar
    jtojnar committed Dec 25, 2018
    Copy the full SHA
    1f6b095 View commit details

  4. Merge pull request #52856 from jtojnar/uchardet-fdo 

    libuchardet: 0.0.5 → 0.0.6
    @jtojnar
    jtojnar authored Dec 25, 2018
    Copy the full SHA
    0c4887c View commit details

  5. Merge pull request #52851 from r-ryantm/auto-update/libhandy 

    libhandy: 0.0.5 -> 0.0.6
    @jtojnar
    jtojnar authored Dec 25, 2018
    Copy the full SHA
    e46ee5e View commit details
Showing with 25 additions and 13 deletions.
  1. +6 −0 pkgs/development/libraries/gtest/default.nix
  2. +2 −2 pkgs/development/libraries/libhandy/default.nix
  3. +17 −11 pkgs/development/libraries/libuchardet/default.nix
6 changes: 6 additions & 0 deletions pkgs/development/libraries/gtest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@ stdenv.mkDerivation rec {
name = "gtest-${version}";
version = "1.8.1";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "google";
repo = "googletest";
@@ -12,6 +14,10 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ninja ];

cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
];

meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests";
homepage = https://github.com/google/googletest;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libhandy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

let
pname = "libhandy";
version = "0.0.5";
version = "0.0.6";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
owner = "Librem5";
repo = pname;
rev = "v${version}";
sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08";
sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5";
};

nativeBuildInputs = [
28 changes: 17 additions & 11 deletions pkgs/development/libraries/libuchardet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
{ stdenv, fetchFromGitHub, cmake }:
{ stdenv, fetchurl, cmake }:

stdenv.mkDerivation rec {
name = "libuchardet-${version}";
pname = "uchardet";
version = "0.0.6";

version = "0.0.5";
outputs = [ "bin" "out" "man" "dev" ];

src = fetchFromGitHub {
owner = "BYVoid";
repo = "uchardet";
rev = "v${version}";
sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm";
src = fetchurl {
url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz";
sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3";
};

buildInputs = [ cmake ];

doCheck = false; # fails all the tests (ctest)
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
# TODO: move the following to CMake setup hook
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
"-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man"
];

doCheck = true;

meta = with stdenv.lib; {
description = "Mozilla's Universal Charset Detector C/C++ API";
homepage = https://www.byvoid.com/zht/project/uchardet;
license = licenses.mpl11;
homepage = https://www.freedesktop.org/wiki/Software/uchardet/;
license = licenses.mpl11;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; unix;
};