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

Commits on Mar 21, 2019

  1. aravis: 0.5.13 -> 0.6.1, cleanup 

    new update and fix so automated update can work
    @ryantm
    ryantm committed Mar 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4eac3c3 View commit details

Commits on Mar 23, 2019

  1. Merge pull request #58044 from ryantm/fix-aravis 

    aravis: 0.5.13 -> 0.6.1, cleanup
    @ryantm
    ryantm authored Mar 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    521befb View commit details
Showing with 5 additions and 6 deletions.
  1. +5 −6 pkgs/development/libraries/aravis/default.nix
11 changes: 5 additions & 6 deletions pkgs/development/libraries/aravis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,14 +31,13 @@ in
stdenv.mkDerivation rec {

pname = "aravis";
version = "0.5.13";
name = "${pname}-${version}";
version = "0.6.1";

src = fetchFromGitHub {
owner = "AravisProject";
repo = "aravis";
rev= "c56e530b8ef53b84e17618ea2f334d2cbae04f48";
sha256 = "1dj24dir239zmiscfhyy1m8z5rcbw0m1vx9lipx0r7c39bzzj5gy";
repo = pname;
rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "0v0hv1iyhp2azxij3ighp1b4rsw99zyqmkpdqnnxdmkcna031iga";
};

outputs = [ "bin" "dev" "out" "lib" ];
@@ -80,7 +79,7 @@ in
longDescription = ''
Implements the gigabit ethernet and USB3 protocols used by industrial cameras.
'';
homepage = https://aravisproject.github.io/docs/aravis-0.5;
homepage = "https://aravisproject.github.io/docs/aravis-0.5";
license = stdenv.lib.licenses.lgpl2;
maintainers = [];
platforms = stdenv.lib.platforms.unix;