From 2ebc3034d3cc9d98478074a9d1d2f1ab6b2658fb Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Fri, 19 Oct 2018 04:27:12 -0400 Subject: [PATCH 01/16] haskellPackages.cabal-helper: Jailbreak restrictive bounds. [Fixes #45515] --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e05f19609ea33..f792332ded3fa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1159,4 +1159,7 @@ self: super: { # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; + # https://github.com/DanielG/cabal-helper/issues/59 + cabal-helper = doJailbreak super.cabal-helper; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 622eb09d31fd97ae891e45cdc09885fa5def6618 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 27 Oct 2018 17:25:55 -0400 Subject: [PATCH 02/16] quilter: 1.6.3 -> 1.6.8 --- pkgs/applications/editors/quilter/default.nix | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 4d4cb0239bf3e..87ffd3256a882 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3 +{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3 , granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3 , discount, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "quilter"; - version = "1.6.3"; + version = "1.6.8"; name = "${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1wa0i6dgg6fgb7q9z33v9qmn1a1dn3ik58v1f3a49dvd5xyf8q6q"; + sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5"; }; nativeBuildInputs = [ @@ -22,40 +22,19 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ discount + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + gnome3.libgee granite gtk3 gtksourceview gtkspell3 webkitgtk - gnome3.libgee - ]; - - patches = [ - # Fix build with vala 0.42 - Drop these in next release - (fetchpatch { - url = "https://github.com/lainsce/quilter/commit/a58838213cd7f2d33048c7b34b96dc8875612624.patch"; - sha256 = "1a4w1zql4zfk8scgrrssrm9n3sh5fsc1af5zvrqk8skbv7f2c80n"; - }) - (fetchpatch { - url = "https://github.com/lainsce/quilter/commit/d1800ce830343a1715bc83da3339816554896be5.patch"; - sha256 = "0xl5iz8bgx5661vbbq8qa1wkfvw9d3da67x564ckjfi05zq1vddz"; - }) - # Correct libMarkdown dependency discovery: See https://github.com/lainsce/quilter/pull/170 - (fetchpatch { - url = "https://github.com/lainsce/quilter/commit/8b1f3a60bd14cb86c1c62f9917c5f0c12bc4e459.patch"; - sha256 = "1kjc6ygf9yjvqfa4xhzxiava3338swp9wbjhpfaa3pyz3ayh188n"; - }) - # post_install script cleanups: See https://github.com/lainsce/quilter/pull/171 - (fetchpatch { - url = "https://github.com/lainsce/quilter/commit/55bf3b10cd94fcc40b0867bbdb1931a09f577922.patch"; - sha256 = "1330amichaif2qfrh4qkxwqbcpr87ipik7vzjbjdm2bv3jz9353r"; - }) ]; postPatch = '' @@ -65,9 +44,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Focus on your writing - designed for elementary OS"; - homepage = https://github.com/lainsce/quilter; - license = licenses.gpl2Plus; + homepage = https://github.com/lainsce/quilter; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 398282c1965bf45e192128ec06a244bbe36d7f78 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 31 Oct 2018 17:52:35 -0400 Subject: [PATCH 03/16] bookworm: 1.0.0 -> 2018-10-21 --- pkgs/applications/office/bookworm/default.nix | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 45c794c82ea55..bc2f260c70303 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,46 +1,70 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, libxml2, cmake, ninja, gtk3, granite, gnome3 -, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, unzip, unar, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3 +, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "bookworm"; - version = "1.0.0"; + version = "4f7b118281667d22f1b3205edf0b775341fa49cb"; - name = "${pname}-${version}"; + name = "${pname}-2018-10-21"; src = fetchFromGitHub { owner = "babluboy"; repo = pname; rev = version; - sha256 = "0nv1nxird0s0qfhh8fr82mkj4qimhklw1bwcjwmvjdsvsxxs9520"; + sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9"; }; + # See: https://github.com/babluboy/bookworm/pull/220 + patches = [ + (fetchpatch { + url = "https://github.com/worldofpeace/bookworm/commit/b2faf685c46b95d6a2d4ec3725e4e4122b61e99a.patch"; + sha256 = "14az86cj5j65hngfflrp1rmnrkdrhg2a8pl7www3jgfwasxay975"; + }) + ]; + nativeBuildInputs = [ - cmake + bash gobjectIntrospection libxml2 + meson ninja pkgconfig - vala + python3 + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = with gnome3; [ glib + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged granite gtk3 html2text libgee poppler + python2 sqlite webkitgtk ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + # These programs are expected in PATH from the source code and scripts preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text coreutils curl gnugrep ]}" + --prefix PATH : $out/bin ) ''; + postFixup = '' + patchShebangs $out/share/bookworm/scripts/mobi_lib/*.py + patchShebangs $out/share/bookworm/scripts/tasks/*.sh + ''; + meta = with stdenv.lib; { description = "A simple, focused eBook reader"; longDescription = '' From a9288f1d95b660d12f33fc51aac1ad7d29fb9915 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 31 Oct 2018 17:58:23 -0400 Subject: [PATCH 04/16] notejot: 1.4.5 -> 1.4.7 --- pkgs/applications/misc/notejot/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 59ba45e6f376c..09c49135ca1c2 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite +{ stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite , gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.4.5"; + version = "1.4.7"; name = "${pname}-${version}"; @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee granite gtk3 @@ -39,9 +40,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stupidly-simple sticky notes applet"; - homepage = https://github.com/lainsce/notejot; - license = licenses.gpl2Plus; + homepage = https://github.com/lainsce/notejot; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 8bf705658adbca74a7dbcc804ef5249cc14574ee Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 31 Oct 2018 18:04:02 -0400 Subject: [PATCH 05/16] hashit: 0.2.0 -> 1.0.0 --- pkgs/tools/misc/hashit/default.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 69d73aafff92d..46e460db354fb 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala, python3, gnome3, gtk3, granite, gobjectIntrospection, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobjectIntrospection, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; - version = "0.2.0"; + version = "1.0.0"; name = "${pname}-${version}"; @@ -10,30 +10,37 @@ stdenv.mkDerivation rec { owner = "artemanufrij"; repo = pname; rev = version; - sha256 = "1d2g7cm7hhs354waidak9xkhhcvqlwnsl9d0bar9p82gfnpjdg7v"; + sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv"; }; nativeBuildInputs = [ + desktop-file-utils gobjectIntrospection meson ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + gnome3.libgee granite gtk3 - gnome3.libgee ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + meta = with stdenv.lib; { description = "A simple app for checking usual checksums"; - homepage = https://github.com/artemanufrij/hashit; - license = licenses.gpl2Plus; + homepage = https://github.com/artemanufrij/hashit; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From c1e3f1c45852720741e8ea621dda7095b238d1b0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 31 Oct 2018 18:06:13 -0400 Subject: [PATCH 06/16] aesop: 1.0.5 -> 1.0.7 --- pkgs/applications/office/aesop/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 64e2c0b946794..b510fe950a3da 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3, granite, gtk3 +{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3 , gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "aesop"; - version = "1.0.5"; + version = "1.0.7"; name = "${pname}-${version}"; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee granite gtk3 @@ -34,14 +35,6 @@ stdenv.mkDerivation rec { poppler ]; - # Fix build with vala 0.42 - patches = [ - (fetchpatch { - url = "https://github.com/lainsce/aesop/commit/a90b3c711bd162583533370deb031c2c6254c82d.patch"; - sha256 = "1zf831g6sqq3966q0i00x3jhlbfh9blcky6pnyp5qp59hxyxy169"; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -49,9 +42,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The simplest PDF viewer around"; - homepage = https://github.com/lainsce/aesop; - license = licenses.gpl2Plus; + homepage = https://github.com/lainsce/aesop; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 8f2a1dc9554ec389b122f7d15eee3fd0ad5e6b9a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 29 Oct 2018 19:06:17 -0500 Subject: [PATCH 07/16] regextester: 0.1.7 -> 1.0.1 * uses meson now * crashes on start complaining schema not installed, so I added a postInstall that compiles the schema? Fixes the problem but I'm not particularly familiar with these bits so review appreciated. --- .../applications/misc/regextester/default.nix | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index c1b1cfb48a281..6f056292d775a 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -3,47 +3,51 @@ , gettext , libxml2 , pkgconfig -, gtk3 +, glib , granite +, gtk3 , gnome3 -, cmake +, meson , ninja -, vala -, elementary-cmake-modules +, gobjectIntrospection +, gsettings-desktop-schemas +, vala_0_40 , wrapGAppsHook }: stdenv.mkDerivation rec { name = "regextester-${version}"; - version = "0.1.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "artemanufrij"; repo = "regextester"; rev = version; - sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n"; + sha256 = "1xwwv1hccni1mrbl58f7ly4qfq6738vn24bcbl2q346633cd7kx3"; }; - XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ - "${granite}/share" - "${gnome3.libgee}/share" - ]; - nativeBuildInputs = [ pkgconfig - wrapGAppsHook - vala - cmake + meson ninja gettext + gobjectIntrospection libxml2 - elementary-cmake-modules + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + wrapGAppsHook ]; buildInputs = [ - gtk3 + glib granite + gtk3 + gnome3.defaultIconTheme gnome3.libgee + gsettings-desktop-schemas ]; + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + meta = with stdenv.lib; { description = "A desktop application to test regular expressions interactively"; homepage = https://github.com/artemanufrij/regextester; From 144c7267dd4708bc141fc0c81e3670fc62bfb26a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 31 Oct 2018 18:25:22 -0400 Subject: [PATCH 08/16] spice-up: 1.3.2 -> 1.6.0 --- pkgs/applications/office/spice-up/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 520510698e3c0..3141223d72837 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -12,25 +12,27 @@ , ninja , libgudev , libevdev -, vala +, libsoup +, vala_0_40 , wrapGAppsHook }: stdenv.mkDerivation rec { name = "spice-up-${version}"; - version = "1.3.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Spice-up"; rev = version; - sha256 = "087cdi7na93pgz7vf046h94v5ydvpiccpwhllq85ix8g4pa5rp85"; + sha256 = "1qb1hlw7g581dmgg5mh832ixjkcgqm3lqzj6xma2cz8wdncwwjaq"; }; + USER = "nix-build-user"; nativeBuildInputs = [ pkgconfig wrapGAppsHook - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake ninja gettext @@ -38,12 +40,14 @@ stdenv.mkDerivation rec { gobjectIntrospection # For setup hook ]; buildInputs = [ - gtk3 - granite + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee + granite + gtk3 json-glib - libgudev libevdev + libgudev + libsoup ]; meta = with stdenv.lib; { From fdc19ff3111baa03de4c2d5f1a64318886dc4b63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Nov 2018 20:23:22 +0100 Subject: [PATCH 09/16] haskell-polyparse: use latest version for ghc-8.6.1 --- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index fa14d21afa289..bf021956593ca 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -69,6 +69,7 @@ self: super: { megaparsec = dontCheck (doJailbreak super.megaparsec); neat-interpolation = dontCheck super.neat-interpolation; # test suite depends on broken HTF patience = markBrokenVersion "0.1.1" super.patience; + polyparse = self.polyparse_1_12_1; primitive = self.primitive_0_6_4_0; QuickCheck = self.QuickCheck_2_12_6_1; semigroupoids = self.semigroupoids_5_3_1; From 0a2420bccd5660b3af642039d945e512490d51ae Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 2 Nov 2018 16:01:05 -0400 Subject: [PATCH 10/16] nasc: 0.4.7 -> 0.5.0 --- .../science/math/nasc/default.nix | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index cac403b131b8f..bba08e3ae291e 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -7,49 +7,39 @@ , gnome3 , cmake , ninja -, vala +, vala_0_40 , libqalculate , gobjectIntrospection , wrapGAppsHook }: stdenv.mkDerivation rec { name = "nasc-${version}"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = "parnold-x"; repo = "nasc"; rev = version; - sha256 = "0p74953pdgsijvqj3msssqiwm6sc1hzp68dlmjamqrqirwgqv5aa"; + sha256 = "1rrp3djsv7lrgsqjn7x50msv0c5ffhz90lj1v11di0kp05m6q9j9"; }; - patches = [ - # Install libqalculatenasc.so - (fetchpatch { - url = https://github.com/parnold-x/nasc/commit/93a799f9afb3e32f3f1a54e056b59570aae2e437.patch; - sha256 = "1m32w2zaswzxnzbr7p3lf8s6fac4mjvfhm8v9k59b4jyzmvrl631"; - }) - (fetchpatch { - url = https://github.com/parnold-x/nasc/commit/570b49169326de154af2cf43c5f12268fff1dc6d.patch; - sha256 = "1y3w6rxn0453iscx2xg427wy1bd5kv4z1c41hhbjmg614ycp6bka"; - }) - ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake ninja gobjectIntrospection # for setup-hook ]; + buildInputs = [ - libqalculate - gtk3 - granite + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + gnome3.gtksourceview gnome3.libgee gnome3.libsoup - gnome3.gtksourceview + granite + gtk3 + libqalculate ]; meta = with stdenv.lib; { From 0b66270adac94937ee3c4a3ad4de644e8b65c679 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 2 Nov 2018 15:10:57 -0500 Subject: [PATCH 11/16] avrlibc: set platforms to avr-none It will only build on avr architectures. --- pkgs/development/misc/avr/libc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index afe30e4b5eef9..ab9a696afb007 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "a C runtime library for AVR microcontrollers"; homepage = http://savannah.nongnu.org/projects/avr-libc/; license = licenses.bsd3; - platforms = platforms.all; + platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner ]; }; } From 836cbf6a5ca44fd18219c7ea80550d0e38a66f90 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 2 Nov 2018 15:28:53 -0500 Subject: [PATCH 12/16] =?UTF-8?q?opentx:=20don=E2=80=99t=20use=20nano?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vanilla newlib doesn’t install nano. --- pkgs/applications/misc/opentx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 0aecc43d1e53e..95a2f2b940c2a 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -42,6 +42,7 @@ in stdenv.mkDerivation { # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + "-DNANO=OFF" ]; meta = with stdenv.lib; { From 5df22e343d17213cf986653f5d730f738f9cac71 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 2 Nov 2018 15:29:30 -0500 Subject: [PATCH 13/16] =?UTF-8?q?axoloti:=20don=E2=80=99t=20hardode=20path?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of these paths are not in gcc-arm-embedded (instead binutils-arm-embedded). --- pkgs/applications/audio/axoloti/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 3c3198e17348c..e3f1b6acf8746 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -40,15 +40,6 @@ stdenv.mkDerivation rec { substituteInPlace "chibios/os/various/shell.c" \ --replace "#ifdef __DATE__" "#if 0" - # Hardcode full path to compiler tools - for f in "firmware/Makefile.patch" \ - "firmware/Makefile" \ - "firmware/flasher/Makefile" \ - "firmware/mounter/Makefile"; do - substituteInPlace "$f" \ - --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-" - done - # Hardcode path to "make" for f in "firmware/compile_firmware_linux.sh" \ "firmware/compile_patch_linux.sh"; do From 94a2cdebaa0f25d52a08e3b2d3bdcdabd62e16ba Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 2 Nov 2018 15:30:10 -0500 Subject: [PATCH 14/16] =?UTF-8?q?inav:=20don=E2=80=99t=20use=20nano?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit not in newlib --- pkgs/development/misc/stm32/inav/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 9c35ac2ffce19..102b1eb8048d3 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -26,6 +26,9 @@ in stdenv.mkDerivation rec { sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + + substitutateInPlace Makefile \ + --replace "--specs=nano.specs" "" ''; enableParallelBuilding = true; From a4234645fe2445fe503413b159a842dbb280a777 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 2 Nov 2018 15:30:30 -0500 Subject: [PATCH 15/16] =?UTF-8?q?betaflight:=20don=E2=80=99t=20use=20nano?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit not in newlib --- pkgs/development/misc/stm32/betaflight/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 21230464e7479..fbe48803f2dbc 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -32,6 +32,9 @@ in stdenv.mkDerivation rec { postPatch = '' sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + + substitutateInPlace Makefile \ + --replace "--specs=nano.specs" "" ''; enableParallelBuilding = true; From 8dbfb61e4617050917ce6bb7c5f4efc902c2a36c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 29 Oct 2018 13:33:42 -0500 Subject: [PATCH 16/16] make-derivation: add disallowedReferences in strictDeps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When strictDeps = true, we don’t want native build inputs to end up in the output. For instance gcc is a builtin native build input and should only show up in an output if it is also listed in buildInputs. /cc @ericson2314 --- pkgs/stdenv/generic/make-derivation.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index e06faed30a1ea..08a914787c351 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -226,6 +226,22 @@ rec { inherit doCheck doInstallCheck; inherit outputs; + } // lib.optionalAttrs strictDeps { + # Make sure "build" dependencies don’t leak into outputs. We + # want to disallow references to depsBuildBuild, + # nativeBuildInputs, and depsBuildTarget. But depsHostHost, + # buildInputs, and depsTargetTarget is okay, so we subtract + # those from disallowedReferences in case a dependency is + # listed in multiple dependency lists. We also include + # propagated dependencies here as well. + disallowedReferences = (attrs.disallowedReferences or []) + ++ (lib.subtractLists + (lib.concatLists ( (lib.elemAt propagatedDependencies 1) ++ + (lib.elemAt dependencies 1) ++ + (lib.elemAt propagatedDependencies 2) ++ + (lib.elemAt dependencies 2) ) ) + (lib.concatLists ( (lib.elemAt propagatedDependencies 0) ++ + (lib.elemAt dependencies 0) ) ) ); } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { cmakeFlags = (/**/ if lib.isString cmakeFlags then [cmakeFlags]