Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into HEAD
- Loading branch information
Showing
104 changed files
with
1,894 additions
and
1,059 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001 | ||
| From: Sam Parkinson <sam@sam.today> | ||
| Date: Thu, 26 Oct 2017 14:50:13 +1100 | ||
| Subject: [PATCH] Remove post-install script that hardcodes paths | ||
|
|
||
| --- | ||
| meson.build | 3 ++- | ||
| 1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/meson.build b/meson.build | ||
| index 25f3e1a..18b43bd 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -21,4 +21,5 @@ subdir('src') | ||
| # subdir('tests') | ||
| # TODO: unit tests | ||
|
|
||
| -meson.add_install_script('meson_post_install.sh') | ||
| +# This does not work for nixos; it hard-codes paths | ||
| +# meson.add_install_script('meson_post_install.sh') | ||
| -- | ||
| 2.14.2 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| { stdenv, fetchFromGitHub, pkgconfig | ||
| , gcc | ||
| , python3 | ||
| , gsettings_desktop_schemas | ||
| , desktop_file_utils | ||
| , glib | ||
| , gtk3 | ||
| , intltool | ||
| , libsoup | ||
| , json_glib | ||
| , wrapGAppsHook | ||
| , meson | ||
| , ninja | ||
| , vala | ||
| , sqlite | ||
| , gst_all_1 | ||
| , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] | ||
| }: | ||
| let | ||
| version = "6.0.2"; | ||
|
|
||
| in stdenv.mkDerivation rec { | ||
| name = "gradio-${version}"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "haecker-felix"; | ||
| repo = "gradio"; | ||
| rev = "v${version}"; | ||
| sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s"; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ | ||
| pkgconfig | ||
|
|
||
| meson | ||
| ninja | ||
| vala | ||
|
|
||
| python3 | ||
| ]; | ||
| buildInputs = [ | ||
| sqlite | ||
|
|
||
| glib | ||
| intltool | ||
| libsoup | ||
| json_glib | ||
|
|
||
| gtk3 | ||
| gst_all_1.gstreamer | ||
| gst_all_1.gst-plugins-base | ||
|
|
||
| wrapGAppsHook | ||
| desktop_file_utils | ||
| gsettings_desktop_schemas | ||
| ] ++ gst_plugins; | ||
|
|
||
| enableParallelBuilding = true; | ||
| postInstall = '' | ||
| ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas | ||
| ''; | ||
|
|
||
| patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; | ||
|
|
||
| meta = with stdenv.lib; { | ||
| homepage = https://github.com/haecker-felix/gradio; | ||
| description = "A GTK3 app for finding and listening to internet radio stations"; | ||
| license = licenses.gpl3; | ||
| platforms = platforms.linux; | ||
| maintainers = [ maintainers.samdroid-apps ]; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { stdenv, fetchgit, emacs }: | ||
|
|
||
| stdenv.mkDerivation { | ||
| name = "gn-mode-2017-09-21"; | ||
| src = fetchgit { | ||
| url = "https://chromium.googlesource.com/chromium/src/tools/gn"; | ||
| rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36"; | ||
| sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866"; | ||
| }; | ||
| buildInputs = [ emacs ]; | ||
|
|
||
| buildPhase = '' | ||
| emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el | ||
| ''; | ||
|
|
||
| installPhase = '' | ||
| mkdir -p $out/share/emacs/site-lisp/ | ||
| cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/ | ||
| ''; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 9 additions & 9 deletions
18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| # This file is autogenerated from update.sh in the same directory. | ||
| { | ||
| beta = { | ||
| sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; | ||
| sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq"; | ||
| version = "62.0.3202.62"; | ||
| sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; | ||
| sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q"; | ||
| version = "63.0.3239.18"; | ||
| }; | ||
| dev = { | ||
| sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb"; | ||
| sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv"; | ||
| version = "63.0.3239.9"; | ||
| sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; | ||
| sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k"; | ||
| version = "63.0.3239.18"; | ||
| }; | ||
| stable = { | ||
| sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; | ||
| sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq"; | ||
| version = "62.0.3202.62"; | ||
| sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9"; | ||
| sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x"; | ||
| version = "62.0.3202.75"; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.