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

Commits on Mar 1, 2019

  1. osinfo-db-tools: 1.2.0 -> 1.4.0 

    add new dep json-glib
    @dtzWill
    dtzWill committed Mar 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    greg-1-anderson Greg Anderson
    GPG key ID: ED613886A7C8119A
    Verified
    Learn about vigilant mode
    Copy the full SHA
    38cc275 View commit details

  2. osinfo-db: 20181214 -> 20190301

    @dtzWill
    dtzWill committed Mar 1, 2019
    Copy the full SHA
    b5506c0 View commit details

  3. libosinfo: 1.2.0 -> 1.4.0

    @dtzWill
    dtzWill committed Mar 1, 2019
    Copy the full SHA
    1831d2c View commit details

Commits on Mar 7, 2019

  1. Merge pull request #56598 from dtzWill/update/osinfo-1.4.0 

    libosinfo: 1.2.0 -> 1.4.0
    @dtzWill
    dtzWill authored Mar 7, 2019
    Copy the full SHA
    2f29fdb View commit details
Showing with 12 additions and 20 deletions.
  1. +4 −3 pkgs/data/misc/osinfo-db/default.nix
  2. +2 −12 pkgs/development/libraries/libosinfo/default.nix
  3. +6 −5 pkgs/tools/misc/osinfo-db-tools/default.nix
7 changes: 4 additions & 3 deletions pkgs/data/misc/osinfo-db/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:

stdenv.mkDerivation rec {
name = "osinfo-db-20181214";
pname = "osinfo-db";
version = "20190301";

src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
sha256 = "18ym54wvhvjk66fqpsfvfd5b7d7743dvfqrcq91w1n71r20fkhcd";
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "1rjqizsglgdcjxi7kpbwm26krdkrlxacinjp9684sfzhqwdqi4as";
};

nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
14 changes: 2 additions & 12 deletions pkgs/development/libraries/libosinfo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
}:

stdenv.mkDerivation rec {
name = "libosinfo-1.2.0";
name = "libosinfo-1.4.0";

src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.gz";
sha256 = "0y2skfrcg38y212qqd26vs3sg566j3qnsgvvm23pfi4j7z7ly9gf";
sha256 = "0ra1p2rnnwkq0181ayn0l0rs1pvk4a0i8fa08nqjfmqs5fl637m2";
};

outputs = [ "out" "dev" "devdoc" ];
@@ -20,16 +20,6 @@ stdenv.mkDerivation rec {

patches = [
./osinfo-db-data-dir.patch
# Fix bug causing tests to fail (and presumably the real scenarios they're representative of)
# using upstream commits:
(fetchpatch {
url = "https://gitlab.com/libosinfo/libosinfo/commit/b9cb227842948b1b2289cdd3e9b8d925664c2ee7.patch";
sha256 = "0nj0wmibq52j8qbzmxfzj76fpkqjs18kssbb9lmfhz16s30darbw";
})
(fetchpatch {
url = "https://gitlab.com/libosinfo/libosinfo/commit/e6168463f4fc659b9827b5c8694dc1c6d7d5239a.patch";
sha256 = "135yfhjm2wxip5dnng3r9k9igfhdi1083ys4a4f3ipjxfskcs9rv";
})
];

postPatch = ''
11 changes: 6 additions & 5 deletions pkgs/tools/misc/osinfo-db-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2
, libxslt, libarchive, bzip2, lzma
, libxslt, libarchive, bzip2, lzma, json-glib
}:

stdenv.mkDerivation rec {
name = "osinfo-db-tools-1.2.0";
pname = "osinfo-db-tools";
version = "1.4.0";

src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.gz";
sha256 = "07zqbwsmdgnzqah2smm4zri04c0qm82z1jn8kzz1bnsqbfg84l1v";
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz";
sha256 = "08zpjq1g27n6wmmqwxws95w045warhg9bxcv1phvkdcrddf15q3y";
};

nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ glib libxml2 libxslt libarchive bzip2 lzma ];
buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma ];

meta = with stdenv.lib; {
description = "Tools for managing the osinfo database";