Merge master into staging-next
This commit is contained in:
commit
b199af176d
66 changed files with 756 additions and 486 deletions
|
@ -258,6 +258,12 @@ rec {
|
|||
platform = {};
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
config = "x86_64-apple-darwin";
|
||||
xcodePlatform = "MacOSX";
|
||||
platform = {};
|
||||
};
|
||||
|
||||
#
|
||||
# Windows
|
||||
#
|
||||
|
|
|
@ -10074,6 +10074,17 @@
|
|||
github = "s1341";
|
||||
githubId = 5682183;
|
||||
};
|
||||
sagikazarmark = {
|
||||
name = "Mark Sagi-Kazar";
|
||||
email = "mark.sagikazar@gmail.com";
|
||||
matrix = "@mark.sagikazar:matrix.org";
|
||||
github = "sagikazarmark";
|
||||
githubId = 1226384;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0xF251ADDC9D041C7E";
|
||||
fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E";
|
||||
}];
|
||||
};
|
||||
samalws = {
|
||||
email = "sam@samalws.com";
|
||||
name = "Sam Alws";
|
||||
|
|
|
@ -57,7 +57,7 @@ in {
|
|||
description = ''
|
||||
Build a minimal collectd package with only the configured `services.collectd.plugins`
|
||||
'';
|
||||
type = types.bool;
|
||||
type = bool;
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
|
@ -98,7 +98,7 @@ in {
|
|||
description = ''
|
||||
Attribute set of plugin names to plugin config segments
|
||||
'';
|
||||
type = types.attrsOf types.str;
|
||||
type = attrsOf lines;
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "git-2015-05-21";
|
||||
version = "unstable-2015-05-21";
|
||||
pname = "foo-yc20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sampov2";
|
||||
|
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
|||
broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7
|
||||
description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20";
|
||||
homepage = "https://github.com/sampov2/foo-yc20";
|
||||
license = with licenses; [ bsd3 lgpl21 mpl11 ] ;
|
||||
license = with licenses; [ bsd3 lgpl21 mpl11 ];
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, lv2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mod-distortion-git";
|
||||
version = "2016-08-19";
|
||||
pname = "mod-distortion";
|
||||
version = "unstable-2016-08-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "portalmod";
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{ lib, stdenv, fetchgit, ncurses, portmidi }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "orca-c";
|
||||
|
||||
version = "git-2021-02-13";
|
||||
version = "unstable-2021-02-13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~rabbits/orca";
|
||||
|
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
*/
|
||||
description = "Small session management for emacs";
|
||||
homepage = "http://emacs-session.sourceforge.net/";
|
||||
license = license.gpl;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }:
|
||||
stdenv.mkDerivation {
|
||||
version = "git-2014-08-20";
|
||||
version = "unstable-2014-08-20";
|
||||
pname = "supertux-editor";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ];
|
||||
buildInputs = [ mono gtk-sharp-2_0 gnome2.libglade gtk2 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib/supertux-editor
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
{ fetchurl, lib, stdenv, cmake, qt4, fftw }:
|
||||
|
||||
let
|
||||
rev = "9895036d26";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smartdeblur-git-${rev}";
|
||||
pname = "smartdeblur";
|
||||
version = "unstable-2013-01-09";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/${rev}";
|
||||
name = "${name}.tar.gz";
|
||||
url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/9895036d26";
|
||||
name = "smartdeblur-${version}.tar.gz";
|
||||
sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4";
|
||||
};
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
mkDerivation {
|
||||
pname = "dfilemanager";
|
||||
version = "git-2020-09-04";
|
||||
version = "unstable-2020-09-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "probonopd";
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "2.4.6";
|
||||
version = "2.5.12";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
@ -16,8 +16,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-BMpRWtfx5fXEJy3hp/+q86sd+Yd/QPJbSqi2nWE2dcQ=";
|
||||
x86_64-darwin = "sha256-4UNKdoGtQSN5/m+xQZrY77ZE5A7jvpDOUCRvwrS5e6g=";
|
||||
x86_64-linux = "sha256-/S/paqMKVerSQFjA4wQ9fLV0WaqKm4CzQfy+0OdH7c8=";
|
||||
x86_64-darwin = "sha256-5eKTfZRpW7IYwFt8TeJiytrwEpiHBgN4k9kth+Lh0Bo=";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,16 +2,33 @@
|
|||
|
||||
let
|
||||
perlDeps = with perlPackages; [
|
||||
Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon
|
||||
XMLLibXML XMLSAXBase XMLParser XMLRSS
|
||||
Glib
|
||||
Gtk2
|
||||
Gnome2
|
||||
Pango
|
||||
Cairo
|
||||
Gnome2Canvas
|
||||
Gnome2VFS
|
||||
Gtk2GladeXML
|
||||
Gtk2TrayIcon
|
||||
XMLLibXML
|
||||
XMLSAXBase
|
||||
XMLParser
|
||||
XMLRSS
|
||||
HTMLParser
|
||||
DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone
|
||||
DateTime
|
||||
DateTimeFormatMail
|
||||
DateTimeFormatW3CDTF
|
||||
DateTimeLocale
|
||||
DateTimeTimeZone
|
||||
ParamsValidate
|
||||
ModuleImplementation ModuleRuntime
|
||||
ModuleImplementation
|
||||
ModuleRuntime
|
||||
TryTiny
|
||||
ClassSingleton
|
||||
URI
|
||||
AnyEvent AnyEventHTTP
|
||||
AnyEvent
|
||||
AnyEventHTTP
|
||||
commonsense
|
||||
FileSlurp
|
||||
JSON
|
||||
|
@ -24,7 +41,7 @@ let
|
|||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
version = "git-2017-12-01";
|
||||
version = "unstable-2017-12-01";
|
||||
pname = "yarssr";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -35,7 +52,7 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ];
|
||||
buildInputs = perlDeps ++ [gnome2.libglade];
|
||||
buildInputs = perlDeps ++ [ gnome2.libglade ];
|
||||
propagatedBuildInputs = libs ++ perlDeps;
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -31,15 +31,15 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "97.0.4688.2",
|
||||
"sha256": "0a5i64gxb24z5mfvmf50g4fafvqqbj7k5077arnhwzp3xiznld88",
|
||||
"sha256bin64": "0l70qlna8x05rrlcfgv2xyl8g5nlmd42i8n0yc9dw3mwq8m4c4db",
|
||||
"version": "97.0.4692.8",
|
||||
"sha256": "0n47jfxs05g55p69f5939jf5pgyw88n4cpg78k019n3zr2vlv1qf",
|
||||
"sha256bin64": "1gisqc6dz7yfigj0dji7cnx5jdcjz0gmn248cp2a6zs9mfvwwbqv",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-10-30",
|
||||
"version": "2021-11-03",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "8926696a4186279489cc2b8d768533e61bba73d7",
|
||||
"sha256": "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk"
|
||||
"rev": "90294ccdcf9334ed25a76ac9b67689468e506342",
|
||||
"sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
30
pkgs/applications/networking/cluster/helm-docs/default.nix
Normal file
30
pkgs/applications/networking/cluster/helm-docs/default.nix
Normal file
|
@ -0,0 +1,30 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-docs";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norwoodj";
|
||||
repo = "helm-docs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eyFuF03rqwfXyjEkqNRkjrJlHBazGYij1EtN0LAKdFk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aAn969C4UhFGu5/qXIG/rc1cErQIDtPwEA+f0d43y0w=";
|
||||
|
||||
subPackages = [ "cmd/helm-docs" ];
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X main.version=v${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/norwoodj/helm-docs";
|
||||
description = "A tool for automatically generating markdown documentation for Helm charts";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ sagikazarmark ];
|
||||
};
|
||||
}
|
|
@ -58,7 +58,7 @@ let
|
|||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.23.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.23.1"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "0jan203zbrkb9scfdldwnvyvk4657a3pn0ws51xf53jhvvywhpg0";
|
||||
sha256 = "0scbnkkbaqyqiz6bfvhdrc0yqnccjsf66iggjpa7kjyk3cy61s6c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,17 +1,24 @@
|
|||
{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake
|
||||
, makeDesktopItem }:
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, qtbase
|
||||
, qtquickcontrols
|
||||
, qmake
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
# we now have libqmatrixclient so a future version of tensor that supports it
|
||||
# should use that
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "tensor-git";
|
||||
version = "2017-02-21";
|
||||
pname = "tensor";
|
||||
version = "unstable-2017-02-21";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/davidar/tensor.git";
|
||||
rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
|
||||
sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
|
||||
url = "https://github.com/davidar/tensor.git";
|
||||
rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
|
||||
sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -19,14 +26,14 @@ mkDerivation rec {
|
|||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "tensor";
|
||||
exec = "@bin@";
|
||||
icon = "tensor.png";
|
||||
comment = meta.description;
|
||||
name = "tensor";
|
||||
exec = "@bin@";
|
||||
icon = "tensor.png";
|
||||
comment = meta.description;
|
||||
desktopName = "Tensor Matrix Client";
|
||||
genericName = meta.description;
|
||||
categories = "Chat;Utility";
|
||||
mimeType = "application/x-chat";
|
||||
categories = "Chat;Utility";
|
||||
mimeType = "application/x-chat";
|
||||
};
|
||||
|
||||
installPhase = if stdenv.isDarwin then ''
|
||||
|
|
|
@ -1,25 +1,29 @@
|
|||
{ lib, stdenv, fetchFromGitHub, znc }:
|
||||
|
||||
let
|
||||
zncDerivation = a@{
|
||||
pname, src, module_name,
|
||||
buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp",
|
||||
installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ...
|
||||
} : stdenv.mkDerivation (a // {
|
||||
inherit buildPhase;
|
||||
inherit installPhase;
|
||||
zncDerivation =
|
||||
a@{ pname
|
||||
, src
|
||||
, module_name
|
||||
, buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp"
|
||||
, installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so"
|
||||
, ...
|
||||
}: stdenv.mkDerivation (a // {
|
||||
inherit buildPhase;
|
||||
inherit installPhase;
|
||||
|
||||
buildInputs = znc.buildInputs;
|
||||
buildInputs = znc.buildInputs;
|
||||
|
||||
meta = a.meta // { platforms = lib.platforms.unix; };
|
||||
passthru.module_name = module_name;
|
||||
});
|
||||
meta = a.meta // { platforms = lib.platforms.unix; };
|
||||
passthru.module_name = module_name;
|
||||
});
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
|
||||
backlog = zncDerivation rec {
|
||||
pname = "znc-backlog";
|
||||
version = "git-2017-06-13";
|
||||
version = "unstable-2017-06-13";
|
||||
module_name = "backlog";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -39,7 +43,7 @@ in {
|
|||
|
||||
clientbuffer = zncDerivation rec {
|
||||
pname = "znc-clientbuffer";
|
||||
version = "git-2020-04-24";
|
||||
version = "unstable-2020-04-24";
|
||||
module_name = "clientbuffer";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -59,7 +63,7 @@ in {
|
|||
|
||||
clientaway = zncDerivation rec {
|
||||
pname = "znc-clientaway";
|
||||
version = "git-2017-04-28";
|
||||
version = "unstable-2017-04-28";
|
||||
module_name = "clientaway";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -79,7 +83,7 @@ in {
|
|||
|
||||
fish = zncDerivation rec {
|
||||
pname = "znc-fish";
|
||||
version = "git-2017-06-26";
|
||||
version = "unstable-2017-06-26";
|
||||
module_name = "fish";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -99,7 +103,7 @@ in {
|
|||
|
||||
ignore = zncDerivation rec {
|
||||
pname = "znc-ignore";
|
||||
version = "git-2017-04-28";
|
||||
version = "unstable-2017-04-28";
|
||||
module_name = "ignore";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -139,7 +143,7 @@ in {
|
|||
|
||||
playback = zncDerivation rec {
|
||||
pname = "znc-playback";
|
||||
version = "git-2015-08-04";
|
||||
version = "unstable-2015-08-04";
|
||||
module_name = "playback";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -159,7 +163,7 @@ in {
|
|||
|
||||
privmsg = zncDerivation rec {
|
||||
pname = "znc-privmsg";
|
||||
version = "git-2015-02-22";
|
||||
version = "unstable-2015-02-22";
|
||||
module_name = "privmsg";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -177,7 +181,7 @@ in {
|
|||
|
||||
push = zncDerivation rec {
|
||||
pname = "znc-push";
|
||||
version = "git-2016-10-12";
|
||||
version = "unstable-2016-10-12";
|
||||
module_name = "push";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
|
||||
# If open-watcom-bin is not passed, VirtualBox will fall back to use
|
||||
# the shipped alternative sources (assembly).
|
||||
, open-watcom-bin ? null
|
||||
, open-watcom-bin
|
||||
, makeself, perl
|
||||
, javaBindings ? true, jdk ? null # Almost doesn't affect closure size
|
||||
, pythonBindings ? false, python3 ? null
|
||||
, extensionPack ? null, fakeroot ? null
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
|
||||
, javaBindings ? true, jdk # Almost doesn't affect closure size
|
||||
, pythonBindings ? false, python3
|
||||
, extensionPack ? null, fakeroot
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
|
||||
, enableHardening ? false
|
||||
, headless ? false
|
||||
, enable32bitGuests ? true
|
||||
|
@ -20,7 +20,6 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
python = python3;
|
||||
buildType = "release";
|
||||
# Use maintainers/scripts/update.nix to update the version and all related hashes or
|
||||
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
|
||||
|
@ -42,23 +41,23 @@ in stdenv.mkDerivation {
|
|||
# Wrap manually because we wrap just a small number of executables.
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs =
|
||||
[ acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
|
||||
libcap glib lvm2 alsa-lib curl libvpx pam makeself perl
|
||||
libXmu libpng libopus python ]
|
||||
buildInputs = [
|
||||
acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
|
||||
libcap glib lvm2 alsa-lib curl libvpx pam makeself perl
|
||||
libXmu libpng libopus python3 ]
|
||||
++ optional javaBindings jdk
|
||||
++ optional pythonBindings python # Python is needed even when not building bindings
|
||||
++ optional pythonBindings python3 # Python is needed even when not building bindings
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optionals (headless) [ libXrandr libGL ]
|
||||
++ optionals headless [ libXrandr libGL ]
|
||||
++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ]
|
||||
++ optionals (enableWebService) [ gsoap zlib ];
|
||||
++ optionals enableWebService [ gsoap zlib ];
|
||||
|
||||
hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
|
||||
|
||||
prePatch = ''
|
||||
set -x
|
||||
sed -e 's@MKISOFS --version@MKISOFS -version@' \
|
||||
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
|
||||
-e 's@PYTHONDIR=.*@PYTHONDIR=${lib.optionalString pythonBindings python3}@' \
|
||||
-e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \
|
||||
${optionalString (!headless) ''
|
||||
-e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \
|
||||
|
@ -135,7 +134,7 @@ in stdenv.mkDerivation {
|
|||
PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include
|
||||
TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease
|
||||
''}
|
||||
${optionalString (enableWebService) ''
|
||||
${optionalString enableWebService ''
|
||||
# fix gsoap missing zlib include and produce errors with --as-needed
|
||||
VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
|
||||
''}
|
||||
|
@ -148,7 +147,7 @@ in stdenv.mkDerivation {
|
|||
${optionalString (!pulseSupport) "--disable-pulse"} \
|
||||
${optionalString (!enableHardening) "--disable-hardening"} \
|
||||
${optionalString (!enable32bitGuests) "--disable-vmmraw"} \
|
||||
${optionalString (enableWebService) "--enable-webservice"} \
|
||||
${optionalString enableWebService "--enable-webservice"} \
|
||||
${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \
|
||||
--disable-kmods
|
||||
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
|
||||
|
@ -175,7 +174,7 @@ in stdenv.mkDerivation {
|
|||
-name src -o -exec cp -avt "$libexec" {} +
|
||||
|
||||
mkdir -p $out/bin
|
||||
for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString (enableWebService) "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
|
||||
for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
|
||||
echo "Linking $file to /bin"
|
||||
test -x "$libexec/$file"
|
||||
ln -s "$libexec/$file" $out/bin/$file
|
||||
|
@ -183,14 +182,14 @@ in stdenv.mkDerivation {
|
|||
|
||||
${optionalString (extensionPack != null) ''
|
||||
mkdir -p "$share"
|
||||
"${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EXTHELPER
|
||||
"${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EOF
|
||||
"$libexec/VBoxExtPackHelperApp" install \
|
||||
--base-dir "$share/ExtensionPacks" \
|
||||
--cert-dir "$share/ExtPackCertificates" \
|
||||
--name "Oracle VM VirtualBox Extension Pack" \
|
||||
--tarball "${extensionPack}" \
|
||||
--sha-256 "${extensionPack.outputHash}"
|
||||
EXTHELPER
|
||||
EOF
|
||||
''}
|
||||
|
||||
${optionalString (!headless) ''
|
||||
|
|
|
@ -73,7 +73,7 @@ rec {
|
|||
''}
|
||||
|
||||
# Build /bin and copy across closure
|
||||
mkdir -p bin nix/store
|
||||
mkdir -p bin ./${builtins.storeDir}
|
||||
for f in $(cat $layerClosure) ; do
|
||||
cp -ar $f ./$f
|
||||
done
|
||||
|
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.2/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.3/ -A '*.tar.xz' )
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
|
||||
index a17967b47..6e6141b48 100644
|
||||
--- a/startkde/startplasma.cpp
|
||||
+++ b/startkde/startplasma.cpp
|
||||
@@ -431,7 +431,11 @@ bool hasSystemdService(const QString &serviceName)
|
||||
QStringLiteral("/org/freedesktop/systemd1"),
|
||||
QStringLiteral("org.freedesktop.systemd1.Manager"),
|
||||
QStringLiteral("ListUnitFilesByPatterns"));
|
||||
- msg << QStringList({QStringLiteral("enabled"), QStringLiteral("static")}) << QStringList({serviceName});
|
||||
+ msg << QStringList({QStringLiteral("enabled"),
|
||||
+ QStringLiteral("static"),
|
||||
+ QStringLiteral("linked"),
|
||||
+ QStringLiteral("linked-runtime")});
|
||||
+ msg << QStringList({serviceName});
|
||||
QDBusReply<QList<QPair<QString, QString>>> reply = QDBusConnection::sessionBus().call(msg);
|
||||
if (!reply.isValid()) {
|
||||
return false;
|
|
@ -52,7 +52,6 @@ mkDerivation {
|
|||
patches = [
|
||||
./0001-startkde.patch
|
||||
./0002-absolute-wallpaper-install-dir.patch
|
||||
./0003-startkde-unit-detection.patch
|
||||
];
|
||||
|
||||
# QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools
|
||||
|
|
|
@ -4,427 +4,427 @@
|
|||
|
||||
{
|
||||
bluedevil = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/bluedevil-5.23.2.tar.xz";
|
||||
sha256 = "0whg8d95vm6zc4vzdlffyvm5kqhi5b501z3749zx743jx8r125nb";
|
||||
name = "bluedevil-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/bluedevil-5.23.3.tar.xz";
|
||||
sha256 = "1n6h2m4z67vl0mv0hs0g5xff1vcj03w0nhx4hkhy66hly556nq8x";
|
||||
name = "bluedevil-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/breeze-5.23.2.tar.xz";
|
||||
sha256 = "1b2n0wcwfp96k76cmm8llr6cvdxvpb6h17r0r4rnl4ypg36i03sb";
|
||||
name = "breeze-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/breeze-5.23.3.tar.xz";
|
||||
sha256 = "1514y4k52bc71nljihj655d7swk2qvr168i0j2xqcm0w4aiz4jmv";
|
||||
name = "breeze-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-grub = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/breeze-grub-5.23.2.tar.xz";
|
||||
sha256 = "0zbych6hyfxjc4rl0m9nij6vgyg66s4b51vm5rjd9p0s6zhipzrl";
|
||||
name = "breeze-grub-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/breeze-grub-5.23.3.tar.xz";
|
||||
sha256 = "1nwhjw0nkdg94znh7h80byrq8vpa1f20ph1m4fhlj233nfskw0zy";
|
||||
name = "breeze-grub-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-gtk = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/breeze-gtk-5.23.2.tar.xz";
|
||||
sha256 = "1ays2z6gmy1yx4ka5fjcmymlvq67p2wjwijciw4ambx1bxz6s5ci";
|
||||
name = "breeze-gtk-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/breeze-gtk-5.23.3.tar.xz";
|
||||
sha256 = "0wq313laj7nlsw3d6p1prq1d4gic5lz2ipklj4dq4vsvsh99ggvn";
|
||||
name = "breeze-gtk-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-plymouth = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/breeze-plymouth-5.23.2.tar.xz";
|
||||
sha256 = "1lpri3rnfip9a24wrdm5b959l9lqkgk48l5ngisfly3619jz5aml";
|
||||
name = "breeze-plymouth-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/breeze-plymouth-5.23.3.tar.xz";
|
||||
sha256 = "047clfgqcrplwi3158pw1r868yyqlxs7iqqy861wzlsmjz9qzqdl";
|
||||
name = "breeze-plymouth-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
discover = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/discover-5.23.2.tar.xz";
|
||||
sha256 = "0560qrq6c7hd29cjhxvl9qyn4a97vzp5hwgdlbzmrw6kcyjy83cy";
|
||||
name = "discover-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/discover-5.23.3.tar.xz";
|
||||
sha256 = "056wcvk44r11rycnn12xf8r5psxqnm0f6i6z6nc5100sqkhip6p0";
|
||||
name = "discover-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
drkonqi = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/drkonqi-5.23.2.tar.xz";
|
||||
sha256 = "0ilg9x2ipncsbjms2l97dd0vdnay4jpsrbvamvfavdffqvzibd9f";
|
||||
name = "drkonqi-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/drkonqi-5.23.3.tar.xz";
|
||||
sha256 = "14yc6nq3z6jm8siq2r15nzsqxpawk5iqy9ghmmwy9xa4vf18dxy5";
|
||||
name = "drkonqi-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivitymanagerd = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kactivitymanagerd-5.23.2.tar.xz";
|
||||
sha256 = "1y4bmwwakz9k9rkqslh1n9cnn4jvmrdc0hd760fqsf80z1v7k2dh";
|
||||
name = "kactivitymanagerd-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kactivitymanagerd-5.23.3.tar.xz";
|
||||
sha256 = "0rizk05v19qqymrjh7vswcp80a4rpyffmq7kg88pv5k11fcjqw5b";
|
||||
name = "kactivitymanagerd-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-cli-tools = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kde-cli-tools-5.23.2.tar.xz";
|
||||
sha256 = "1zphp97g3mpz86h00d1blkj568dwfdgvl4jqx81v1s6p7dcr1wl7";
|
||||
name = "kde-cli-tools-5.23.2.tar.xz";
|
||||
};
|
||||
};
|
||||
kdecoration = {
|
||||
version = "5.23.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kdecoration-5.23.2.tar.xz";
|
||||
sha256 = "0p36grnjfnl71kqqrkvr18pr72mia81x8rnvnzb3r5abc5kbna6k";
|
||||
name = "kdecoration-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kde-cli-tools-5.23.3.tar.xz";
|
||||
sha256 = "0f8wab6n4klxj4yy4l4k3q3pdqlz9718mbjydnsmn1jgn20shsa0";
|
||||
name = "kde-cli-tools-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-gtk-config = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kde-gtk-config-5.23.2.tar.xz";
|
||||
sha256 = "0bwwlqnzdn2w9dsx64hlmy1rgc69549c89lqj0yj858prncb82d6";
|
||||
name = "kde-gtk-config-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kde-gtk-config-5.23.3.tar.xz";
|
||||
sha256 = "12w2jv0mi39c2g1w3g3c68m80ailcm98hibk1mg885r36gx9kskb";
|
||||
name = "kde-gtk-config-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kdecoration = {
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.3/kdecoration-5.23.3.tar.xz";
|
||||
sha256 = "134jmp5l2bvl042a5a1f1d66mqi4g7vrpmrn3gi7ysi34w1ylfc8";
|
||||
name = "kdecoration-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeplasma-addons = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kdeplasma-addons-5.23.2.tar.xz";
|
||||
sha256 = "0jqbhkmq2w2q6my1vhw07j6lqxmcpb5cn5vaz7pl4ax8rqiy5i76";
|
||||
name = "kdeplasma-addons-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kdeplasma-addons-5.23.3.tar.xz";
|
||||
sha256 = "139wzfj21k32m36014sas3ad5qdc0df4131ckj1shlz882w4l3dw";
|
||||
name = "kdeplasma-addons-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kgamma5 = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kgamma5-5.23.2.tar.xz";
|
||||
sha256 = "168pc6rnxbmwrkpsghfaqjvza0m3cnvzcvlr860lkp91vqqq32b6";
|
||||
name = "kgamma5-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kgamma5-5.23.3.tar.xz";
|
||||
sha256 = "06wzcpsjqy5pw3s6qg32l6qg9jf61bbpjwh802182balfq2jl0y5";
|
||||
name = "kgamma5-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
khotkeys = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/khotkeys-5.23.2.tar.xz";
|
||||
sha256 = "1pd2p46cc955z1s34jccqw81ps07nl4q4s4qzra0i831j7xsa9ib";
|
||||
name = "khotkeys-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/khotkeys-5.23.3.tar.xz";
|
||||
sha256 = "1ccjlr3q1lsmmdmh30wbrdaardvhivdzm9vrd46d301rdz6gyv86";
|
||||
name = "khotkeys-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kinfocenter = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kinfocenter-5.23.2.tar.xz";
|
||||
sha256 = "0bgdgd0n68fb5kaqdqyng9fvf3mjparrnjdp246i68kkclci5nym";
|
||||
name = "kinfocenter-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kinfocenter-5.23.3.tar.xz";
|
||||
sha256 = "09yz5grzwzgs1cg39j18zy7af8azy2lbg4bkkmh7wayv8pngj4gv";
|
||||
name = "kinfocenter-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kmenuedit = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kmenuedit-5.23.2.tar.xz";
|
||||
sha256 = "1jr25zdplndjhw8qb6c2xf255v73c85pcy7ps7x80g0y34pz2h1x";
|
||||
name = "kmenuedit-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kmenuedit-5.23.3.tar.xz";
|
||||
sha256 = "006kkg7jzwp4icik1hv95wcpw5sb1l1s94wnljvxdfdjkgzjxq55";
|
||||
name = "kmenuedit-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreen = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kscreen-5.23.2.tar.xz";
|
||||
sha256 = "1wc0ydyi5vbm3mpjqrkcxjz22gsz2xzw3xw48161z9aikfhhn44v";
|
||||
name = "kscreen-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kscreen-5.23.3.tar.xz";
|
||||
sha256 = "1x4qlycb1dxw36s3zyyrjfmfvwvwk8f8r0jls6hq8gqkl810abhw";
|
||||
name = "kscreen-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreenlocker = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kscreenlocker-5.23.2.tar.xz";
|
||||
sha256 = "1yfqj5g7zvayah53pz0bgmmz8q8hd2rmk5ndzacfl7qrz3dxq2g6";
|
||||
name = "kscreenlocker-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kscreenlocker-5.23.3.tar.xz";
|
||||
sha256 = "0wjcrikx3q533qz9wi0z3jm4k0lc09w2xsxr4iw1hh3afsd6jr34";
|
||||
name = "kscreenlocker-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
ksshaskpass = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/ksshaskpass-5.23.2.tar.xz";
|
||||
sha256 = "1icb5z7hnyrhh29krp5pgxm214w4lkq4k29laa8a1jryp3igqm1l";
|
||||
name = "ksshaskpass-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/ksshaskpass-5.23.3.tar.xz";
|
||||
sha256 = "0dcych5zcv8fqmy1lhwpbfzj75ihs648d8ppfr0nj15mm2pgnvhx";
|
||||
name = "ksshaskpass-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
ksystemstats = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/ksystemstats-5.23.2.tar.xz";
|
||||
sha256 = "0m1ijvqr5b09b4hmr81hi5wvf8d79vg36hkmq9r2digr76pf1ni4";
|
||||
name = "ksystemstats-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/ksystemstats-5.23.3.tar.xz";
|
||||
sha256 = "13jic16480rxhdwz0z49di19sxdi7rgvg61lg5i00w9mm6mbph3l";
|
||||
name = "ksystemstats-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet-pam = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kwallet-pam-5.23.2.tar.xz";
|
||||
sha256 = "105dpcb6zskqkbnhd5sl4igb0r87dza383m0qqffqfriwvjf9v6z";
|
||||
name = "kwallet-pam-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kwallet-pam-5.23.3.tar.xz";
|
||||
sha256 = "0axxk7szp5kn5hhlxh2mjzbwzaj4g1yn40ymgb6dga10h1nfdkd8";
|
||||
name = "kwallet-pam-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland-integration = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kwayland-integration-5.23.2.tar.xz";
|
||||
sha256 = "0fchl5bjyn9vkj2rzqhlg3jzi2gp993l3c6skviyfqkvp3fq91bl";
|
||||
name = "kwayland-integration-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kwayland-integration-5.23.3.tar.xz";
|
||||
sha256 = "01gm3xbaih22v33bd9142xnrli13yxmib42pj8rnczhczrpnc3z3";
|
||||
name = "kwayland-integration-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland-server = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kwayland-server-5.23.2.tar.xz";
|
||||
sha256 = "03cc0hm99gyr07kbk6vkqxs3nngsnl51smbpwg5rb3lycij38f1j";
|
||||
name = "kwayland-server-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kwayland-server-5.23.3.tar.xz";
|
||||
sha256 = "1hjh278iaz3ydf9bqy2fmm4hsvc60hrqw4hlc3ddcadp28dhg3gx";
|
||||
name = "kwayland-server-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwin = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kwin-5.23.2.tar.xz";
|
||||
sha256 = "1fpq3r93lk0wmzckd8jkw4fcdggl75mjyj59j9ivijnb8an7vfpz";
|
||||
name = "kwin-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kwin-5.23.3.tar.xz";
|
||||
sha256 = "04w8vnz3rzd9g1j1f4fbgyxjvxqrhasx6f2vqkrrh4cd56ndmcbz";
|
||||
name = "kwin-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwrited = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/kwrited-5.23.2.tar.xz";
|
||||
sha256 = "1czaq3gzyb5v153626rxb54512nkhlpsypf4aghdr9c32n12vgd4";
|
||||
name = "kwrited-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/kwrited-5.23.3.tar.xz";
|
||||
sha256 = "0156syandkq0s76xrrcz6nkxa6jgpf1a6nbkdw0a8biyxs5md644";
|
||||
name = "kwrited-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
layer-shell-qt = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/layer-shell-qt-5.23.2.tar.xz";
|
||||
sha256 = "0pw9k1g7g5fjq6hkmri546pph1rycyay97gvw8ngzx67v0n9phlg";
|
||||
name = "layer-shell-qt-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/layer-shell-qt-5.23.3.tar.xz";
|
||||
sha256 = "15y7p0a59779aqxnsryqirsxslbvbig733i5s3n5jmg98y40712a";
|
||||
name = "layer-shell-qt-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
libkscreen = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/libkscreen-5.23.2.tar.xz";
|
||||
sha256 = "1shlw9wa01ilfhh57i6752mm62qjhj0w0q5qz6kvga3gmzmwp6sf";
|
||||
name = "libkscreen-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/libkscreen-5.23.3.tar.xz";
|
||||
sha256 = "0kazvsahnk7ngld12lp1c07c34x9kal03fy8g7w9bgdha3j7xmdq";
|
||||
name = "libkscreen-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
libksysguard = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/libksysguard-5.23.2.tar.xz";
|
||||
sha256 = "1knbik3r2bv11vzc17k9971bgrd7dsk9d7j4s5323schymmbzypq";
|
||||
name = "libksysguard-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/libksysguard-5.23.3.tar.xz";
|
||||
sha256 = "0ma4b0w08j0f46ivh9grci7wfh4z5j8nml83kcvnain1nwzprha0";
|
||||
name = "libksysguard-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
milou = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/milou-5.23.2.tar.xz";
|
||||
sha256 = "0nshc6bbbjyrs2sah1q0y5msrdhhrzz24fbgqvh871csb9lh3idz";
|
||||
name = "milou-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/milou-5.23.3.tar.xz";
|
||||
sha256 = "0myvm9bkq189cfla7yqiwmbb5z2cm90rq5ll655n2c7zk3lqnn0d";
|
||||
name = "milou-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/oxygen-5.23.2.tar.xz";
|
||||
sha256 = "1k2bibgwdzwad87xyr31231b5jfk2m2x348layz41f3zl33mj1cp";
|
||||
name = "oxygen-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/oxygen-5.23.3.tar.xz";
|
||||
sha256 = "0r79xadvg7l4nsziy78wydhn4f0223fjc2xd60zih1dwmgapgf0z";
|
||||
name = "oxygen-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-browser-integration = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-browser-integration-5.23.2.tar.xz";
|
||||
sha256 = "08zf8qjcq538fg7zpw73qdcvp4a88vxvvm297y7gch37h9nrbmgg";
|
||||
name = "plasma-browser-integration-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-browser-integration-5.23.3.tar.xz";
|
||||
sha256 = "0r3sq6w73qn246nddf4f8lbym8k4wp2ycfr2laz888b5cjf9df97";
|
||||
name = "plasma-browser-integration-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-desktop = {
|
||||
version = "5.23.2.1";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-desktop-5.23.2.1.tar.xz";
|
||||
sha256 = "0d2r6bxj04078acdlv6dzvy4jamcj1d49bafa4430hcqrxjy8scg";
|
||||
name = "plasma-desktop-5.23.2.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-desktop-5.23.3.tar.xz";
|
||||
sha256 = "01259pqncx3gcpanrmhal51dn4y8xcrs16pl5bjnasdn9r8mlhs3";
|
||||
name = "plasma-desktop-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-disks = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-disks-5.23.2.tar.xz";
|
||||
sha256 = "0phv135v4jav17nb2f7cwvmcxk6sqr582jvw1y34vfphjgg8z3kw";
|
||||
name = "plasma-disks-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-disks-5.23.3.tar.xz";
|
||||
sha256 = "1qwxhasmycn6ah2pv46z8vvls85lfwxm4z61q13l63a50489a05b";
|
||||
name = "plasma-disks-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-firewall = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-firewall-5.23.2.tar.xz";
|
||||
sha256 = "1h0zjzx7anhsbpx64q6pg3nh3w329nap3d1sqz5jg2iishql8jnz";
|
||||
name = "plasma-firewall-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-firewall-5.23.3.tar.xz";
|
||||
sha256 = "0kqb7sxysh6gq143rmmznv95mx4275bp1xfrlys518yn97clnwqq";
|
||||
name = "plasma-firewall-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-integration = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-integration-5.23.2.tar.xz";
|
||||
sha256 = "116hnkfwh4q1ssmayqjx1slam3fmhmdqwd89bc5rzhw0amf1vvy8";
|
||||
name = "plasma-integration-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-integration-5.23.3.tar.xz";
|
||||
sha256 = "0q53b43yl5s1pvlqpmic2x8q5inawk66n8wng7rzgcfv9d3imhrn";
|
||||
name = "plasma-integration-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nano = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-nano-5.23.2.tar.xz";
|
||||
sha256 = "110d5qwlfg6jngxf19kqgzj0j8izqyqid0pvd10dwahp7sbsrq3q";
|
||||
name = "plasma-nano-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-nano-5.23.3.tar.xz";
|
||||
sha256 = "0ijygajn78c97s8ys8m2zn52zx45kxhk857hppkxp4jqpd5psf34";
|
||||
name = "plasma-nano-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nm = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-nm-5.23.2.tar.xz";
|
||||
sha256 = "0pphzdm5ccl045jvzp83lrcscrhrng12a7sl3mjqa1ghzfbyg2x0";
|
||||
name = "plasma-nm-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-nm-5.23.3.tar.xz";
|
||||
sha256 = "157almdi3br1qdfr0lwfdwc60fbizkwmpw3j2czk2sdsvm58rhgf";
|
||||
name = "plasma-nm-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-pa = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-pa-5.23.2.tar.xz";
|
||||
sha256 = "05f3hfvp387l968w1h8mwydzvm4kdvyyz1zvphpws8x2izwgjksn";
|
||||
name = "plasma-pa-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-pa-5.23.3.tar.xz";
|
||||
sha256 = "0md3vb2iffn4qdnj4msyn6j3hvidnsxzp2dfsnb3n0yp29niwxqk";
|
||||
name = "plasma-pa-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-phone-components = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-phone-components-5.23.2.tar.xz";
|
||||
sha256 = "1rfkxs3v37768fw51wm850smj75c3bcyl3xxl256kqm9rcb4n1gk";
|
||||
name = "plasma-phone-components-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-phone-components-5.23.3.tar.xz";
|
||||
sha256 = "1w8yqczr0933vhca5id32vg1k2np6n6hkh58n4x3z3xpdxpb5d4c";
|
||||
name = "plasma-phone-components-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-sdk = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-sdk-5.23.2.tar.xz";
|
||||
sha256 = "043qpvx6kwzpm80cqvr40y5dhw45ivb5qzc902jfc1288l3qgh1s";
|
||||
name = "plasma-sdk-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-sdk-5.23.3.tar.xz";
|
||||
sha256 = "0fb9g6vhsaxd6h6889jyhnxp86g7rwkmyiafq72hx6ikv69wyvbi";
|
||||
name = "plasma-sdk-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-systemmonitor = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-systemmonitor-5.23.2.tar.xz";
|
||||
sha256 = "0nsva84h46kx7hyv3qz2jmqgiw9mdglyxlhz3x1ywl0m4g91mgq7";
|
||||
name = "plasma-systemmonitor-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-systemmonitor-5.23.3.tar.xz";
|
||||
sha256 = "1jlgfrkdw785x9bib2hzxjyd70b9aqgcp1w6lk75bhgkrz85kz8p";
|
||||
name = "plasma-systemmonitor-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-tests = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-tests-5.23.2.tar.xz";
|
||||
sha256 = "0b8mb39vgxlrrsllyq8x83ny4i302w0hs9dgbjg909fmwddlz3k3";
|
||||
name = "plasma-tests-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-tests-5.23.3.tar.xz";
|
||||
sha256 = "1fgl09c0ir8w128z4l0bggszjsvsqncb42k44vn6i6d0qdisxdgh";
|
||||
name = "plasma-tests-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-thunderbolt = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-thunderbolt-5.23.2.tar.xz";
|
||||
sha256 = "13h5ai0bq3nafsaa2bmgdsy10ychlqm8rnvfqypkx9y52jy9jcwc";
|
||||
name = "plasma-thunderbolt-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-thunderbolt-5.23.3.tar.xz";
|
||||
sha256 = "0vzdzsl6isg24j0830lg7is47kpmpvsni7gf4vri2l8a6fy7ibav";
|
||||
name = "plasma-thunderbolt-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-vault = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-vault-5.23.2.tar.xz";
|
||||
sha256 = "0d9iynky3fxsd6lr7db51aynjz7yz51n21brgwghld4dyfyh0hsf";
|
||||
name = "plasma-vault-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-vault-5.23.3.tar.xz";
|
||||
sha256 = "061zq00mz1aamam4pc4kbbzdx4mi07iiach6w52n0c9d1bz16ym2";
|
||||
name = "plasma-vault-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-workspace-5.23.2.tar.xz";
|
||||
sha256 = "0wivjcl5s6llsq8vhi2qiw6gj0a6vppaqvmd1qihpsxgrb763lnv";
|
||||
name = "plasma-workspace-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-5.23.3.tar.xz";
|
||||
sha256 = "0mz2aanm46s88lwm1s2nwm8yfanj78rnx1y14ppzm4dx0lrjx046";
|
||||
name = "plasma-workspace-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace-wallpapers = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plasma-workspace-wallpapers-5.23.2.tar.xz";
|
||||
sha256 = "00aam10k8zmlzw0v9jv5k0gwcjizrvpcyd3nx8m3zyiv6b2jw1g9";
|
||||
name = "plasma-workspace-wallpapers-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-wallpapers-5.23.3.tar.xz";
|
||||
sha256 = "1kz4xqzgwnhp1wmqmgadn0jjc9033i2bm8hiycqkahhj603k552s";
|
||||
name = "plasma-workspace-wallpapers-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plymouth-kcm = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/plymouth-kcm-5.23.2.tar.xz";
|
||||
sha256 = "1qgg2d5lrnv5g42ikjnyby3lkxm6iaa1kxw13sdzyv5s6234q7qp";
|
||||
name = "plymouth-kcm-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/plymouth-kcm-5.23.3.tar.xz";
|
||||
sha256 = "1fa26h19g4f2fhpisp1jsl1niis50fbkdss7j1nqg44jih0g0qyf";
|
||||
name = "plymouth-kcm-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
polkit-kde-agent = {
|
||||
version = "1-5.23.2";
|
||||
version = "1-5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/polkit-kde-agent-1-5.23.2.tar.xz";
|
||||
sha256 = "1fldyflcpwhjym9z3rsi90mfjan15w28gwd1s53kiy2fzvmvj0a0";
|
||||
name = "polkit-kde-agent-1-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/polkit-kde-agent-1-5.23.3.tar.xz";
|
||||
sha256 = "1r5sqxzj5r9xqn3iwsfj06f1w69q41j4wq2z11kndnjad0pwrf3r";
|
||||
name = "polkit-kde-agent-1-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
powerdevil = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/powerdevil-5.23.2.tar.xz";
|
||||
sha256 = "0f6nhla8gsxil4i0f6np9vjs7f4hgikfw0m6zwp67qqlh9n83mxi";
|
||||
name = "powerdevil-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/powerdevil-5.23.3.tar.xz";
|
||||
sha256 = "0hcb22dy4hslzrk3md6amzm51hlmv08747f34x5drdl10cg98mzb";
|
||||
name = "powerdevil-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qqc2-breeze-style = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/qqc2-breeze-style-5.23.2.tar.xz";
|
||||
sha256 = "09bpvydpinqhc5vrx92fzw9ga6xynpvzxhwrq95dwdp3801kwkgy";
|
||||
name = "qqc2-breeze-style-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/qqc2-breeze-style-5.23.3.tar.xz";
|
||||
sha256 = "0716mw6dgpzwkaiinp8vphvxj3vrb95v7zckh4pgdky8ahxv655l";
|
||||
name = "qqc2-breeze-style-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
sddm-kcm = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/sddm-kcm-5.23.2.tar.xz";
|
||||
sha256 = "0xq9qyy56vhrwa0m4yvhp0all8m13jzhyhflc2y0d82cb4sn10yh";
|
||||
name = "sddm-kcm-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/sddm-kcm-5.23.3.tar.xz";
|
||||
sha256 = "0sb9sjdbhafjcx2nf2ffzjh14gyambj1w32gjz29fl15xjbmvqnr";
|
||||
name = "sddm-kcm-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
systemsettings = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/systemsettings-5.23.2.tar.xz";
|
||||
sha256 = "0vr22bj0nwp55qximbdn47y4208nhybqiz8pc6fqr2hdg9582s8i";
|
||||
name = "systemsettings-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/systemsettings-5.23.3.tar.xz";
|
||||
sha256 = "0i8vc1y95jd3g5vcgzixd73mn1r9s2jg9ix5nwfq4i5ihi0a0ph1";
|
||||
name = "systemsettings-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
xdg-desktop-portal-kde = {
|
||||
version = "5.23.2";
|
||||
version = "5.23.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.23.2/xdg-desktop-portal-kde-5.23.2.tar.xz";
|
||||
sha256 = "0ji02bscvdjcifibrjx5mk1ga91892hj3f6jcyiycd2xj4sqbcnf";
|
||||
name = "xdg-desktop-portal-kde-5.23.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.23.3/xdg-desktop-portal-kde-5.23.3.tar.xz";
|
||||
sha256 = "1aajlgccl1z9m49a016ixr2hiy231wyx6xnmpbvjx9h1b52b3rpz";
|
||||
name = "xdg-desktop-portal-kde-5.23.3.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = src.rev;
|
||||
pname = "eql-git";
|
||||
version = "unstable-2012-12-10";
|
||||
pname = "eql";
|
||||
src = fetchgit {
|
||||
rev = "9097bf98446ee33c07bb155d800395775ce0d9b2";
|
||||
url = "https://gitlab.com/eql/eql.git";
|
||||
|
|
|
@ -50,11 +50,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-IlXrPk6CTdfV/Nwuf4RTQ3HBhjEuVG+xCGo0wXdS9DE=";
|
||||
sha256 = "sha256-cFxkJR5bJdXVXt4QOcaqIr6kCnqTHRTDcDOYU2Q8PfA=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure";
|
||||
version = "1.10.3.1013";
|
||||
version = "1.10.3.1029";
|
||||
|
||||
src = fetchurl {
|
||||
# https://clojure.org/releases/tools
|
||||
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
||||
sha256 = "EmIdcQ7ANbDjOBUX/UQwdd1C+JzeCZaC4XaNdW49E/A=";
|
||||
sha256 = "14c08xva1r6sl3h78vhckwx5dd8kqwi7457prygh9330b7r8caa2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "zita-resampler";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI=";
|
||||
|
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
"SUFFIX="
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
cd source
|
||||
substituteInPlace Makefile \
|
||||
--replace 'ldconfig' ""
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
, fetchFromGitHub
|
||||
, lib
|
||||
, subproject ? "library" # one of "library", "reader" or "writer"
|
||||
, zlib, libpng, libtiff
|
||||
, zlib
|
||||
, libpng
|
||||
, libtiff
|
||||
, jabcode
|
||||
}:
|
||||
let
|
||||
|
@ -11,9 +13,10 @@ let
|
|||
"reader" = "jabcodeReader";
|
||||
"writer" = "jabcodeWriter";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jabcode-${subproject}";
|
||||
version = "git-2020-05-13";
|
||||
version = "unstable-2020-05-13";
|
||||
src = fetchFromGitHub {
|
||||
repo = "jabcode";
|
||||
owner = "jabcode";
|
||||
|
@ -27,13 +30,14 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
preConfigure = "cd src/${subdir}";
|
||||
|
||||
installPhase = if subproject == "library" then ''
|
||||
mkdir -p $out/lib
|
||||
cp build/* $out/lib
|
||||
'' else ''
|
||||
mkdir -p $out/bin
|
||||
cp -RT bin $out/bin
|
||||
'';
|
||||
installPhase =
|
||||
if subproject == "library" then ''
|
||||
mkdir -p $out/lib
|
||||
cp build/* $out/lib
|
||||
'' else ''
|
||||
mkdir -p $out/bin
|
||||
cp -RT bin $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-capacity 2D color bar code (${subproject})";
|
||||
|
|
|
@ -1,22 +1,42 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
|
||||
, qtbase, qtmultimedia, qtquick1, qttools
|
||||
, libGL, libX11
|
||||
, libass, openal, ffmpeg, libuchardet
|
||||
, alsa-lib, libpulseaudio, libva
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qtquick1
|
||||
, qttools
|
||||
, libGL
|
||||
, libX11
|
||||
, libass
|
||||
, openal
|
||||
, ffmpeg
|
||||
, libuchardet
|
||||
, alsa-lib
|
||||
, libpulseaudio
|
||||
, libva
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "libqtav";
|
||||
version = "git-2020-09-10";
|
||||
version = "unstable-2020-09-10";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules qttools ];
|
||||
buildInputs = [
|
||||
qtbase qtmultimedia qtquick1
|
||||
libGL libX11
|
||||
libass openal ffmpeg libuchardet
|
||||
alsa-lib libpulseaudio libva
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtquick1
|
||||
libGL
|
||||
libX11
|
||||
libass
|
||||
openal
|
||||
ffmpeg
|
||||
libuchardet
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libva
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, sqlite
|
||||
|
@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "Make-CApi-test-cross-platform.patch";
|
||||
url = "https://github.com/OSGeo/PROJ/commit/ac113a8898cded7f5359f1edd3abc17a78eee9b4.patch";
|
||||
sha256 = "0gz2xa5nxzck5c0yr7cspv3kw4cz3fxb2yic76w7qfvxidi7z1s1";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev"];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
|
||||
# don't run tests in buildPhase
|
||||
# don't overwrite test binary
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "lwt_camlp4";
|
||||
version = "git-20180325";
|
||||
version = "unstable-2018-03-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocsigen";
|
||||
|
|
|
@ -17,9 +17,8 @@ buildDunePackage rec {
|
|||
sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ cppo dune-configurator ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims
|
||||
nativeBuildInputs = [ pkg-config cppo dune-configurator ];
|
||||
buildInputs = optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims
|
||||
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
|
||||
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
|
||||
|
||||
|
|
|
@ -36,15 +36,6 @@ buildDunePackage rec {
|
|||
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [
|
||||
afl-persistent
|
||||
bigarray-compat
|
||||
bigarray-overlap
|
||||
bigstringaf
|
||||
fpath
|
||||
mirage-crypto-rng
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
angstrom
|
||||
base64
|
||||
|
@ -59,6 +50,12 @@ buildDunePackage rec {
|
|||
rresult
|
||||
unstrctrd
|
||||
uutf
|
||||
afl-persistent
|
||||
bigarray-compat
|
||||
bigarray-overlap
|
||||
bigstringaf
|
||||
fpath
|
||||
mirage-crypto-rng
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -11,7 +11,7 @@ buildDunePackage rec {
|
|||
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [ cppo ];
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Optimised functions to read and write int16/32/64";
|
||||
|
|
|
@ -23,6 +23,11 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_command.py \
|
||||
--replace '/tmp/' "$TMPDIR/"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
ordered-set
|
||||
|
|
|
@ -16,13 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-plugins";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = "faraday_plugins";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dnd6q/L3yh/9XkrWC4ETccSO6zr31wBsuumDvwemKyA=";
|
||||
sha256 = "sha256-RTHhCSOqtdPsgZgeziAYm+9NoR72Jfm+42fyyKqjFpA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -53,7 +54,9 @@ buildPythonPackage rec {
|
|||
"test_process_report_summary"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "faraday_plugins" ];
|
||||
pythonImportsCheck = [
|
||||
"faraday_plugins"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Security tools report parsers for Faraday";
|
||||
|
|
59
pkgs/development/tools/jet/default.nix
Normal file
59
pkgs/development/tools/jet/default.nix
Normal file
|
@ -0,0 +1,59 @@
|
|||
{ stdenv, lib, graalvm11-ce, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jet";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-RCEIIZfPmOLW3akjEgaEas4xOtYxL6lQsxDv2szB8K4";
|
||||
};
|
||||
|
||||
reflectionJson = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json";
|
||||
sha256 = "sha256-mOUiKEM5tYhtpBpm7KtslyPYFsJ+Wr+4ul6Zi4aS09Q=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
buildInputs = [ graalvm11-ce ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# https://github.com/borkdude/jet/blob/v0.1.0/script/compile#L16-L29
|
||||
args=("-jar" "$src"
|
||||
"-H:CLibraryPath=${graalvm11-ce.lib}/lib"
|
||||
# Required to build jet on darwin. Do not remove.
|
||||
"${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}"
|
||||
"-H:Name=jet"
|
||||
"-H:+ReportExceptionStackTraces"
|
||||
"-J-Dclojure.spec.skip-macros=true"
|
||||
"-J-Dclojure.compiler.direct-linking=true"
|
||||
"-H:IncludeResources=JET_VERSION"
|
||||
"-H:ReflectionConfigurationFiles=${reflectionJson}"
|
||||
"--initialize-at-build-time"
|
||||
"-H:Log=registerResource:"
|
||||
"--verbose"
|
||||
"--no-fallback"
|
||||
"--no-server"
|
||||
"-J-Xmx3g")
|
||||
|
||||
native-image ''${args[@]}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp jet $out/bin/jet
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI to transform between JSON, EDN and Transit, powered with a minimal query language";
|
||||
homepage = "https://github.com/borkdude/jet";
|
||||
license = licenses.epl10;
|
||||
platforms = graalvm11-ce.meta.platforms;
|
||||
maintainers = with maintainers; [ ericdallo ];
|
||||
};
|
||||
}
|
|
@ -1,16 +1,32 @@
|
|||
{ callPackage, fetchgit, lib, stdenvNoCC
|
||||
, bison, curl, git, perl
|
||||
, flex, gnat11, zlib
|
||||
{ bison
|
||||
, callPackage
|
||||
, curl
|
||||
, fetchgit
|
||||
, flex
|
||||
, getopt
|
||||
, git
|
||||
, gnat11
|
||||
, lib
|
||||
, perl
|
||||
, stdenvNoCC
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "coreboot-toolchain";
|
||||
version = "4.14";
|
||||
version = "4.15";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = version;
|
||||
sha256 = "00xr74yc0kj9rrqa1a8b7bih865qlp9i4zs67ysavkfrjrwwssxm";
|
||||
sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9";
|
||||
fetchSubmodules = false;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
patchShebangs $out/util/crossgcc/buildgcc
|
||||
PATH=${lib.makeBinPath [ getopt ]}:$PATH $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison curl git perl ];
|
||||
|
@ -28,10 +44,11 @@ stdenvNoCC.mkDerivation rec {
|
|||
) (callPackage ./stable.nix { })
|
||||
}
|
||||
|
||||
patchShebangs util/genbuild_h/genbuild_h.sh util/crossgcc/buildgcc
|
||||
patchShebangs util/genbuild_h/genbuild_h.sh
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
export CROSSGCC_VERSION=$(cat .crossgcc_version)
|
||||
make crossgcc-i386 CPUS=$NIX_BUILD_CORES DEST=$out
|
||||
'';
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{ fetchurl }: [
|
||||
{
|
||||
name = "gmp-6.2.0.tar.xz";
|
||||
name = "gmp-6.2.1.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5";
|
||||
url = "mirror://gnu/gmp/gmp-6.2.0.tar.xz";
|
||||
sha256 = "1wml97fdmpcynsbw9yl77rj29qibfp652d0w3222zlfx5j8jjj7x";
|
||||
url = "mirror://gnu/gmp/gmp-6.2.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -14,31 +14,31 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "mpc-1.2.0.tar.gz";
|
||||
name = "mpc-1.2.1.tar.gz";
|
||||
archive = fetchurl {
|
||||
sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9";
|
||||
url = "mirror://gnu/mpc/mpc-1.2.0.tar.gz";
|
||||
sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p";
|
||||
url = "mirror://gnu/mpc/mpc-1.2.1.tar.gz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "gcc-8.3.0.tar.xz";
|
||||
name = "gcc-11.2.0.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4";
|
||||
url = "mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz";
|
||||
sha256 = "12zs6vd2rapp42x154m479hg3h3lsafn3xhg06hp5hsldd9xr3nh";
|
||||
url = "mirror://gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "binutils-2.35.1.tar.xz";
|
||||
name = "binutils-2.37.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "01w6xvfy7sjpw8j08k111bnkl27j760bdsi0wjvq44ghkgdr3v9w";
|
||||
url = "mirror://gnu/binutils/binutils-2.35.1.tar.xz";
|
||||
sha256 = "0b53hhgfnafw27y0c3nbmlfidny2cc5km29pnfffd8r0y0j9f3c2";
|
||||
url = "mirror://gnu/binutils/binutils-2.37.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "acpica-unix2-20200925.tar.gz";
|
||||
name = "acpica-unix2-20210331.tar.gz";
|
||||
archive = fetchurl {
|
||||
sha256 = "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w";
|
||||
url = "https://acpica.org/sites/acpica/files/acpica-unix2-20200925.tar.gz";
|
||||
sha256 = "1h98pvc9iy1c49cid0ppjwk5zsy2m1xbvfqb72pkwkrd4rn35arx";
|
||||
url = "https://acpica.org/sites/acpica/files/acpica-unix2-20210331.tar.gz";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
|
@ -1,9 +1,14 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell --pure -i bash -p nix cacert git getopt
|
||||
|
||||
rootdir="../../../../../"
|
||||
if [ ! -d .git ]; then
|
||||
echo "This script needs to be run from the root directory of nixpkgs. Exiting."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
src="$(nix-build $rootdir --no-out-link -A coreboot-toolchain.src)"
|
||||
pkg_dir="$(dirname "$0")"
|
||||
|
||||
src="$(nix-build . --no-out-link -A coreboot-toolchain.src)"
|
||||
urls=$($src/util/crossgcc/buildgcc -u)
|
||||
|
||||
tmp=$(mktemp)
|
||||
|
@ -28,4 +33,4 @@ echo ']' >> $tmp
|
|||
|
||||
sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' $tmp
|
||||
|
||||
mv $tmp sources.nix
|
||||
mv $tmp $pkg_dir/sources.nix
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
puppet-lint (2.3.6)
|
||||
puppet-lint (2.5.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
@ -10,4 +10,4 @@ DEPENDENCIES
|
|||
puppet-lint
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.2.24
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
{
|
||||
puppet-lint = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wyk2l440d96ps3x127r52n51kqpqi2nzb3xlg92qn6aksqhnkis";
|
||||
sha256 = "1rcj3cb6lf90g6vvhh3c9p8yn7pgibglf9k5878bzd6pn5ag0h9v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.6";
|
||||
version = "2.5.2";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wrangler";
|
||||
version = "1.19.4";
|
||||
version = "1.19.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Qe/bl5H+ieHGC2GXdWlXCR+ZI1SNfy4l+VIGMy193lk=";
|
||||
sha256 = "sha256-r8Ni6r1NpHJ0UVEV+aG1RkGn0GQijTiWWZyQWJRXPi8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-KYxqir/wxvyn9sgLF0OjM2Zn42Wt9eUqIX0Xbsvq1c4=";
|
||||
cargoSha256 = "sha256-GWBY4diq6VFpBcb1ROmJcXX/zJGwanja8eoaxxm+ij8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -11,8 +11,8 @@ let
|
|||
};
|
||||
|
||||
opensfx = fetchzip {
|
||||
url = "https://cdn.openttd.org/opensfx-releases/1.0.2/opensfx-1.0.2-all.zip";
|
||||
sha256 = "sha256-yRCb49/k8uUUAe9VzUG0LQaBDFP7n9QdrLSJDIthdbA=";
|
||||
url = "https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip";
|
||||
sha256 = "sha256-QmfXizrRTu/fUcVOY7tCndv4t4BVW+fb0yUi8LgSYzM=";
|
||||
};
|
||||
|
||||
openmsx = fetchzip {
|
||||
|
@ -29,11 +29,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openttd";
|
||||
version = "12.0";
|
||||
version = "12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
|
||||
sha256 = "sha256-u6D9OADfA3AlnmQtJR82LHwAtHii41Mfa6f4TBwrMtw=";
|
||||
sha256 = "sha256-JYv1uZgwEIkLoQUYtQa8SrgPfAjM7FlJfpulWkqj5+M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
openttd.overrideAttrs (oldAttrs: rec {
|
||||
pname = "openttd-jgrpp";
|
||||
version = "0.43.1";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "JGRennison";
|
||||
repo = "OpenTTD-patches";
|
||||
rev = "jgrpp-${version}";
|
||||
sha256 = "sha256-nCZ3UN2BdpDGbW0CKX/ijxlA3cQ7FPflajQ5TBM1Hdk=";
|
||||
sha256 = "sha256-/kqwMZGXUYWlCnjk6uShJ5UARtvBSZWPExVel5o4xA8=";
|
||||
};
|
||||
})
|
||||
|
|
|
@ -1,10 +1,25 @@
|
|||
{ lib, stdenv, fetchFromGitHub, which, pkg-config, SDL2, libGL, openalSoft
|
||||
, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, which
|
||||
, pkg-config
|
||||
, SDL2
|
||||
, libGL
|
||||
, openalSoft
|
||||
, curl
|
||||
, speex
|
||||
, opusfile
|
||||
, libogg
|
||||
, libvorbis
|
||||
, libopus
|
||||
, libjpeg
|
||||
, mumble
|
||||
, freetype
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ioquake3-git";
|
||||
version = "2021-07-20";
|
||||
pname = "ioquake3";
|
||||
version = "unstable-2021-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ioquake";
|
||||
|
@ -15,8 +30,18 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ which pkg-config ];
|
||||
buildInputs = [
|
||||
SDL2 libGL openalSoft curl speex opusfile libogg libvorbis libopus libjpeg
|
||||
freetype mumble
|
||||
SDL2
|
||||
libGL
|
||||
openalSoft
|
||||
curl
|
||||
speex
|
||||
opusfile
|
||||
libogg
|
||||
libvorbis
|
||||
libopus
|
||||
libjpeg
|
||||
freetype
|
||||
mumble
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -1,5 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchsvn, pkg-config, sconsPackages, libGLU, libGL, SDL2, SDL2_image
|
||||
, libvorbis, bullet, curl, gettext, writeTextFile
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchsvn
|
||||
, pkg-config
|
||||
, sconsPackages
|
||||
, libGLU
|
||||
, libGL
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, libvorbis
|
||||
, bullet
|
||||
, curl
|
||||
, gettext
|
||||
, writeTextFile
|
||||
|
||||
, data ? fetchsvn {
|
||||
url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data";
|
||||
|
@ -8,7 +21,7 @@
|
|||
}
|
||||
}:
|
||||
let
|
||||
version = "git";
|
||||
version = "unstable-2017-12-09";
|
||||
bin = stdenv.mkDerivation {
|
||||
pname = "vdrift";
|
||||
inherit version;
|
||||
|
@ -36,7 +49,7 @@ let
|
|||
description = "Car racing game";
|
||||
homepage = "http://vdrift.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [viric];
|
||||
maintainers = with lib.maintainers; [ viric ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
};
|
||||
|
@ -54,7 +67,7 @@ in writeTextFile {
|
|||
'';
|
||||
} // {
|
||||
meta = bin.meta // {
|
||||
hydraPlatforms = [];
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
unwrapped = bin;
|
||||
inherit bin data;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, udev }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "moltengamepad-git";
|
||||
version = "2016-05-04";
|
||||
pname = "moltengamepad";
|
||||
version = "unstable-2016-05-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgeumlek";
|
||||
|
|
|
@ -4,6 +4,12 @@ stdenv.mkDerivation {
|
|||
name = "${mingw_w64.name}-pthreads";
|
||||
inherit (mingw_w64) src meta;
|
||||
|
||||
configureFlags = [
|
||||
# Rustc require 'libpthread.a' when targeting 'x86_64-pc-windows-gnu'.
|
||||
# Enabling this makes it work out of the box instead of failing.
|
||||
"--enable-static"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cd mingw-w64-libraries/winpthreads
|
||||
'';
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata }:
|
||||
{ lib, buildGo117Module, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo117Module rec {
|
||||
pname = "grafana";
|
||||
version = "8.1.6";
|
||||
version = "8.2.3";
|
||||
|
||||
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
|
||||
|
||||
|
@ -10,17 +10,23 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-PUVRFa3b+O2lY6q3vO+rLUcC+fx80iB78tt60f6Vugk=";
|
||||
sha256 = "sha256-GC4pHwthsXu/+dXb1cBk5bC0O6NnyiChC+UWleq7JzA=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "sha256-So9xzet9kPkjcDwNts3iXlCd+u2uiXTo0LVcLc8toyk=";
|
||||
sha256 = "sha256-LOswYw0P3dy6arrmUbnzBU0ie2YcPtk6xqtp9CowG2s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-dn4sliRp58oZALZ8Iu7kE83ntkcMIU84Xr5WoeXlhCI=";
|
||||
vendorSha256 = "sha256-yZbdUiuRNFRaXduOYps5ygiaUgvNXw+Ah4wZrfYcJlY=";
|
||||
|
||||
nativeBuildInputs = [ wire ];
|
||||
|
||||
preBuild = ''
|
||||
# Generate DI code that's required to compile the package.
|
||||
# From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35
|
||||
wire gen -tags oss ./pkg/server
|
||||
|
||||
# The testcase makes an API call against grafana.com:
|
||||
#
|
||||
# --- Expected
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "routinator";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLnetLabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y=";
|
||||
sha256 = "0a2iwpmljkha6qlbw0373wph7pxz05qym5712vzbszw0z42f82l2";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM=";
|
||||
cargoSha256 = "0l3fhwgrdvjrlmiqdy90sfd8kb2s7y0lbfswlrr560ly0bi1lfbx";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tt-rss-plugin-ff-instagram";
|
||||
version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
|
||||
version = "unstable-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wltb";
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildFishPlugin {
|
||||
pname = "foreign-env";
|
||||
version = "git-20200209";
|
||||
version = "unstable-2020-02-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oh-my-fish";
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "git-2018-06-03";
|
||||
version = "unstable-2018-06-03";
|
||||
pname = "run-scaled";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaueraal";
|
||||
repo = "run_scaled";
|
||||
rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c";
|
||||
owner = "kaueraal";
|
||||
repo = "run_scaled";
|
||||
rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c";
|
||||
sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys";
|
||||
};
|
||||
|
||||
|
|
|
@ -1,14 +1,33 @@
|
|||
{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
|
||||
, libXext, libXinerama, libjpeg, giflib, pkg-config
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, xorgproto
|
||||
, libX11
|
||||
, libXft
|
||||
, libXcomposite
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXinerama
|
||||
, libjpeg
|
||||
, giflib
|
||||
, pkg-config
|
||||
}:
|
||||
let
|
||||
buildInputs = [
|
||||
xorgproto libX11 libXft libXcomposite libXdamage libXext
|
||||
libXinerama libjpeg giflib pkg-config
|
||||
xorgproto
|
||||
libX11
|
||||
libXft
|
||||
libXcomposite
|
||||
libXdamage
|
||||
libXext
|
||||
libXinerama
|
||||
libjpeg
|
||||
giflib
|
||||
pkg-config
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "git-2015-03-01";
|
||||
version = "unstable-2015-03-01";
|
||||
pname = "skippy-xd";
|
||||
inherit buildInputs;
|
||||
src = fetchgit {
|
||||
|
@ -16,14 +35,14 @@ stdenv.mkDerivation rec {
|
|||
rev = "397216ca67";
|
||||
sha256 = "0zcjacilmsv69rv85j6nfr6pxy8z36w1sjz0dbjg6s5m4kga1zl8";
|
||||
};
|
||||
makeFlags = ["PREFIX=$(out)"];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
preInstall = ''
|
||||
sed -e "s@/etc/xdg@$out&@" -i Makefile
|
||||
'';
|
||||
meta = {
|
||||
description = "Expose-style compositing-based standalone window switcher";
|
||||
license = lib.licenses.gpl2Plus ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,11 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
|
||||
, autoconf, automake, libtool, gettext, pkg-config
|
||||
, git, perl, texinfo, help2man
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libX11
|
||||
, libXScrnSaver
|
||||
, libXext
|
||||
, gnulib
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, gettext
|
||||
, pkg-config
|
||||
, git
|
||||
, perl
|
||||
, texinfo
|
||||
, help2man
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xprintidle-ng";
|
||||
version = "git-2015-09-01";
|
||||
version = "unstable-2015-09-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taktoa";
|
||||
|
@ -20,8 +33,16 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf automake gettext git gnulib
|
||||
help2man libtool perl pkg-config texinfo
|
||||
autoconf
|
||||
automake
|
||||
gettext
|
||||
git
|
||||
gnulib
|
||||
help2man
|
||||
libtool
|
||||
perl
|
||||
pkg-config
|
||||
texinfo
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
|
@ -30,15 +51,17 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
buildInputs = [
|
||||
libX11 libXScrnSaver libXext
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXext
|
||||
];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
inherit version;
|
||||
description = "A command-line tool to print idle time from libXss";
|
||||
homepage = "http://taktoa.me/xprintidle-ng/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vobsub2srt-git";
|
||||
version = "20140817-${builtins.substring 0 7 rev}";
|
||||
pname = "vobsub2srt";
|
||||
version = "unstable-2014-08-17";
|
||||
rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
|
||||
|
||||
src = fetchgit {
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "qrcode-git";
|
||||
version = "20160804";
|
||||
pname = "qrcode";
|
||||
version = "unstable-2016-08-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qsantos";
|
||||
repo = "qrcode";
|
||||
rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73";
|
||||
owner = "qsantos";
|
||||
repo = "qrcode";
|
||||
rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73";
|
||||
sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf";
|
||||
};
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ libX11, libXfixes, lib, stdenv, fetchFromGitHub }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clipnotify";
|
||||
version = "git-2018-02-20";
|
||||
version = "unstable-2018-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdown";
|
||||
repo = "clipnotify";
|
||||
rev = "9cb223fbe494c5b71678a9eae704c21a97e3bddd";
|
||||
repo = "clipnotify";
|
||||
rev = "9cb223fbe494c5b71678a9eae704c21a97e3bddd";
|
||||
sha256 = "1x9avjq0fgw0svcbw6b6873qnsqxbacls9sipmcv86xia4bxh8dn";
|
||||
};
|
||||
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "colorpicker";
|
||||
version = "git-2018-01-14";
|
||||
version = "unstable-2018-01-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ancurio";
|
||||
repo = "colorpicker";
|
||||
rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17";
|
||||
repo = "colorpicker";
|
||||
rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17";
|
||||
sha256 = "1kj1dpb79llrfpszraaz6r7ci114zqi5rmqxwsvq2dnnpjxyi29r";
|
||||
};
|
||||
|
||||
|
|
|
@ -9,13 +9,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "svtplay-dl";
|
||||
version = "4.8";
|
||||
version = "4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "1mlf0yvj3zy3df0ip7qb6g4v7032rsz038a7d25zn6yfzsz04br3";
|
||||
sha256 = "01jbhydj6q1zgzsrs9prpsc3ycqzisx4jqm70dikkmsr5b64hhni";
|
||||
};
|
||||
|
||||
pythonPaths = [ cryptography pyyaml requests ];
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "connman_dmenu";
|
||||
version = "git-29-9-2015";
|
||||
version = "unstable-2015-09-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "march-linux";
|
||||
|
@ -26,10 +26,10 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
description = "A dmenu wrapper for connmann";
|
||||
homepage = "https://github.com/march-linux/connman_dmenu";
|
||||
license = lib.licenses.free;
|
||||
maintainers = [ lib.maintainers.magnetophon ];
|
||||
platforms = lib.platforms.all;
|
||||
description = "A dmenu wrapper for connmann";
|
||||
homepage = "https://github.com/march-linux/connman_dmenu";
|
||||
license = lib.licenses.free;
|
||||
maintainers = [ lib.maintainers.magnetophon ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tpm-luks";
|
||||
version = "git-2015-07-11";
|
||||
version = "unstable-2015-07-11";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/momiji/tpm-luks";
|
||||
|
@ -23,14 +23,14 @@ stdenv.mkDerivation {
|
|||
make install DESTDIR=$out
|
||||
mv $out/$out/sbin $out/bin
|
||||
rm -r $out/nix
|
||||
'';
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "LUKS key storage in TPM NVRAM";
|
||||
homepage = "https://github.com/shpedoikal/tpm-luks/";
|
||||
homepage = "https://github.com/shpedoikal/tpm-luks/";
|
||||
maintainers = [ maintainers.tstrobel ];
|
||||
license = with licenses; [ gpl2Only ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "das_watchdog";
|
||||
version = "git-2015-09-12";
|
||||
version = "unstable-2015-09-12";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/kmatheussen/das_watchdog.git";
|
||||
|
|
|
@ -6531,6 +6531,8 @@ with pkgs;
|
|||
|
||||
jekyll = callPackage ../applications/misc/jekyll { };
|
||||
|
||||
jet = callPackage ../development/tools/jet { };
|
||||
|
||||
jfsutils = callPackage ../tools/filesystems/jfsutils { };
|
||||
|
||||
jhead = callPackage ../tools/graphics/jhead { };
|
||||
|
@ -20258,10 +20260,10 @@ with pkgs;
|
|||
# across different go versions and/or platforms:
|
||||
# https://github.com/NixOS/nixpkgs/issues/144667
|
||||
#
|
||||
# do not uncomment this without approval from the go CODEOWNERS
|
||||
#buildGo117Package = callPackage ../development/go-packages/generic {
|
||||
# go = buildPackages.go_1_17;
|
||||
#};
|
||||
# That's why `buildGoPackage != buildGo117Package`.
|
||||
buildGo117Package = callPackage ../development/go-packages/generic {
|
||||
go = buildPackages.go_1_17;
|
||||
};
|
||||
|
||||
buildGoPackage = buildGo116Package;
|
||||
|
||||
|
@ -20275,10 +20277,10 @@ with pkgs;
|
|||
# across different go versions and/or platforms:
|
||||
# https://github.com/NixOS/nixpkgs/issues/144667
|
||||
#
|
||||
# do not uncomment this without approval from the go CODEOWNERS
|
||||
#buildGo117Module = callPackage ../development/go-modules/generic {
|
||||
# go = buildPackages.go_1_17;
|
||||
#};
|
||||
# That's why `buildGoModule != buildGo117Module`.
|
||||
buildGo117Module = callPackage ../development/go-modules/generic {
|
||||
go = buildPackages.go_1_17;
|
||||
};
|
||||
|
||||
buildGoModule = buildGo116Module;
|
||||
|
||||
|
@ -26188,6 +26190,8 @@ with pkgs;
|
|||
|
||||
chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { };
|
||||
|
||||
helm-docs = callPackage ../applications/networking/cluster/helm-docs { };
|
||||
|
||||
kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
|
||||
|
||||
kupfer = callPackage ../applications/misc/kupfer { };
|
||||
|
|
Loading…
Reference in a new issue