diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-18 12:53:44 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-18 12:53:44 +0200 |
| commit | f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33 (patch) | |
| tree | 98bb48130a5c464418af19f314236e112ad20c55 /pkgs | |
| parent | b8a79ac677bbc0f7b662bcc0c4fcb9df34c9f5f3 (diff) | |
| parent | ffbb4d26f9f93681576815be82142d14f2aa8234 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs')
117 files changed, 2153 insertions, 861 deletions
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 58a75ac44ce4..5cf9b1b8ab70 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r"; + sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg"; }; buildInputs = [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b3a7c2c817c7..7f691b304181 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "03c5f01dqjvz55l8vyrpypjmmip96kc27p8sw0c5jky0igiyym5j"; }; latestVersion = { # canary & dev - version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" - build = "191.5618338"; - sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519"; + version = "3.6.0.6"; # "Android Studio 3.6 Canary 6" + build = "192.5787298"; + sha256Hash = "1rri8b5nkxj65hq13s5d31fy08llf3ad9s5mn56ridd4nsy2c5df"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 6072cb62b59c..f24fbb65e551 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi"; + sha256 = "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfz |