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: f5b485d4242e
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: edf1079d43f6
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 21, 2018

  1. titaniumenv: update example app 

    (cherry picked from commit 6035560)
    @svanderburg
    svanderburg committed Mar 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b69f056 View commit details

  2. titaniumenv: fix renaming strategy 

    (cherry picked from commit 479ec3d)
    @svanderburg
    svanderburg committed Mar 21, 2018

    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
    fce49b7 View commit details

  3. skypeforlinux: 8.13.0.2 -> 8.16.0.4 

    (cherry picked from commit 5b20d89)
    @svsdep @rycee
    svsdep authored and rycee committed Mar 21, 2018
    Copy the full SHA
    87b6b8e View commit details

  4. skypeforlinux: 8.16.0.4 -> 8.17.0.2 

    (cherry picked from commit 044d4b0)
    @svsdep @rycee
    svsdep authored and rycee committed Mar 21, 2018
    Copy the full SHA
    edf1079 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ let

# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.13.0.2";
version = "8.17.0.2";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -57,7 +57,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
sha256 = "15p1v6y8fwx9qj3ag645bvrcw7c1j20v63iy75s4xwsv1siz8cf9";
sha256 = "0lv8sb49ws8yjh4kkppzqy7sap2b1fw0y13lsc9s45w8mw3l16rp";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";
7 changes: 3 additions & 4 deletions pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning

let
src = fetchgit {
url = https://github.com/appcelerator/KitchenSink.git;
rev = "ec9edebf35030f61368000a8a9071dd7a0773884";
sha256 = "3e020004b73c9c2386f2672fdf9203083295f1524f5e504a07842e062de181c8";
url = https://github.com/appcelerator/kitchensink-v2.git;
rev = "94364df2ef60a80bd354a4273e3cb5f4c5185537";
sha256 = "0q4gzidpsq401frkngy4yk5kqvm8dz00ls74bw3fnpvg4714d6gf";
};

# Rename the bundle id to something else
@@ -18,7 +18,6 @@ let
inherit src;
buildPhase = ''
sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml
sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" manifest
'';
installPhase = ''
mkdir -p $out