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

Commits on Sep 20, 2020

  1. gusb: 0.3.3 -> 0.3.5

    doronbehar committed Sep 20, 2020
    Copy the full SHA
    0934289 View commit details
  2. Copy the full SHA
    5404ea0 View commit details
  3. Copy the full SHA
    a034492 View commit details
Showing with 12 additions and 6 deletions.
  1. +2 −2 pkgs/development/compilers/vala/default.nix
  2. +10 −4 pkgs/development/libraries/gusb/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/vala/default.nix
Original file line number Diff line number Diff line change
@@ -123,8 +123,8 @@ in rec {
};

vala_0_48 = generic {
version = "0.48.7";
sha256 = "0lswkb7gj0chas9n3l3dbrm9l71hs77adhvm2v600id2ipi37pi8";
version = "0.48.9";
sha256 = "1agyrvslv2yh9ikiw7k5nw6j6il1l2zrzfan0pzdpb9xpg9idslw";
};

vala = vala_0_48;
14 changes: 10 additions & 4 deletions pkgs/development/libraries/gusb/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection
, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44
, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3
, glib, systemd, libusb1, vala, hwdata
}:

let
pythonEnv = python3.withPackages(ps: with ps; [
setuptools
]);
in
stdenv.mkDerivation rec {
pname = "gusb";
version = "0.3.3";
version = "0.3.5";

outputs = [ "bin" "out" "dev" "devdoc" ];

src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
sha256 = "14pbd0812151ga7jrpzi88fcrwkckx6m07ay84l7dzkxbdc44fgr";
sha256 = "1pv5ivbwxb9anq2j34i68r8fgs8nwsi4hmss7h9v1i3wk7300ajv";
};

nativeBuildInputs = [
meson ninja pkgconfig gettext
meson ninja pkgconfig gettext pythonEnv
gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
gobject-introspection vala
];