about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/editors/idea/default.nix14
-rw-r--r--pkgs/development/arduino/arduino-core/default.nix5
-rw-r--r--pkgs/games/instead/default.nix4
-rw-r--r--pkgs/misc/jackaudio/default.nix6
4 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 734f88722a5e..083a4a0b9b9a 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -220,7 +220,7 @@ in
     description  = "C/C++ IDE. New. Intelligent. Cross-platform.";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "http://download.jetbrains.com/cpp/${name}-${build}.tar.gz";
+      url = "https://download.jetbrains.com/cpp/${name}-${build}.tar.gz";
       sha256 = "1hpsq37hq61id836wg5j6l3xapln6qdkqa10r3ig2p1rs2hq7i9y";
     };
   };
@@ -232,7 +232,7 @@ in
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
-      url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
+      url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
       sha256 = "01wcpzdahkh3li2l3k2bgirnlp7hdxk9y1kyrxc3d9d1nazq8wqn";
     };
   };
@@ -244,7 +244,7 @@ in
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
+      url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
       sha256 = "1zkqigdh9l1f3mjjvxsp7b7vc93v5ylvxa1dfpclzmfbzna7h69s";
     };
   };
@@ -256,7 +256,7 @@ in
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "http://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
+      url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
       sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4";
     };
   };
@@ -268,7 +268,7 @@ in
     description = "PyCharm 4.0 Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
-      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      url = "https://download.jetbrains.com/python/${name}.tar.gz";
       sha256 = "0jh0sxi5dpgpw7ga018fby7zvb4i9k49vwl8422lfcrgckdz9nv2";
     };
   };
@@ -280,7 +280,7 @@ in
     description = "PyCharm 4.0 Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      url = "https://download.jetbrains.com/python/${name}.tar.gz";
       sha256 = "04yjhg6vi2kz00sy8zg4wkz26ai90vbp0cnd850ynsab0jsy24w4";
     };
   };
@@ -292,7 +292,7 @@ in
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "http://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
+      url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
       sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf";
     };
   };
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index 4a5e255a37be..a751076537a4 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -54,10 +54,11 @@ stdenv.mkDerivation rec {
         "$out/share/arduino/hardware/tools/avrdude"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open-source electronics prototyping platform";
     homepage = http://arduino.cc/;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.antono stdenv.lib.maintainers.robberer ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ antono robberer bjornfor ];
   }; 
 }
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index a210851c4d1e..8f9c6461fd86 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "2.2.1";
+  version = "2.2.2";
 
   # I took several games at random from http://instead.syscall.ru/games/
   games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/instead/instead/${version}/instead_${version}.tar.gz";
-    sha256 = "1ml9dd2wmhazlxw05994h3wqynyfls0wzajg533f5kybvl0xaks5";
+    sha256 = "14aln69vvr7frsbjdfmzgf0rd45zf247xbfsnhx3hlfsqlj58wd3";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 4f9f071094bc..9152e8a72021 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -6,13 +6,13 @@ assert firewireSupport -> ffado != null;
 
 stdenv.mkDerivation rec {
   name = "jack2-${version}";
-  version = "1.9.9.5";
+  version = "1.9.10";
 
   src = fetchurl {
     urls = [
-      https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2
+      https://github.com/jackaudio/jack2/archive/v1.9.10.tar.gz
     ];
-    sha256 = "1ggba69jsfg7dmjzlyqz58y2wa92lm3vwdy4r15bs7mvxb65mvv5";
+    sha256 = "03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8";
   };
 
   buildInputs =