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: 315cd0159bf4
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: ae2266b0fbaa
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 7, 2018

  1. spin: 6.4.7 -> 6.4.8 

    (cherry picked from commit ed3ad74)
    @pSub
    pSub committed Apr 7, 2018
    Copy the full SHA
    afddafa View commit details

  2. spin: switch back to dropbox mirror 

    see #38542 for details

(cherry picked from commit 95ece9e)
    @pSub
    pSub committed Apr 7, 2018
    Copy the full SHA
    3fa3293 View commit details

  3. libsForQt5.libopenshot: 0.1.7 -> 0.1.9 

    Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.1.9 with grep in /nix/store/nrg54a2kxlz3r8c4wf2if5vzq0y452fs-libopenshot-0.1.9
- found 0.1.9 in filename of file in /nix/store/nrg54a2kxlz3r8c4wf2if5vzq0y452fs-libopenshot-0.1.9
- directory tree listing: https://gist.github.com/a521e923923cd5ac4f188b8dede33a2e
    @ryantm @matthewbauer
    ryantm authored and matthewbauer committed Apr 7, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ae2266b View commit details
Showing with 8 additions and 5 deletions.
  1. +2 −2 pkgs/applications/video/openshot-qt/libopenshot.nix
  2. +6 −3 pkgs/development/tools/analysis/spin/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/video/openshot-qt/libopenshot.nix
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libopenshot-${version}";
version = "0.1.7";
version = "0.1.9";

src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp";
sha256 = "0c7q5cfnp481ysyvgzznvix7j4licq9knwrb83g3xqs4cx573xr3";
};

patchPhase = ''
9 changes: 6 additions & 3 deletions pkgs/development/tools/analysis/spin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,12 +7,15 @@ let

in stdenv.mkDerivation rec {
name = "spin-${version}";
version = "6.4.7";
version = "6.4.8";
url-version = stdenv.lib.replaceChars ["."] [""] version;

src = fetchurl {
url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
sha256 = "17m2xaag0jns8hsa4466zxq35ylg9fnzynzvjjmx4ympbiil6mqv";
# The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL.
# Dropbox mirror from developers:
# https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa
url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADya1lOBJZDbgWGrUSq-dfHa/spin${url-version}.tar.gz?raw=1";
sha256 = "1rvamdsf0igzpndlr4ck7004jw9x1bg4xyf78zh5k9sp848vnd80";
};

nativeBuildInputs = [ makeWrapper ];