From 2a5c3b6d7869ee6fc6b11acae12b6a22e835ae03 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Thu, 22 Jul 2021 21:14:56 +0700 Subject: corefm: init at 4.2.0 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b2..c8b7bcebabd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23133,6 +23133,8 @@ in cheesecutter = callPackage ../applications/audio/cheesecutter { }; + corefm = libsForQt5.callPackage ../applications/misc/corefm { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; -- cgit 1.4.1 From ebb924d4720650b1a188f65f683c7766c6a4cb13 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Wed, 28 Jul 2021 09:41:32 +0200 Subject: astroid: move fallback vim into top-level --- pkgs/applications/networking/mailreaders/astroid/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 4401a0a7df8..a580359a790 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -3,7 +3,7 @@ , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 # vim to be used, should support the GUI mode. -, vim ? vim_configurable.override { features = "normal"; gui = "auto"; } +, vim # additional python3 packages to be available within plugins , extraPythonPackages ? [] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92d65da0978..bb940fb01b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23123,7 +23123,9 @@ in assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; - astroid = callPackage ../applications/networking/mailreaders/astroid { }; + astroid = callPackage ../applications/networking/mailreaders/astroid { + vim = vim_configurable.override { features = "normal"; gui = "auto"; }; + }; aucatctl = callPackage ../applications/audio/aucatctl { }; -- cgit 1.4.1 From 02734d6d2f6194adb8174a7dd1e6055b7e683bf3 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Wed, 28 Jul 2021 14:48:45 +0700 Subject: coretoppings: init at 4.2.0 --- .../misc/coretoppings/0001-fix-install-phase.patch | 8 +++ pkgs/applications/misc/coretoppings/default.nix | 62 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 72 insertions(+) create mode 100644 pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch create mode 100644 pkgs/applications/misc/coretoppings/default.nix (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch new file mode 100644 index 00000000000..8a8b0ae4010 --- /dev/null +++ b/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch @@ -0,0 +1,8 @@ +--- a/corepkit/CMakeLists.txt ++++ b/corepkit/Cmakelists.txt +@@ -32,4 +32,4 @@ + target_link_libraries( corepkit Qt5::Core ) + + install( TARGETS corepkit DESTINATION libexec/coreapps/ ) +-install( FILES org.cubocore.coreapps.policy DESTINATION /usr/share/polkit-1/actions/ ) ++install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) diff --git a/pkgs/applications/misc/coretoppings/default.nix b/pkgs/applications/misc/coretoppings/default.nix new file mode 100644 index 00000000000..eff253ffcc2 --- /dev/null +++ b/pkgs/applications/misc/coretoppings/default.nix @@ -0,0 +1,62 @@ +{ mkDerivation, lib, fetchFromGitLab, libcprime, cmake, ninja +, ffmpeg, qtbase, qtx11extras, qtconnectivity, v4l-utils, grim, wf-recorder +, libdbusmenu, playerctl, xorg, iio-sensor-proxy, inotify-tools +, bluez, networkmanager, connman, redshift, gawk +, polkit, libnotify, systemd, xdg-utils }: + +mkDerivation rec { + pname = "coretoppings"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + patches = [ + # Fix file cannot create directory: /var/empty/share/polkit-1/actions + ./0001-fix-install-phase.patch + ]; + + buildInputs = [ + qtbase + qtx11extras + qtconnectivity + libdbusmenu + libcprime + ffmpeg + v4l-utils + grim + wf-recorder + playerctl + xorg.xrandr + xorg.xinput + xorg.libXdamage + iio-sensor-proxy + inotify-tools + bluez + networkmanager + connman + redshift + gawk + polkit + libnotify + systemd + xdg-utils + ]; + + meta = with lib; { + description = "Additional features,plugins etc for CuboCore Application Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coretoppings"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab47db86f9..59d3dd80de7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3914,6 +3914,8 @@ in corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; + coretoppings = libsForQt5.callPackage ../applications/misc/coretoppings { }; + certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; -- cgit 1.4.1 From 801152e05766f61990f9a5b375fe61bbf1ed43a6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 14:51:39 +0200 Subject: gnat*: take bootstrap gnat compiler from buildPackages Due to overriding and use in string interpolation, our splicing magic doesn't work and we need to do this explicitly. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c81ca8b0a2e..7dc2993f453 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11212,7 +11212,7 @@ in langCC = false; langAda = true; profiledCompiler = false; - inherit gnatboot; + inherit (buildPackages) gnatboot; }); gnat9 = wrapCC (gcc9.cc.override { @@ -11221,7 +11221,7 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + gnatboot = buildPackages.gnat6; }); gnat10 = wrapCC (gcc10.cc.override { @@ -11230,7 +11230,7 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + gnatboot = buildPackages.gnat6; }); gnat11 = wrapCC (gcc11.cc.override { @@ -11239,7 +11239,7 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + gnatboot = buildPackages.gnat6; }); gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); -- cgit 1.4.1 From 364713fdd33de8ea0accfbf9f9cf342abaac2b62 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 18:57:58 +0200 Subject: gnat*: bootstrap cross with native compiler of the same version https://gcc.gnu.org/install/prerequisites.html#GNAT-prerequisite --- pkgs/top-level/all-packages.nix | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dc2993f453..c5a3949c805 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11212,7 +11212,15 @@ in langCC = false; langAda = true; profiledCompiler = false; - inherit (buildPackages) gnatboot; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well go the same + # route (especially as gnatboot can't cross-compile). + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnatboot + else buildPackages.gnat6; }); gnat9 = wrapCC (gcc9.cc.override { @@ -11221,7 +11229,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = buildPackages.gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat9; }); gnat10 = wrapCC (gcc10.cc.override { @@ -11230,7 +11245,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = buildPackages.gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat10; }); gnat11 = wrapCC (gcc11.cc.override { @@ -11239,7 +11261,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = buildPackages.gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat11; }); gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); -- cgit 1.4.1