summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authortaku0 <mxxouy6x3m_github@tatapa.org>2017-06-14 21:10:49 +0900
committertaku0 <mxxouy6x3m_github@tatapa.org>2017-06-14 21:50:02 +0900
commit04e95882c0eadcfeaed91e1610e1d21921c02eba (patch)
tree26ee2b80cf6ea09b79c59ad860a0efef779d8f93 /pkgs/applications/networking
parent0ed1aead70e8ba7394df9d32df50c0b54e0ed480 (diff)
downloadnixlib-04e95882c0eadcfeaed91e1610e1d21921c02eba.tar
nixlib-04e95882c0eadcfeaed91e1610e1d21921c02eba.tar.gz
nixlib-04e95882c0eadcfeaed91e1610e1d21921c02eba.tar.bz2
nixlib-04e95882c0eadcfeaed91e1610e1d21921c02eba.tar.lz
nixlib-04e95882c0eadcfeaed91e1610e1d21921c02eba.tar.xz
nixlib-04e95882c0eadcfeaed91e1610e1d21921c02eba.tar.zst
nixlib-04e95882c0eadcfeaed91e1610e1d21921c02eba.zip
firefox: 53.0.3 -> 54.0
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/browsers/firefox/cargo-fix.patch33
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix6
2 files changed, 2 insertions, 37 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch
deleted file mode 100644
index bb19e9e45a30..000000000000
--- a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/media/libstagefright/binding/mp4parse-cargo.patch b/media/libstagefright/binding/mp4parse-cargo.patch
-index 1dd13d2..f98b722 100644
---- a/media/libstagefright/binding/mp4parse-cargo.patch
-+++ b/media/libstagefright/binding/mp4parse-cargo.patch
-@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst
- index aeeebc65..5c0836a 100644
- --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
- +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
--@@ -18,18 +18,10 @@ exclude = [
-+@@ -18,17 +18,12 @@ exclude = [
-    "*.mp4",
-  ]
-  
- -build = "build.rs"
---
-++build = false
-++
-  [dependencies]
-  byteorder = "1.0.0"
-  "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
-diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-index aee7ee9..d7e3f55 100644
---- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-+++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-@@ -18,6 +18,8 @@ exclude = [
-   "*.mp4",
- ]
- 
-+build = false
-+
- [dependencies]
- byteorder = "1.0.0"
- "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 8f117e1416b8..3df6b9195bc9 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,14 +6,12 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "53.0.3";
+    version = "54.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118";
+      sha512 = "0ff6960804e7f6d3e15faeb14b237fee45acae31b4652a6cc5cafa1a1b1eab3537616c3e8ea6d8f3109c87dcc8f86f0df3da2627903b80061c8a62fb11598ed9";
     };
 
-    patches = [ ./cargo-fix.patch ];
-
     meta = {
       description = "A web browser built from Firefox source tree";
       homepage = http://www.mozilla.com/en-US/firefox/;