Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3b3114f45d
|
|
@ -123,7 +123,7 @@ in
|
|||
|
||||
mongodbPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.mongodb-4_0;
|
||||
default = pkgs.mongodb-4_2;
|
||||
defaultText = literalExpression "pkgs.mongodb";
|
||||
description = lib.mdDoc ''
|
||||
The mongodb package to use.
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
nodes = {
|
||||
node = {...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
mongodb-4_0
|
||||
mongodb-4_2
|
||||
mongodb-4_4
|
||||
mongodb-5_0
|
||||
|
|
@ -44,7 +43,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
testScript = ''
|
||||
node.start()
|
||||
''
|
||||
+ runMongoDBTest pkgs.mongodb-4_0
|
||||
+ runMongoDBTest pkgs.mongodb-4_2
|
||||
+ runMongoDBTest pkgs.mongodb-4_4
|
||||
+ runMongoDBTest pkgs.mongodb-5_0
|
||||
|
|
|
|||
|
|
@ -9,20 +9,20 @@ stdenv.mkDerivation {
|
|||
sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config sconsPackages.scons_3_0_1 ];
|
||||
nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ];
|
||||
buildInputs = [ boost ladspaH ];
|
||||
|
||||
patchPhase = ''
|
||||
# remove TERM:
|
||||
sed -i -e '4d' SConstruct
|
||||
sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct
|
||||
sed -i 's@Options@Variables@g' SConstruct
|
||||
sed -i "s@-fomit-frame-pointer -ffast-math -mfpmath=sse@-I ${boost.dev}/include@g" SConstruct
|
||||
sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp
|
||||
sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp
|
||||
sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "LADSPA plugins based on filters of nova";
|
||||
homepage = "http://klingt.org/~tim/nova-filters/";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,28 @@
|
|||
{ lib, stdenv, fetchFromGitHub, boost, libpulseaudio }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, cxxopts
|
||||
, libpulseaudio
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pamixer";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdemoulins";
|
||||
repo = "pamixer";
|
||||
rev = version;
|
||||
sha256 = "sha256-7VNhHAQ1CecQPlqb8SMKK0U1SsFZxDuS+QkPqJfMqrQ=";
|
||||
hash = "sha256-LbRhsW2MiTYWSH6X9Pz9XdJdH9Na0QCO8CFmlzZmDjQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ boost libpulseaudio ];
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
buildInputs = [ boost cxxopts libpulseaudio ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pulseaudio command line mixer";
|
||||
|
|
|
|||
|
|
@ -13,21 +13,32 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sc68";
|
||||
version = "unstable-2021-08-23";
|
||||
version = "unstable-2022-11-24";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "svn://svn.code.sf.net/p/sc68/code/";
|
||||
rev = "694";
|
||||
sha256 = "1yycnr4ndzfhbmki41c30zskwyizpb9wb8sf0gxcprllmbq6a421";
|
||||
rev = "695";
|
||||
sha256 = "sha256-RO3Yhjalu49BUM0fYOZtI2l6KbuUuw03whRxlKneabo=";
|
||||
};
|
||||
|
||||
preConfigure = "tools/svn-bootstrap.sh";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config which autoconf automake libtool hexdump ];
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
hexdump
|
||||
libtool
|
||||
pkg-config
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [ libao zlib curl ];
|
||||
buildInputs = [
|
||||
curl
|
||||
libao
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Atari ST and Amiga music player";
|
||||
|
|
|
|||
29
pkgs/applications/editors/edlin/default.nix
Normal file
29
pkgs/applications/editors/edlin/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "edlin";
|
||||
version = "2.21";
|
||||
|
||||
src = let
|
||||
inherit (finalAttrs) version;
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/freedos-edlin/freedos-edlin/${version}/edlin-${version}.tar.bz2";
|
||||
hash = "sha256-lQ/tw8dvEKV81k5GV05o49glOmfYcEeJBmgPUmL3S2I=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/doc/edlin-${finalAttrs.version}/
|
||||
cp AUTHORS ChangeLog README TODO edlin.htm $out/share/doc/edlin-${finalAttrs.version}/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sourceforge.net/projects/freedos-edlin/";
|
||||
description = "FreeDOS line editor";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ldtk";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
|
||||
sha256 = "sha256-t1fKf+y1lHuBKnyh0j4RoDZziIOu1tlona1xyBsl6+Q=";
|
||||
sha256 = "sha256-G54PQriKbm1fTqxD3J2O9bD4FBZuwqkfFPV+412nRGA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -448,12 +448,12 @@
|
|||
};
|
||||
gitcommit = buildGrammar {
|
||||
language = "gitcommit";
|
||||
version = "f838621";
|
||||
version = "74b4077";
|
||||
source = fetchFromGitHub {
|
||||
owner = "gbprod";
|
||||
repo = "tree-sitter-gitcommit";
|
||||
rev = "f838621d00831967a39ac8293cd3c23b0f49252e";
|
||||
hash = "sha256-9OulAtUDMP1jKYPOFBfctBVX2TWktkmwPtE3sCh1qD8=";
|
||||
rev = "74b40770e6299564f0b7ca474105d7d5238d0583";
|
||||
hash = "sha256-WpPJ1EfTd5QavXiEtBIu6RBCtzN9MoklyU+/055NfOI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
|
||||
};
|
||||
|
|
@ -947,12 +947,12 @@
|
|||
};
|
||||
norg = buildGrammar {
|
||||
language = "norg";
|
||||
version = "8ad2005";
|
||||
version = "6348056";
|
||||
source = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "tree-sitter-norg";
|
||||
rev = "8ad20059c6f128861c4506fff866150ffee1d6f4";
|
||||
hash = "sha256-1cKH3k/nbZhZleINZ91M+glG1m2SlBJR/AP7mz/SAvI=";
|
||||
rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712";
|
||||
hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
|
||||
};
|
||||
|
|
@ -1236,12 +1236,12 @@
|
|||
};
|
||||
scala = buildGrammar {
|
||||
language = "scala";
|
||||
version = "140c96c";
|
||||
version = "314bc06";
|
||||
source = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-scala";
|
||||
rev = "140c96cf398693189d4e50f76d19ddfcd8a018f8";
|
||||
hash = "sha256-Sr4+avj0v1y8K6XXPAVwJDTa6+RmbKe/4dzd0k0y3cE=";
|
||||
rev = "314bc06e59b3e0a37f224b1d391fd764757abd70";
|
||||
hash = "sha256-+qR4bOhJOUDBudR9LlLvH5a4W7jRgCV1XrxxFwHf+Fs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
|
||||
};
|
||||
|
|
@ -1496,12 +1496,12 @@
|
|||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "0e3725a";
|
||||
version = "e5ec6a4";
|
||||
source = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vls";
|
||||
rev = "0e3725a0c10d357f16b716f9a321a337bc802f02";
|
||||
hash = "sha256-RDG/HFSMF5zxtO/elhtv2oH3OnUx47X3xYRqS1+Oz9U=";
|
||||
rev = "e5ec6a42f1af42d4101fb226a98b8db0f4f21c88";
|
||||
hash = "sha256-Nl2c18MFhqbHp2jkUfUSCB6DwBoQD34AhKz6IQcSvKM=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/vlang/vls";
|
||||
|
|
|
|||
|
|
@ -1052,7 +1052,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-MzacdTuCaBIAyWxH+Uza1KToGZgGPcwMCe5JtQ+68/M=";
|
||||
cargoSha256 = "sha256-UCf5Jya1ATYgCggS/5SitLuQZwtMjrIY9qcBL4RDRAc=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -558,6 +558,7 @@ https://github.com/rmehri01/onenord.nvim/,main,
|
|||
https://github.com/tyru/open-browser-github.vim/,,
|
||||
https://github.com/tyru/open-browser.vim/,,
|
||||
https://github.com/nvim-orgmode/orgmode/,,
|
||||
https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
|
||||
https://github.com/vuki656/package-info.nvim/,,
|
||||
https://github.com/wbthomason/packer.nvim/,,
|
||||
https://github.com/drewtempelmeyer/palenight.vim/,,
|
||||
|
|
|
|||
|
|
@ -1,32 +1,29 @@
|
|||
--- a/src/emu/emuopts.cpp 2022-10-29 15:05:18.591381088 +0200
|
||||
+++ b/src/emu/emuopts.cpp 2022-10-29 15:10:10.938037551 +0200
|
||||
@@ -39,16 +39,16 @@
|
||||
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
|
||||
index 3defd33d0bb..33daacc4fc8 100644
|
||||
--- a/src/emu/emuopts.cpp
|
||||
+++ b/src/emu/emuopts.cpp
|
||||
@@ -39,16 +39,16 @@ const options_entry emu_options::s_option_entries[] =
|
||||
{ nullptr, nullptr, core_options::option_type::HEADER, "CORE SEARCH PATH OPTIONS" },
|
||||
{ OPTION_PLUGINDATAPATH, ".", core_options::option_type::STRING, "path to base folder for plugin data (read/write)" },
|
||||
{ OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::STRING, "path to ROM sets and hard disk images" },
|
||||
- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::STRING, "path to software definition files" },
|
||||
- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::STRING, "path to audio sample sets" },
|
||||
- { OPTION_ARTPATH, "artwork", core_options::option_type::STRING, "path to artwork files" },
|
||||
- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::STRING, "path to controller definitions" },
|
||||
- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::STRING, "path to ini files" },
|
||||
- { OPTION_FONTPATH, ".", core_options::option_type::STRING, "path to font files" },
|
||||
+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mamePath@/hash", core_options::option_type::STRING, "path to software definition files" },
|
||||
+ { OPTION_SAMPLEPATH ";sp", "samples;@mamePath@/samples", core_options::option_type::STRING, "path to audio sample sets" },
|
||||
+ { OPTION_ARTPATH, "artwork;@mamePath@/artwork", core_options::option_type::STRING, "path to artwork files" },
|
||||
+ { OPTION_CTRLRPATH, "ctrlr;@mamePath@/ctrlr", core_options::option_type::STRING, "path to controller definitions" },
|
||||
+ { OPTION_INIPATH, ".;ini;ini/presets;@mamePath@/ini/presets", core_options::option_type::STRING, "path to ini files" },
|
||||
+ { OPTION_FONTPATH, ".;@mamePath@", core_options::option_type::STRING, "path to font files" },
|
||||
{ OPTION_CHEATPATH, "cheat", core_options::option_type::STRING, "path to cheat files" },
|
||||
{ OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::STRING, "path to crosshair files" },
|
||||
- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::STRING, "path to plugin files" },
|
||||
- { OPTION_LANGUAGEPATH, "language", core_options::option_type::STRING, "path to UI translation files" },
|
||||
+ { OPTION_PLUGINSPATH, "plugins;@mamePath@/plugins", core_options::option_type::STRING, "path to plugin files" },
|
||||
+ { OPTION_LANGUAGEPATH, "language;@mamePath@/language", core_options::option_type::STRING, "path to UI translation files" },
|
||||
{ OPTION_SWPATH, "software", core_options::option_type::STRING, "path to loose software" },
|
||||
{ OPTION_PLUGINDATAPATH, ".", core_options::option_type::PATH, "path to base folder for plugin data (read/write)" },
|
||||
{ OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::MULTIPATH, "path to ROM sets and hard disk images" },
|
||||
- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::MULTIPATH, "path to software definition files" },
|
||||
- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::MULTIPATH, "path to audio sample sets" },
|
||||
- { OPTION_ARTPATH, "artwork", core_options::option_type::MULTIPATH, "path to artwork files" },
|
||||
- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::MULTIPATH, "path to controller definitions" },
|
||||
- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::MULTIPATH, "path to ini files" },
|
||||
- { OPTION_FONTPATH, ".", core_options::option_type::MULTIPATH, "path to font files" },
|
||||
+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mamePath@/hash", core_options::option_type::MULTIPATH, "path to software definition files" },
|
||||
+ { OPTION_SAMPLEPATH ";sp", "samples;@mamePath@/samples", core_options::option_type::MULTIPATH, "path to audio sample sets" },
|
||||
+ { OPTION_ARTPATH, "artwork;@mamePath@/artwork", core_options::option_type::MULTIPATH, "path to artwork files" },
|
||||
+ { OPTION_CTRLRPATH, "ctrlr;@mamePath@/ctrlr", core_options::option_type::MULTIPATH, "path to controller definitions" },
|
||||
+ { OPTION_INIPATH, ".;ini;ini/presets;@mamePath@/ini/presets", core_options::option_type::MULTIPATH, "path to ini files" },
|
||||
+ { OPTION_FONTPATH, ".;@mamePath@", core_options::option_type::MULTIPATH, "path to font files" },
|
||||
{ OPTION_CHEATPATH, "cheat", core_options::option_type::MULTIPATH, "path to cheat files" },
|
||||
{ OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::MULTIPATH, "path to crosshair files" },
|
||||
- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::MULTIPATH, "path to plugin files" },
|
||||
- { OPTION_LANGUAGEPATH, "language", core_options::option_type::MULTIPATH, "path to UI translation files" },
|
||||
+ { OPTION_PLUGINSPATH, "plugins;@mamePath@/plugins", core_options::option_type::MULTIPATH, "path to plugin files" },
|
||||
+ { OPTION_LANGUAGEPATH, "language;@mamePath@/language", core_options::option_type::MULTIPATH, "path to UI translation files" },
|
||||
{ OPTION_SWPATH, "software", core_options::option_type::MULTIPATH, "path to loose software" },
|
||||
|
||||
// output directory options
|
||||
@@ -1301,3 +1301,4 @@
|
||||
m_entry = entry;
|
||||
return entry;
|
||||
}
|
||||
+
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mame";
|
||||
version = "0.250";
|
||||
version = "0.251";
|
||||
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamedev";
|
||||
repo = "mame";
|
||||
rev = "mame${srcVersion}";
|
||||
sha256 = "sha256-jexs/1ovRk9Is5orD7hT9fN+dYm+WA+57aZ6JH7zjL4=";
|
||||
hash = "sha256-x+QV4gunnERBHyYB2fXJ2LvMv437Z2omvk+fYkmZfqA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "tools" ];
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mcomix";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-7zjQcT5WoHxy+YzCDJ6s2ngOOfO4L9exuqBqacecClg=";
|
||||
hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU=";
|
||||
};
|
||||
|
||||
buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ];
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.0/src -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.1/src -A '*.tar.xz' )
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "pgmodeler";
|
||||
version = "1.0.0-beta";
|
||||
version = "1.0.0-beta1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmodeler";
|
||||
repo = "pgmodeler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1+1hKOY8unu6Z7LLv/WQ86JlwWUubQuhPP9OUjyXOrM=";
|
||||
sha256 = "sha256-5ZIzxo2UvE+aKznF9ZLYFg5z3JkYCB+9rGdVDJl14Hw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armcord";
|
||||
version = "3.0.8";
|
||||
version = "3.1.4";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
|
|||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
|
||||
sha256 = "sha256-Lzkh1RDRoZSg5GNYlntROHdKLj12ogCqH+h8l5en9U0=";
|
||||
sha256 = "sha256-B/zDcW43ChhnAnGL+UEAt/QChxxEpv+yMgO7WsUi84k=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
|
||||
sha256 = "sha256-PuQ/zhuv+MA59Cx6QypAmg5Q6zVwfKg+1xKbazb3XM0=";
|
||||
sha256 = "sha256-cFmxs7HeF+jxtmZ827bQbRyuXhQx++x5iTIefZ55928=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
{ mkDerivation, lib, fetchurl, pkg-config, qttools, sconsPackages
|
||||
, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
|
||||
, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "swift-im";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
|
||||
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
|
||||
};
|
||||
|
||||
patches = [ ./qt-5.11.patch ./scons.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config qttools sconsPackages.scons_3_1_2 ];
|
||||
|
||||
buildInputs = [
|
||||
GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2
|
||||
lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ GConf ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${libxml2.dev}/include/libxml2"
|
||||
"-I${miniupnpc}/include/miniupnpc"
|
||||
"-I${qtwebkit.dev}/include/QtWebKit"
|
||||
"-I${qtwebkit.dev}/include/QtWebKitWidgets"
|
||||
"-fpermissive"
|
||||
];
|
||||
|
||||
installTargets = [ (placeholder "out") ];
|
||||
installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://swift.im/";
|
||||
description = "Qt XMPP client";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
|
||||
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#include <set>
|
||||
|
||||
+#include <QAbstractItemModel>
|
||||
#include <QWizard>
|
||||
|
||||
#include <Swiften/Base/Override.h>
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
|
||||
index 40f242513..53e1ff26a 100644
|
||||
--- a/BuildTools/SCons/SConscript.boot
|
||||
+++ b/BuildTools/SCons/SConscript.boot
|
||||
@@ -508,6 +508,7 @@ if env.get("distcc", False) :
|
||||
if var.startswith("DISTCC_") :
|
||||
env["ENV"][var] = os.environ[var]
|
||||
|
||||
+env["ENV"] = os.environ
|
||||
conf_env = env.Clone()
|
||||
|
||||
Export("env")
|
||||
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
|
||||
index 70bffbcfe..fef281899 100644
|
||||
--- a/BuildTools/SCons/SConstruct
|
||||
+++ b/BuildTools/SCons/SConstruct
|
||||
@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"]
|
||||
gconf_env = conf_env.Clone()
|
||||
conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
|
||||
if conf.CheckPKG("gconf-2.0") :
|
||||
- gconf_bare_env = Environment()
|
||||
+ gconf_bare_env = Environment(ENV = os.environ)
|
||||
gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
|
||||
if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) :
|
||||
gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]]
|
||||
@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags)
|
||||
env["HAVE_HUNSPELL"] = 0;
|
||||
if env.get("hunspell_enable", False) :
|
||||
hunspell_conf = Configure(hunspell_env)
|
||||
- if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") :
|
||||
+ if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") :
|
||||
env["HAVE_HUNSPELL"] = 1
|
||||
- hunspell_flags["LIBS"] = ["hunspell"]
|
||||
+ hunspell_flags["LIBS"] = ["hunspell-1.6"]
|
||||
env["HUNSPELL_FLAGS"] = hunspell_flags
|
||||
hunspell_conf.Finish()
|
||||
|
||||
diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
|
||||
index 89f8963dc..b8559f7a6 100644
|
||||
--- a/BuildTools/SCons/Tools/textfile.py
|
||||
+++ b/BuildTools/SCons/Tools/textfile.py
|
||||
@@ -113,7 +113,10 @@ def _action(target, source, env):
|
||||
lsep = None
|
||||
for s in source:
|
||||
if lsep: fd.write(lsep)
|
||||
- fd.write(_do_subst(s, subs))
|
||||
+ b = _do_subst(s, subs)
|
||||
+ if isinstance(b, unicode):
|
||||
+ b = b.encode('UTF-8')
|
||||
+ fd.write(b)
|
||||
lsep = linesep
|
||||
fd.close()
|
||||
|
||||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
let
|
||||
pname = "zulip";
|
||||
version = "5.9.3";
|
||||
version = "5.9.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
|
||||
hash = "sha256-Hws9vENGzCLQqav4uXtbbI0iNoS3JozC5m2DG38+3Fk=";
|
||||
hash = "sha256-gbusyhMgoaQmeWm6dB6pc3kSykD4T97VQcJgcF5KbzM=";
|
||||
name="${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "22.11.26";
|
||||
version = "23.01.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LdSHzIgXDixRI8xIwBrH7lqzUQbXdJXu5gFd9x8Ytzs=";
|
||||
sha256 = "sha256-Z+gs3CajVBYiWU5SSiL/C7IW8ibglUqD+GhayeS++m8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "22.11.26";
|
||||
version = "23.01.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-aHDO/Qi3NeF2dFElr6fn34yuuwMJ1fK63AoEjSUt81I=";
|
||||
sha256 = "sha256-8GUcfrnnWbJ+tJmc5zwOFfEFMOfeodYY4KyytAnaZEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.26.4/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.26.5/ -A '*.tar.xz' )
|
||||
|
|
|
|||
|
|
@ -4,467 +4,467 @@
|
|||
|
||||
{
|
||||
aura-browser = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/aura-browser-5.26.4.tar.xz";
|
||||
sha256 = "1gpv2vb0xkjshkg2xyyg3s731kx6268rc5c10gm927129il1p9fs";
|
||||
name = "aura-browser-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/aura-browser-5.26.5.tar.xz";
|
||||
sha256 = "0dhj058vh577jyhcjdp6x9dmh6apxk6yinknfci8l6vss9gchini";
|
||||
name = "aura-browser-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
bluedevil = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/bluedevil-5.26.4.tar.xz";
|
||||
sha256 = "1886nlxszraixsxyg7kn7qzqjwiwxnn6dgbrxw1797z1w4s6s7my";
|
||||
name = "bluedevil-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/bluedevil-5.26.5.tar.xz";
|
||||
sha256 = "069hsn40zbnpkd73zcnnkdjv7n30dqyls5yvg3m0ljphn1syi79y";
|
||||
name = "bluedevil-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/breeze-5.26.4.tar.xz";
|
||||
sha256 = "0sq0b2535d7d8p7ndi3i1k7ix3790mpkqmp1gcfs0a4jni43y2bc";
|
||||
name = "breeze-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/breeze-5.26.5.tar.xz";
|
||||
sha256 = "00zzb03jan14byh19mga3jrzwi3rl084cgpnk0wj3gwgf903p78y";
|
||||
name = "breeze-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-grub = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/breeze-grub-5.26.4.tar.xz";
|
||||
sha256 = "1dl98dwz5l2vljfj41kigngdpfgkrbs09hdmr7dqj8qx1vkfdrp8";
|
||||
name = "breeze-grub-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/breeze-grub-5.26.5.tar.xz";
|
||||
sha256 = "0ibjqv6hyqi4ljf5jhx5sv55li9jcvk5lydl0xrb54v8czbarg4w";
|
||||
name = "breeze-grub-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-gtk = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/breeze-gtk-5.26.4.tar.xz";
|
||||
sha256 = "0kc1dxpp5n1rkik1amkdbci6kivqzzlh9bb53ikixbj3rp2h8g31";
|
||||
name = "breeze-gtk-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/breeze-gtk-5.26.5.tar.xz";
|
||||
sha256 = "1k1kcrv6cbx9m0yxnqhdgwq0bd8qf8055acwjdphwjhl50icliqi";
|
||||
name = "breeze-gtk-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-plymouth = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/breeze-plymouth-5.26.4.tar.xz";
|
||||
sha256 = "0h96dcdqgdzqxcrzc4805l14p463ks5zjnvh3r1j73gs8cbrwsxd";
|
||||
name = "breeze-plymouth-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/breeze-plymouth-5.26.5.tar.xz";
|
||||
sha256 = "0skiii7ni6r6jp3a7nq10hd6qdria1481lml4l57ma9afgvpxi9v";
|
||||
name = "breeze-plymouth-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
discover = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/discover-5.26.4.tar.xz";
|
||||
sha256 = "1hl85770yq1bld0x085mqyznq5cjvr7csx9pj9q4783hrjhkvdwc";
|
||||
name = "discover-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/discover-5.26.5.tar.xz";
|
||||
sha256 = "19fd4f7nvqznfkrivxh77si627kqjnm1g17lidl9alz2iy2bxfm6";
|
||||
name = "discover-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
drkonqi = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/drkonqi-5.26.4.tar.xz";
|
||||
sha256 = "0p8k9q5mglw4sq2ybi7yy1brjn3p6kkl09smh1fwvpkifg64mv3d";
|
||||
name = "drkonqi-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/drkonqi-5.26.5.tar.xz";
|
||||
sha256 = "1syl78sl7wzjdb53glln6laa017cawgz0c39p33bdwq3kpzckw07";
|
||||
name = "drkonqi-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivitymanagerd = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kactivitymanagerd-5.26.4.tar.xz";
|
||||
sha256 = "1k15cf0l3cji5y0xkh0sx2xwpc7v77zsj25c3yxydxg03mgq01l4";
|
||||
name = "kactivitymanagerd-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kactivitymanagerd-5.26.5.tar.xz";
|
||||
sha256 = "0ypnnh3lpcfw8ggi6nc8sr4hcsamx6s3ax869b6rhh392avcw2ha";
|
||||
name = "kactivitymanagerd-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-cli-tools = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kde-cli-tools-5.26.4.tar.xz";
|
||||
sha256 = "0kyq3jm3mr8wdcjamswp6hqfh7g7kry28v344y0r9v052d8nvj8z";
|
||||
name = "kde-cli-tools-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kde-cli-tools-5.26.5.tar.xz";
|
||||
sha256 = "0djxqxdkih4svmggk6lk6p6n3sx3w4q9fsnx2dxfn5injwh0qrkr";
|
||||
name = "kde-cli-tools-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-gtk-config = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kde-gtk-config-5.26.4.tar.xz";
|
||||
sha256 = "057kfkblngafipar0qpzz5psmq2cq0d8y9vg0451i84kpignggsk";
|
||||
name = "kde-gtk-config-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kde-gtk-config-5.26.5.tar.xz";
|
||||
sha256 = "10r4kgpd04hh05yriga2r5awwdb8v93jsx0qksdgj3661xy00x7n";
|
||||
name = "kde-gtk-config-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kdecoration = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kdecoration-5.26.4.tar.xz";
|
||||
sha256 = "0p988y6qw1xiccfcimrdqivc1h1vnfaj3208j157h1kfg40kpz48";
|
||||
name = "kdecoration-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kdecoration-5.26.5.tar.xz";
|
||||
sha256 = "1dzpqzi25wxmilj92lqjmd6wid3nlkbvnnpcpp0ywd860q30zzd2";
|
||||
name = "kdecoration-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeplasma-addons = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kdeplasma-addons-5.26.4.tar.xz";
|
||||
sha256 = "183xxr55j3s8nr9cgpdm34d7jm4ijrj6jf3r1mvkih992iryk11r";
|
||||
name = "kdeplasma-addons-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kdeplasma-addons-5.26.5.tar.xz";
|
||||
sha256 = "17vrdnigif4v38gbh04p8qs7wqp3y3nqll1m7xc4qfqbq1dydyjq";
|
||||
name = "kdeplasma-addons-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kgamma5 = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kgamma5-5.26.4.tar.xz";
|
||||
sha256 = "0my9jbd6iw1k0jmg2b05k31mv6my1yzqg6ks9kysmsr28d3kgsll";
|
||||
name = "kgamma5-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kgamma5-5.26.5.tar.xz";
|
||||
sha256 = "0v4rpm2asv31w1rqrhn25kbcdl1acahg10lmh6iwisxl1i3x8hd8";
|
||||
name = "kgamma5-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
khotkeys = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/khotkeys-5.26.4.tar.xz";
|
||||
sha256 = "1kr0bwjghs3a1ibjbd6sh3jjlmy573y4jhld88wdyi69smq28lzh";
|
||||
name = "khotkeys-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/khotkeys-5.26.5.tar.xz";
|
||||
sha256 = "0lkmh5n76kmrdxm4snkk1zz7d927qkl69ajd5qhz277whpz3slw8";
|
||||
name = "khotkeys-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kinfocenter = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kinfocenter-5.26.4.tar.xz";
|
||||
sha256 = "0hq5mzxlz3711k14bd5y99mcdipvy25himbzxqm09b5wpn0yihcr";
|
||||
name = "kinfocenter-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kinfocenter-5.26.5.tar.xz";
|
||||
sha256 = "0rka2fm7r2zikv3lcd1q39swgcp6fs5l4f5ldpgwpk9bps96cy4x";
|
||||
name = "kinfocenter-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kmenuedit = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kmenuedit-5.26.4.tar.xz";
|
||||
sha256 = "1869i7bv40di5axlr5xwmv3xnaja1r84h1f9xh8rqmhz1kv2d2y8";
|
||||
name = "kmenuedit-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kmenuedit-5.26.5.tar.xz";
|
||||
sha256 = "17iyk77mb1lp9xjl92ffvv111b4m2qq98xznd1qafnah7ix1cg7p";
|
||||
name = "kmenuedit-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kpipewire = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kpipewire-5.26.4.tar.xz";
|
||||
sha256 = "0d7nlmq5h0kd0lrkv4lc673prchyips2j3jc6igbxyk3v1blw9s6";
|
||||
name = "kpipewire-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kpipewire-5.26.5.tar.xz";
|
||||
sha256 = "1yqymwq48mqv9zfw3idb0abizrfhr7f4d37ys9w7a9jixcm7rdrv";
|
||||
name = "kpipewire-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreen = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kscreen-5.26.4.tar.xz";
|
||||
sha256 = "1766yqbvm021i4g6fyrm9a2cxdkb6q3pr7igvj7bb8ga3y44ip6p";
|
||||
name = "kscreen-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kscreen-5.26.5.tar.xz";
|
||||
sha256 = "0w8yrzpgr23s7sr3296lrm2zbm2j2174zv5az41i44l907iq9y1x";
|
||||
name = "kscreen-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreenlocker = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kscreenlocker-5.26.4.tar.xz";
|
||||
sha256 = "0mz8av4pccnpd7pj3l30isi31s8nram7ymn4hacsmwgzhmqfn9m1";
|
||||
name = "kscreenlocker-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kscreenlocker-5.26.5.tar.xz";
|
||||
sha256 = "0lwn3xbbk1578974m3nkk2x5h9fadrcizvh4q4528s5wgxja6w2g";
|
||||
name = "kscreenlocker-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
ksshaskpass = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/ksshaskpass-5.26.4.tar.xz";
|
||||
sha256 = "05rdqkr6iyfyxgb5dxwsbhb91ni9fp7ysm73wgj4f40azkk9j91i";
|
||||
name = "ksshaskpass-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/ksshaskpass-5.26.5.tar.xz";
|
||||
sha256 = "0k0jxbkav115i5nhazxyz3s3wg6gyfcsa1jilf3j3fr8vnh8qhx0";
|
||||
name = "ksshaskpass-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
ksystemstats = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/ksystemstats-5.26.4.tar.xz";
|
||||
sha256 = "0amzb79kba310myc18g6gdfakmzqmlzvmd3c42yz71vjfpywibr3";
|
||||
name = "ksystemstats-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/ksystemstats-5.26.5.tar.xz";
|
||||
sha256 = "18sa2w6vgbqmw8wrg5vqbraql04x9kb7mj9k35z4zs2n4abfrrbi";
|
||||
name = "ksystemstats-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet-pam = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kwallet-pam-5.26.4.tar.xz";
|
||||
sha256 = "0z661sa0bwd30c3jfq0n00jfrhb1mxm7107w23r2hyrdi4i8dsjb";
|
||||
name = "kwallet-pam-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kwallet-pam-5.26.5.tar.xz";
|
||||
sha256 = "1c5pzih8id0gld7qdf8ffxsbfgq9bsvpx37qyzr941b3vif7f9yx";
|
||||
name = "kwallet-pam-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland-integration = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kwayland-integration-5.26.4.tar.xz";
|
||||
sha256 = "10p9i7vihigdj63m48lk6c9f56jz1y5sar5lqnr5f9ai7s6na6gh";
|
||||
name = "kwayland-integration-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kwayland-integration-5.26.5.tar.xz";
|
||||
sha256 = "0czq16lq210hq7a3wqg7pvdr9a8vm16z6yb82p0w6yqv15kk7alx";
|
||||
name = "kwayland-integration-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kwin = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kwin-5.26.4.tar.xz";
|
||||
sha256 = "1f80sfzaphcdq0dg1k8wyl6gnxap98yhiwcgski6x4gy0rhdnl16";
|
||||
name = "kwin-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kwin-5.26.5.tar.xz";
|
||||
sha256 = "1n0v0553s9l8s6wgdz5bhrnvww20q49h92v3m4w216razj7q3q0k";
|
||||
name = "kwin-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kwrited = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/kwrited-5.26.4.tar.xz";
|
||||
sha256 = "1w1yr8adpwx4m118x0w5890yph0n4gi0wdf99d5vhjd8yjcrb1s2";
|
||||
name = "kwrited-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/kwrited-5.26.5.tar.xz";
|
||||
sha256 = "14savlbywkx5107s0viprafs9pl389zhjk32iy4x5jmf9dk6vmm9";
|
||||
name = "kwrited-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
layer-shell-qt = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/layer-shell-qt-5.26.4.tar.xz";
|
||||
sha256 = "1hb0fbj9lf3vdfq31y9b6cy4qpzmv30cf1jbvy55rgyhqnk8il7b";
|
||||
name = "layer-shell-qt-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/layer-shell-qt-5.26.5.tar.xz";
|
||||
sha256 = "1k79dcyic2hkm92sd7aix03ywagr4rgsdf86a9zy06kafg92jra9";
|
||||
name = "layer-shell-qt-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
libkscreen = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/libkscreen-5.26.4.tar.xz";
|
||||
sha256 = "1w3qhg3q2g6b0dngcq5cm1jghbkqpcyzn9yicrhcllmcp3v540mv";
|
||||
name = "libkscreen-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/libkscreen-5.26.5.tar.xz";
|
||||
sha256 = "0vajgzjvpn909ds88jddsg7bman0rdphrm70b0k5ar7bcw0x54d5";
|
||||
name = "libkscreen-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
libksysguard = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/libksysguard-5.26.4.tar.xz";
|
||||
sha256 = "1s5mhnq4vinc2znw2fw45ydljwzy55shjf083s4lnvmj7smlp5gb";
|
||||
name = "libksysguard-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/libksysguard-5.26.5.tar.xz";
|
||||
sha256 = "01a1wm6z191lzjqd5iws90jd3ld3r6r1qaw95bl65l9ar8p3gr8p";
|
||||
name = "libksysguard-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
milou = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/milou-5.26.4.tar.xz";
|
||||
sha256 = "0scx0207jf11w1j8ja7sxfxnkjm5j3g23ip28gmf2q01py05rg00";
|
||||
name = "milou-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/milou-5.26.5.tar.xz";
|
||||
sha256 = "1pmz4n41ysb0mhgykvc65r5as8fkd7wr4k57sk0a12wzsndy7zv8";
|
||||
name = "milou-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/oxygen-5.26.4.tar.xz";
|
||||
sha256 = "1lj34gccgjqf327732wd5dlk4chpxpdl5w8ci86zd2js42d4gyhk";
|
||||
name = "oxygen-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/oxygen-5.26.5.tar.xz";
|
||||
sha256 = "0wllhniaqpzvzji51a9871j1697kjwbz4xj8q9x1w89ip88pb6gq";
|
||||
name = "oxygen-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-sounds = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/oxygen-sounds-5.26.4.tar.xz";
|
||||
sha256 = "0c2w5y77jrzmxkd8bv8b95y67i0kjm4kc84wla574s57lcjwyn12";
|
||||
name = "oxygen-sounds-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/oxygen-sounds-5.26.5.tar.xz";
|
||||
sha256 = "1ws6bssn2r2m666kd6i0xnmzxb8x3z2pa6qk36xpbs1xjxdv5wny";
|
||||
name = "oxygen-sounds-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plank-player = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plank-player-5.26.4.tar.xz";
|
||||
sha256 = "0b2ss5fj85gf0gnw0xpwrkib1r68nmkvzakk3qgbc9dmgjfbi3wp";
|
||||
name = "plank-player-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plank-player-5.26.5.tar.xz";
|
||||
sha256 = "18yw74mqcd0igps10m1sd41rlir2y8y78xkljxj5w2y4yvh97vbs";
|
||||
name = "plank-player-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-bigscreen = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-bigscreen-5.26.4.tar.xz";
|
||||
sha256 = "0kfnh7cy6v8qczvz4z6isy3bx3zrlkz32hwyy3idinpgqih6cm5s";
|
||||
name = "plasma-bigscreen-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-bigscreen-5.26.5.tar.xz";
|
||||
sha256 = "0893ngwdgq1l76gib4p9212lwp4i2gxvpnmxygndbmkz7nhjax75";
|
||||
name = "plasma-bigscreen-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-browser-integration = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-browser-integration-5.26.4.tar.xz";
|
||||
sha256 = "0fcz8snq3i4q9bpyd9nw7a1n50bh1sw3qp1sgyz0vp13rcic7fph";
|
||||
name = "plasma-browser-integration-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-browser-integration-5.26.5.tar.xz";
|
||||
sha256 = "1bfzha5vd8hjij758b0g6ibyi4f8gmijz92fgn5is0p1hydm8y4l";
|
||||
name = "plasma-browser-integration-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-desktop = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-desktop-5.26.4.tar.xz";
|
||||
sha256 = "1llk8bjihjny52f5q9qanp5if3az3mz9slxbrn7882c0xghhr6ba";
|
||||
name = "plasma-desktop-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-desktop-5.26.5.tar.xz";
|
||||
sha256 = "15kc5sam3y2c1ccp14cs7v5zakgzz9gpxpyxapimlvkwscxmvzn6";
|
||||
name = "plasma-desktop-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-disks = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-disks-5.26.4.tar.xz";
|
||||
sha256 = "1mgmqvlwy7nml51l9siw900lg4j85a2djjjcr7bw3mbqnxny5wgj";
|
||||
name = "plasma-disks-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-disks-5.26.5.tar.xz";
|
||||
sha256 = "137k44lly2qv6vrmfi4g2xqc7y907ywwshp7mn07qmbps3a85h30";
|
||||
name = "plasma-disks-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-firewall = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-firewall-5.26.4.tar.xz";
|
||||
sha256 = "1iz45gq322r1kb1hps51mjid2k1wqk4amxbv5xlcdlfdwqr7agc1";
|
||||
name = "plasma-firewall-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-firewall-5.26.5.tar.xz";
|
||||
sha256 = "18fp7iqnyjx2p44n8hjs7fss212ja3k2i5cryrnmwpf7r0q73l36";
|
||||
name = "plasma-firewall-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-integration = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-integration-5.26.4.tar.xz";
|
||||
sha256 = "0gdzkxscll22s2jj3q4wlz18zb3bm5xsxvikss5phdyw4ppc2qsy";
|
||||
name = "plasma-integration-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-integration-5.26.5.tar.xz";
|
||||
sha256 = "0ap7rzhqmm7ai9sc6w281f2kf81qgs2h2qpf5bvbc6wm3vn1lm1g";
|
||||
name = "plasma-integration-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-mobile = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-mobile-5.26.4.tar.xz";
|
||||
sha256 = "15q6v8vnn45y84jnrkarr3v9x9hng2slxdp5nr1xsa80pvb1j23x";
|
||||
name = "plasma-mobile-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-mobile-5.26.5.tar.xz";
|
||||
sha256 = "06gha8mga9xqmmvzc9why9pfzzpy8czrqym3k3n23pa9hy2qqsvj";
|
||||
name = "plasma-mobile-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nano = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-nano-5.26.4.tar.xz";
|
||||
sha256 = "15jxj90mg3jkx1jmf1dadss3nd9rvjqqr0vvfm5yyf0m45sb11xs";
|
||||
name = "plasma-nano-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-nano-5.26.5.tar.xz";
|
||||
sha256 = "161sabckgl8gjxxsm0aklp33bf05iq2p84vh2v5y6bfpimsnamnj";
|
||||
name = "plasma-nano-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nm = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-nm-5.26.4.tar.xz";
|
||||
sha256 = "1x1xcf33jfl01cf1pmz3mbzyzbmchk780wwlij9wva9pbnxg97hy";
|
||||
name = "plasma-nm-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-nm-5.26.5.tar.xz";
|
||||
sha256 = "1msi9lhkhpb29h6fwkxqmp9js70r8vrvzzf38hzkgxcbf3757k64";
|
||||
name = "plasma-nm-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-pa = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-pa-5.26.4.tar.xz";
|
||||
sha256 = "0h0rbgcnh16m31wnfklmy2gks4njxy3rlx1kpn6a2q1zzgs3ri3a";
|
||||
name = "plasma-pa-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-pa-5.26.5.tar.xz";
|
||||
sha256 = "19i9ipajiz68silvprap9pykki6rhb7d2ways501bx8g4vfcb0h5";
|
||||
name = "plasma-pa-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-remotecontrollers = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-remotecontrollers-5.26.4.tar.xz";
|
||||
sha256 = "1pkcwx1br4flga1xlj807aapq274522f2jcl96hlaz1i5w9c4ids";
|
||||
name = "plasma-remotecontrollers-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-remotecontrollers-5.26.5.tar.xz";
|
||||
sha256 = "1cam1jchp3nwqkqskln4qbpb4rixzwa0bwma89ysdgqy0pzpq2x0";
|
||||
name = "plasma-remotecontrollers-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-sdk = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-sdk-5.26.4.tar.xz";
|
||||
sha256 = "1pm8j2nz3a6icj1pm2lxidldyza4v3j5pq3xaf1pjs9n3vd8j8b5";
|
||||
name = "plasma-sdk-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-sdk-5.26.5.tar.xz";
|
||||
sha256 = "0p20s2cp5vd1chj28wq88ixb625hisl134hnlllz6h70s5vzy79n";
|
||||
name = "plasma-sdk-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-systemmonitor = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-systemmonitor-5.26.4.tar.xz";
|
||||
sha256 = "1harn31ia6fsa6wq13mpxxnnw4w98vmspaqmss1a7187hafislf9";
|
||||
name = "plasma-systemmonitor-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-systemmonitor-5.26.5.tar.xz";
|
||||
sha256 = "0xghszlm8h70p192qizv2kj7f02fnf3p3hg1p10ni7sqfaczrbq1";
|
||||
name = "plasma-systemmonitor-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-tests = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-tests-5.26.4.tar.xz";
|
||||
sha256 = "0h6kk0h64v34vxwa5z466fz2a90sni2sn08rjcpavbhq3rrz16pb";
|
||||
name = "plasma-tests-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-tests-5.26.5.tar.xz";
|
||||
sha256 = "1h0cinrgjdp7rhl3v55c40a5agd93rqwx1xjqyj06vkjkbigx0fr";
|
||||
name = "plasma-tests-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-thunderbolt = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-thunderbolt-5.26.4.tar.xz";
|
||||
sha256 = "1g2ppkcp10yrvsy8hd9ylfvbajbj8ixv1y31810qbf8svbg6ihdv";
|
||||
name = "plasma-thunderbolt-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-thunderbolt-5.26.5.tar.xz";
|
||||
sha256 = "1lzj3m2k34m3fvcq3ykr5igaq0sbc4v87cncxvz6ln0p7cq0i6y5";
|
||||
name = "plasma-thunderbolt-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-vault = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-vault-5.26.4.tar.xz";
|
||||
sha256 = "14nf0il3mg23dsbxifnzxxs5lks7zmifnvrny240nvnfwmh58hz4";
|
||||
name = "plasma-vault-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-vault-5.26.5.tar.xz";
|
||||
sha256 = "104cs6prb8v5mccshz5brknfllyfbfnjzzpdrgk1xpzh5apwmhja";
|
||||
name = "plasma-vault-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace = {
|
||||
version = "5.26.4.1";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-workspace-5.26.4.1.tar.xz";
|
||||
sha256 = "7fcca23ff8de6f4aa2261f0180be54422f25047002b7ca6c648e7216459b80fc";
|
||||
name = "plasma-workspace-5.26.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-workspace-5.26.5.tar.xz";
|
||||
sha256 = "082jnlqgbp48bmyp1nbzg2d0p0pxkvra6xjv40kvh6k6rmpr5cjc";
|
||||
name = "plasma-workspace-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace-wallpapers = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plasma-workspace-wallpapers-5.26.4.tar.xz";
|
||||
sha256 = "1plw7hxcyl68gwcf2vh650lady4syz75sbhmj97a60nw2fwlxyvv";
|
||||
name = "plasma-workspace-wallpapers-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plasma-workspace-wallpapers-5.26.5.tar.xz";
|
||||
sha256 = "07gln5jl947qfpvrgiqa1fnw8lnnf4jg734ayybi927j059s3g8i";
|
||||
name = "plasma-workspace-wallpapers-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plymouth-kcm = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/plymouth-kcm-5.26.4.tar.xz";
|
||||
sha256 = "0kqv4kwsw7j7f1jf0nqr65rgzwd1ps5ax37m9ama1vrcvd87fsma";
|
||||
name = "plymouth-kcm-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/plymouth-kcm-5.26.5.tar.xz";
|
||||
sha256 = "1isxs6gxbab2ddl22c3992gmdgy3mi5yjb9inv32ajzs6r7snrj1";
|
||||
name = "plymouth-kcm-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
polkit-kde-agent = {
|
||||
version = "1-5.26.4";
|
||||
version = "1-5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/polkit-kde-agent-1-5.26.4.tar.xz";
|
||||
sha256 = "1v07l94jnlcyslq0asy8p3g0wd459rbh1f68icn9r1kcfw8cc1as";
|
||||
name = "polkit-kde-agent-1-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/polkit-kde-agent-1-5.26.5.tar.xz";
|
||||
sha256 = "19jrjx40m8g6hwq5k7ibbm0fmb803hxync2022gqbwzfrdb4493i";
|
||||
name = "polkit-kde-agent-1-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
powerdevil = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/powerdevil-5.26.4.tar.xz";
|
||||
sha256 = "1samnxv1qiqna2zgzl3pm3bf7br86nrpyvgbcvlsiv03aqbq77x3";
|
||||
name = "powerdevil-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/powerdevil-5.26.5.tar.xz";
|
||||
sha256 = "063bqwdnpskcwqzpgcmjwgs9vpkn1gnq2nnzj2sdzrlflfrdsfvp";
|
||||
name = "powerdevil-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
qqc2-breeze-style = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/qqc2-breeze-style-5.26.4.tar.xz";
|
||||
sha256 = "1q3vmp5g1qmmry5i4gbsfnqwc9287hf8jkmipk6ka5cf6pn0z0qa";
|
||||
name = "qqc2-breeze-style-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/qqc2-breeze-style-5.26.5.tar.xz";
|
||||
sha256 = "1lhv4jlg15w8a88czq0fazaizjwva3yv8wv3scdnhhyfnbkch9mr";
|
||||
name = "qqc2-breeze-style-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
sddm-kcm = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/sddm-kcm-5.26.4.tar.xz";
|
||||
sha256 = "1sqlwxhff538m6nsglxxkhnmngvfjhavmh6lqapvfsyzkyxxd8fb";
|
||||
name = "sddm-kcm-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/sddm-kcm-5.26.5.tar.xz";
|
||||
sha256 = "0cglb7dvwrkdpl5bgg91yfxrvqfpc2szj3qipcmd6ladsvbz8cxv";
|
||||
name = "sddm-kcm-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
systemsettings = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/systemsettings-5.26.4.tar.xz";
|
||||
sha256 = "1wl0krqq1865pndvlxs031ki123c3idnmhxrqffrwvk3d74lrn0m";
|
||||
name = "systemsettings-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/systemsettings-5.26.5.tar.xz";
|
||||
sha256 = "1jb1d6933gq07vgg3kzqna91cpcv87p38wrk70g17iz7pszjb3ns";
|
||||
name = "systemsettings-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
xdg-desktop-portal-kde = {
|
||||
version = "5.26.4";
|
||||
version = "5.26.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.26.4/xdg-desktop-portal-kde-5.26.4.tar.xz";
|
||||
sha256 = "173z3i0jkm157imw4m25ip0gac325d25gjswc82dza3x2mmisdk3";
|
||||
name = "xdg-desktop-portal-kde-5.26.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.26.5/xdg-desktop-portal-kde-5.26.5.tar.xz";
|
||||
sha256 = "1hznyl90d3xswnjs4qc6r5azw1z3pzkr7z507v696xhv41j8bzsj";
|
||||
name = "xdg-desktop-portal-kde-5.26.5.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,17 @@
|
|||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, splicePackages
|
||||
, newScope
|
||||
, pkgsBuildBuild
|
||||
, pkgsBuildHost
|
||||
, pkgsBuildTarget
|
||||
, pkgsHostHost
|
||||
, pkgsTargetTarget
|
||||
, generateSplicesForMkScope
|
||||
, makeScopeWithSplicing
|
||||
}:
|
||||
|
||||
let
|
||||
otherSplices = {
|
||||
selfBuildBuild = pkgsBuildBuild.xfce;
|
||||
selfBuildHost = pkgsBuildHost.xfce;
|
||||
selfBuildTarget = pkgsBuildTarget.xfce;
|
||||
selfHostHost = pkgsHostHost.xfce;
|
||||
selfTargetTarget = pkgsTargetTarget.xfce or { };
|
||||
};
|
||||
keep = _self: { };
|
||||
extra = _spliced0: { };
|
||||
|
||||
in
|
||||
lib.makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
otherSplices
|
||||
makeScopeWithSplicing
|
||||
(generateSplicesForMkScope "xfce")
|
||||
keep
|
||||
extra
|
||||
(self:
|
||||
|
|
|
|||
|
|
@ -319,6 +319,8 @@ let
|
|||
homepage = "https://www.graalvm.org/";
|
||||
description = "High-Performance Polyglot VM";
|
||||
license = with licenses; [ upl gpl2Classpath bsd3 ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "java";
|
||||
maintainers = with maintainers; [
|
||||
bandresen
|
||||
hlolli
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
# - imports lua-packages.nix
|
||||
# - adds spliced package sets to the package set
|
||||
# - applies overrides from `packageOverrides`
|
||||
({ lua, overrides, callPackage, splicePackages, newScope }: let
|
||||
({ lua, overrides, callPackage, makeScopeWithSplicing }: let
|
||||
luaPackagesFun = callPackage ../../../top-level/lua-packages.nix {
|
||||
lua = self;
|
||||
};
|
||||
|
|
@ -46,9 +46,7 @@ let
|
|||
overriddenPackages
|
||||
overrides
|
||||
];
|
||||
in lib.makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
in makeScopeWithSplicing
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@
|
|||
, db
|
||||
, lib
|
||||
, libffiBoot
|
||||
, newScope
|
||||
, makeScopeWithSplicing
|
||||
, pythonPackagesExtensions
|
||||
, splicePackages
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
|
|
@ -71,9 +70,7 @@
|
|||
overrides
|
||||
]);
|
||||
aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
|
||||
in lib.makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
in makeScopeWithSplicing
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, cmake, pcre, zlib, python2, openssl }:
|
||||
{ lib, stdenv, fetchurl, cmake, pcre, zlib, python3, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cppcms";
|
||||
version = "1.2.1";
|
||||
version = "2.0.0.beta2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh";
|
||||
url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ pcre zlib python2 openssl ];
|
||||
buildInputs = [ pcre zlib python3 openssl ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
@ -21,9 +21,8 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "http://cppcms.com";
|
||||
description = "High Performance C++ Web Framework";
|
||||
platforms = platforms.linux ;
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.juliendehos ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,12 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $bin/bin; mv $out/bin $bin/
|
||||
moveToOutput bin "$bin"
|
||||
moveToOutput cmake "$dev"
|
||||
moveToOutput OpenColorIOConfig.cmake "$dev"
|
||||
|
||||
substituteInPlace "$dev/cmake/OpenColorIO-release.cmake" \
|
||||
--replace "$out/bin" "$bin/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
26
pkgs/development/ocaml-modules/brr/default.nix
Normal file
26
pkgs/development/ocaml-modules/brr/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, lib, fetchurl
|
||||
, ocaml, findlib, ocamlbuild, topkg
|
||||
, js_of_ocaml-compiler
|
||||
, js_of_ocaml-toplevel
|
||||
, note
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-brr";
|
||||
version = "0.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz";
|
||||
hash = "sha256-v+Ik1tdRBVnNDqhmNoJuLelL3k5OhxIsUorGdTb9sbw=";
|
||||
};
|
||||
buildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel note ];
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = {
|
||||
homepage = "https://erratique.ch/software/brr";
|
||||
description = "A toolkit for programming browsers in OCaml";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
23
pkgs/development/ocaml-modules/note/default.nix
Normal file
23
pkgs/development/ocaml-modules/note/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
|
||||
|
||||
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
|
||||
"note is not available for OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-note";
|
||||
version = "0.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/note/releases/note-${version}.tbz";
|
||||
hash = "sha256-b35XcaDUXQLqwkNfsJKX5A1q1pAhw/mgdwyOdacZiiY=";
|
||||
};
|
||||
buildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = {
|
||||
homepage = "http://erratique.ch/software/note";
|
||||
description = "An OCaml module for functional reactive programming";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "13.0.2";
|
||||
version = "13.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-z1QFAKvkJuOH2utYertORca5PpW43VS3YB2mhjBsh+A=";
|
||||
hash = "sha256-gDz0eylyUae8fB+ssMZk8Mot/K9RlIIzn+B0LNdMmPs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ buildRubyGem rec {
|
|||
inherit ruby;
|
||||
name = "${gemName}-${version}";
|
||||
gemName = "bundler";
|
||||
version = "2.4.2";
|
||||
source.sha256 = "sha256-mYUOxAWH7hv7Kn521OVI8PyzoO3T6LGPJjAxA07buR8=";
|
||||
version = "2.4.3";
|
||||
source.sha256 = "sha256-AfX4PydFNdghhYk3cApKLxtTw8L8sLEvU3Y49nKHxwA=";
|
||||
dontPatchShebangs = true;
|
||||
|
||||
passthru.updateScript = writeScript "gem-update-script" ''
|
||||
|
|
|
|||
|
|
@ -3,16 +3,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leiningen";
|
||||
version = "2.9.10";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
|
||||
sha256 = "0ckzivinbgg6gw1nss544hy160yixvd3k6pqyyxqanyzsq9lvf6v";
|
||||
url = "https://codeberg.org/leiningen/leiningen/raw/tag/${version}/bin/lein-pkg";
|
||||
hash = "sha256-sXV86UHky/Fcv2Sbe09BM2XmEtqJLSKEHsFyg5G7Zq8=";
|
||||
};
|
||||
|
||||
# Check https://codeberg.org/leiningen/leiningen/releases to get the URL for the new version
|
||||
jarsrc = fetchurl {
|
||||
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "1ja9q8lav83h5qhayjgc39f6yyvk1n5f6gfwznn561xm007m6a52";
|
||||
url = "https://codeberg.org/attachments/43cebda5-a7c2-405b-b641-5143a00051b5";
|
||||
hash = "sha256-0nKZutNAdawoZNC9BVn4NcbixHbAsKKDvL21dP2tuzQ=";
|
||||
};
|
||||
|
||||
JARNAME = "${pname}-${version}-standalone.jar";
|
||||
|
|
@ -26,12 +27,18 @@ stdenv.mkDerivation rec {
|
|||
# never be picked up by set-java-classpath.sh
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share
|
||||
cp -v $src $out/bin/lein
|
||||
cp -v $jarsrc $out/share/$JARNAME
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
|
||||
chmod +x $out/bin/lein
|
||||
patchShebangs $out/bin/lein
|
||||
substituteInPlace $out/bin/lein \
|
||||
|
|
@ -40,6 +47,8 @@ stdenv.mkDerivation rec {
|
|||
--prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \
|
||||
--set LEIN_GPG ${gnupg}/bin/gpg \
|
||||
--set JAVA_CMD ${jdk}/bin/java
|
||||
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
@ -47,8 +56,8 @@ stdenv.mkDerivation rec {
|
|||
description = "Project automation for Clojure";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.epl10;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ thiagokokada ];
|
||||
platforms = jdk.meta.platforms;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "lein";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,14 +5,10 @@ let
|
|||
python = python3;
|
||||
};
|
||||
in {
|
||||
scons_3_0_1 = (mkScons {
|
||||
version = "3.0.1";
|
||||
sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
|
||||
}).override { python = python2; };
|
||||
scons_3_1_2 = (mkScons {
|
||||
version = "3.1.2";
|
||||
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
|
||||
}).override { python = python2; };
|
||||
});
|
||||
scons_latest = mkScons {
|
||||
version = "4.1.0";
|
||||
sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ with lib;
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "butane";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "butane";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PjuQ5eEW/CdghkVHozxrG9WPNKJZwUcf7/ZRIcUAtJY=";
|
||||
sha256 = "sha256-tLUC/1yD3vgId98UWiZOlud38uO+CUzp0uuYKkAXJEs=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
12
pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix
Normal file
12
pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{ lib, buildDunePackage, js_of_ocaml-compiler, ppxlib }:
|
||||
|
||||
buildDunePackage {
|
||||
duneVersion = "3";
|
||||
pname = "js_of_ocaml-toplevel";
|
||||
inherit (js_of_ocaml-compiler) src version;
|
||||
buildInputs = [ ppxlib ];
|
||||
propagatedBuildInputs = [ js_of_ocaml-compiler ];
|
||||
meta = js_of_ocaml-compiler.meta // {
|
||||
mainProgram = "jsoo_mktop";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, newScope, splicePackages, steamPackagesAttr ? "steamPackages"
|
||||
, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget
|
||||
{ makeScopeWithSplicing, generateSplicesForMkScope
|
||||
, stdenv, buildFHSUserEnv, pkgsi686Linux
|
||||
}:
|
||||
|
||||
|
|
@ -18,19 +17,12 @@ let
|
|||
glxinfo-i686 = pkgsi686Linux.glxinfo;
|
||||
steam-runtime-wrapped-i686 =
|
||||
if self.steamArch == "amd64"
|
||||
then pkgsi686Linux.${steamPackagesAttr}.steam-runtime-wrapped
|
||||
then pkgsi686Linux.steamPackages.steam-runtime-wrapped
|
||||
else null;
|
||||
inherit buildFHSUserEnv;
|
||||
};
|
||||
steamcmd = callPackage ./steamcmd.nix { };
|
||||
};
|
||||
otherSplices = {
|
||||
selfBuildBuild = pkgsBuildBuild.${steamPackagesAttr};
|
||||
selfBuildHost = pkgsBuildHost.${steamPackagesAttr};
|
||||
selfBuildTarget = pkgsBuildTarget.${steamPackagesAttr};
|
||||
selfHostHost = pkgsHostHost.${steamPackagesAttr};
|
||||
selfTargetTarget = pkgsTargetTarget.${steamPackagesAttr} or {}; # might be missing;
|
||||
};
|
||||
keep = self: { };
|
||||
extra = spliced0: { };
|
||||
in lib.makeScopeWithSplicing splicePackages newScope otherSplices keep extra steamPackagesFun
|
||||
in makeScopeWithSplicing (generateSplicesForMkScope "steamPackages") keep extra steamPackagesFun
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, stdenvNoCC
|
||||
, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget
|
||||
, buildPackages, splicePackages, newScope
|
||||
, makeScopeWithSplicing, generateSplicesForMkScope
|
||||
, buildPackages
|
||||
, bsdSetupHook, makeSetupHook
|
||||
, fetchgit, fetchurl, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell
|
||||
, zlib, expat, libmd
|
||||
|
|
@ -24,14 +24,6 @@ let
|
|||
name = "freebsd-setup-hook";
|
||||
} ./setup-hook.sh;
|
||||
|
||||
otherSplices = {
|
||||
selfBuildBuild = pkgsBuildBuild.freebsd;
|
||||
selfBuildHost = pkgsBuildHost.freebsd;
|
||||
selfBuildTarget = pkgsBuildTarget.freebsd;
|
||||
selfHostHost = pkgsHostHost.freebsd;
|
||||
selfTargetTarget = pkgsTargetTarget.freebsd or {}; # might be missing
|
||||
};
|
||||
|
||||
mkBsdArch = stdenv': {
|
||||
x86_64 = "amd64";
|
||||
aarch64 = "arm64";
|
||||
|
|
@ -74,10 +66,8 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
in lib.makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
otherSplices
|
||||
in makeScopeWithSplicing
|
||||
(generateSplicesForMkScope "freebsd")
|
||||
(_: {})
|
||||
(_: {})
|
||||
(self: let
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, stdenvNoCC
|
||||
, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget
|
||||
, buildPackages, splicePackages, newScope
|
||||
, makeScopeWithSplicing, generateSplicesForMkScope
|
||||
, buildPackages
|
||||
, bsdSetupHook, makeSetupHook, fetchcvs, groff, mandoc, byacc, flex
|
||||
, zlib
|
||||
, writeShellScript, writeText, runtimeShell, symlinkJoin
|
||||
|
|
@ -20,24 +20,14 @@ let
|
|||
name = "netbsd-setup-hook";
|
||||
} ./setup-hook.sh;
|
||||
|
||||
otherSplices = {
|
||||
selfBuildBuild = pkgsBuildBuild.netbsd;
|
||||
selfBuildHost = pkgsBuildHost.netbsd;
|
||||
selfBuildTarget = pkgsBuildTarget.netbsd;
|
||||
selfHostHost = pkgsHostHost.netbsd;
|
||||
selfTargetTarget = pkgsTargetTarget.netbsd or {}; # might be missing
|
||||
};
|
||||
|
||||
defaultMakeFlags = [
|
||||
"MKSOFTFLOAT=${if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"
|
||||
then "yes"
|
||||
else "no"}"
|
||||
];
|
||||
|
||||
in lib.makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
otherSplices
|
||||
in makeScopeWithSplicing
|
||||
(generateSplicesForMkScope "netbsd")
|
||||
(_: {})
|
||||
(_: {})
|
||||
(self: let
|
||||
|
|
@ -46,7 +36,7 @@ in lib.makeScopeWithSplicing
|
|||
|
||||
# Why do we have splicing and yet do `nativeBuildInputs = with self; ...`?
|
||||
#
|
||||
# We use `lib.makeScopeWithSplicing` because this should be used for all
|
||||
# We use `makeScopeWithSplicing` because this should be used for all
|
||||
# nested package sets which support cross, so the inner `callPackage` works
|
||||
# correctly. But for the inline packages we don't bother to use
|
||||
# `callPackage`.
|
||||
|
|
|
|||
|
|
@ -41,13 +41,12 @@ let
|
|||
pymongo
|
||||
]);
|
||||
|
||||
# 4.2 < mongodb <= 6.0.x needs scons 3.x built with python3
|
||||
scons = sconsPackages.scons_3_1_2.override { python = python3; };
|
||||
scons = sconsPackages.scons_3_1_2;
|
||||
|
||||
mozjsVersion = "60";
|
||||
mozjsReplace = "defined(HAVE___SINCOS)";
|
||||
|
||||
} else if versionAtLeast version "4.2" then rec {
|
||||
} else rec {
|
||||
python = scons.python.withPackages (ps: with ps; [
|
||||
pyyaml
|
||||
cheetah3
|
||||
|
|
@ -55,23 +54,12 @@ let
|
|||
setuptools
|
||||
]);
|
||||
|
||||
# 4.2 < mongodb <= 5.0.x needs scons 3.x built with python3
|
||||
scons = sconsPackages.scons_3_1_2.override { python = python3; };
|
||||
scons = sconsPackages.scons_3_1_2;
|
||||
|
||||
mozjsVersion = "60";
|
||||
mozjsReplace = "defined(HAVE___SINCOS)";
|
||||
|
||||
} else rec {
|
||||
python = scons.python.withPackages (ps: with ps; [
|
||||
setuptools
|
||||
typing
|
||||
cheetah3
|
||||
]);
|
||||
|
||||
scons = sconsPackages.scons_3_1_2;
|
||||
mozjsVersion = "45";
|
||||
mozjsReplace = "defined(HAVE_SINCOS)";
|
||||
};
|
||||
};
|
||||
|
||||
system-libraries = [
|
||||
"boost"
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }:
|
||||
|
||||
let
|
||||
buildMongoDB = callPackage ./mongodb.nix {
|
||||
inherit sasl;
|
||||
inherit boost;
|
||||
inherit Security;
|
||||
inherit CoreFoundation;
|
||||
inherit cctools;
|
||||
};
|
||||
in buildMongoDB {
|
||||
version = "4.0.27";
|
||||
sha256 = "sha256-ct33mnK4pszhYM4Is7j0GZQRyi8i8Qmy0wcklyq5LjM=";
|
||||
patches = [
|
||||
./forget-build-dependencies.patch
|
||||
./mozjs-45_fix-3-byte-opcode.patch
|
||||
./patches/mongodb-4.0-glibc-2.34.patch # https://github.com/NixOS/nixpkgs/issues/171928
|
||||
(fetchpatch {
|
||||
name = "mongodb-4.4.1-gcc11.patch";
|
||||
url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch";
|
||||
sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
name = "fix double link of isNamedError.";
|
||||
url = "https://github.com/mongodb/mongo/commit/9c6751b9765d269b667324bb2efe1ca76a916d20.patch";
|
||||
sha256 = "sha256-4mcafqhBh7039ocEI9d/gXWck51X68PqtWtz4dapwwI=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tcsh";
|
||||
version = "6.24.06";
|
||||
version = "6.24.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://tcsh/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-qM0M0d3JT4cGgcy9CaNREFDppx5f6ZorAHlB9eGyt6U=";
|
||||
hash = "sha256-dOTpgFy9lBPtNLT/odcvyNDvgaW3lHaFQJFBbOkzaZU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btrfs-progs";
|
||||
version = "6.0.2";
|
||||
version = "6.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
||||
sha256 = "sha256-ZmWGMEnZRfwyzNrMVacwZ2eqj2QPO4sfpeBWijmucBg=";
|
||||
sha256 = "sha256-a+Zn2X89ZcC6V8MxyYsL07E89g2NMfqK0liCqtnXnXo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vp0oB5DVhYXIk45pDGADEes+OQApE7XFsIk0enSFMqo=";
|
||||
sha256 = "sha256-kA+7kAFAAZngbub2gHoiqEcSkcbxv0DPqbAT3MDBHtI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-LxQxO5hr+w04UZKqCh4dGteBA08GmXfCtpI8glKajkU=";
|
||||
vendorSha256 = "sha256-v3ZF2WDp4EmHA8RnP39o21cy9+n4cKkKZ0gSowv4nvk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,52 +1,47 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, DiskArbitration
|
||||
, Foundation
|
||||
, IOKit
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, libiconv
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bottom";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClementTsang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rCjRuRVa4ewyHcYpF8FPpuOsJ1ppB5C/Y7L+ju35+cI=";
|
||||
sha256 = "sha256-g9MkS1ps4RTEvuZP9oJize+Uz7W6uCNNks+HjO771QU=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
cargoHash = "sha256-wVvGj58dmpLH+zMu9e/TQ7gTvwmgYIYX5MrVcnOMu/A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
DiskArbitration
|
||||
Foundation
|
||||
IOKit
|
||||
libiconv
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
cargoHash = "sha256-c0zBLTcvIuNM9s7p3zIFbd4hB8WkMzCJW+Y/1Swrxlk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion $releaseDir/build/bottom-*/out/btm.{bash,fish} --zsh $releaseDir/build/bottom-*/out/_btm
|
||||
installManPage target/tmp/bottom/manpage/btm.1
|
||||
installShellCompletion \
|
||||
target/tmp/bottom/completion/btm.{bash,fish} \
|
||||
--zsh target/tmp/bottom/completion/_btm
|
||||
'';
|
||||
|
||||
BTM_GENERATE = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform graphical process/system monitor with a customizable interface";
|
||||
homepage = "https://github.com/ClementTsang/bottom";
|
||||
changelog = "https://github.com/ClementTsang/bottom/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ berbiche ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ berbiche figsoda ];
|
||||
mainProgram = "btm";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -959,6 +959,7 @@ mapAliases ({
|
|||
monero = monero-cli; # Added 2021-11-28
|
||||
mongodb-3_4 = throw "mongodb-3_4 has been removed, it's end of life since January 2020"; # Added 2022-11-30
|
||||
mongodb-3_6 = throw "mongodb-3_6 has been removed, it's end of life since April 2021"; # Added 2022-11-30
|
||||
mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05
|
||||
monodevelop = throw "monodevelop has been removed from nixpkgs"; # Added 2022-01-15
|
||||
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07
|
||||
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18
|
||||
|
|
@ -1458,6 +1459,7 @@ mapAliases ({
|
|||
surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22
|
||||
swec = throw "swec has been removed; broken and abandoned upstream"; # Added 2021-10-14
|
||||
sweep-visualizer = throw "'sweep-visualizer' is abondoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-15
|
||||
swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06
|
||||
swfdec = throw "swfdec has been removed as broken and unmaintained"; # Added 2020-08-23
|
||||
swtpm-tpm2 = swtpm; # Added 2021-02-26
|
||||
syncthing-cli = syncthing; # Added 2021-04-06
|
||||
|
|
|
|||
|
|
@ -24548,13 +24548,6 @@ with pkgs;
|
|||
|
||||
mongodb = hiPrio mongodb-6_0;
|
||||
|
||||
mongodb-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix {
|
||||
sasl = cyrus_sasl;
|
||||
boost = boost169;
|
||||
inherit (darwin) cctools;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
mongodb-4_2 = callPackage ../servers/nosql/mongodb/v4_2.nix {
|
||||
sasl = cyrus_sasl;
|
||||
boost = boost169;
|
||||
|
|
@ -25077,13 +25070,6 @@ with pkgs;
|
|||
};
|
||||
|
||||
xorg = let
|
||||
otherSplices = {
|
||||
selfBuildBuild = pkgsBuildBuild.xorg;
|
||||
selfBuildHost = pkgsBuildHost.xorg;
|
||||
selfBuildTarget = pkgsBuildTarget.xorg;
|
||||
selfHostHost = pkgsHostHost.xorg;
|
||||
selfTargetTarget = pkgsTargetTarget.xorg or { };
|
||||
};
|
||||
keep = _self: { };
|
||||
extra = _spliced0: { };
|
||||
|
||||
|
|
@ -25102,10 +25088,8 @@ with pkgs;
|
|||
|
||||
generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix {};
|
||||
|
||||
xorgPackages = lib.makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
otherSplices
|
||||
xorgPackages = makeScopeWithSplicing
|
||||
(generateSplicesForMkScope "xorg")
|
||||
keep
|
||||
extra
|
||||
(lib.extends overrides generatedPackages);
|
||||
|
|
@ -28580,6 +28564,8 @@ with pkgs;
|
|||
|
||||
edbrowse = callPackage ../applications/editors/edbrowse { };
|
||||
|
||||
edlin = callPackage ../applications/editors/edlin { };
|
||||
|
||||
o = callPackage ../applications/editors/o { };
|
||||
|
||||
oed = callPackage ../applications/editors/oed { };
|
||||
|
|
@ -32604,11 +32590,6 @@ with pkgs;
|
|||
|
||||
swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
|
||||
|
||||
swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im {
|
||||
inherit (gnome2) GConf;
|
||||
boost = boost168;
|
||||
};
|
||||
|
||||
sylpheed = callPackage ../applications/networking/mailreaders/sylpheed {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
|
|
@ -33948,11 +33929,11 @@ with pkgs;
|
|||
besu = callPackage ../applications/blockchains/besu { };
|
||||
|
||||
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {
|
||||
boost = boost165;
|
||||
boost = boost17x;
|
||||
withGui = true;
|
||||
};
|
||||
bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc {
|
||||
boost = boost165;
|
||||
boost = boost17x;
|
||||
mkDerivation = stdenv.mkDerivation;
|
||||
withGui = false;
|
||||
};
|
||||
|
|
@ -33976,11 +33957,11 @@ with pkgs;
|
|||
dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
|
||||
|
||||
dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin {
|
||||
boost = boost165;
|
||||
boost = boost17x;
|
||||
withGui = true;
|
||||
};
|
||||
dogecoind = callPackage ../applications/blockchains/dogecoin {
|
||||
boost = boost165;
|
||||
boost = boost17x;
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
|
|
@ -34122,11 +34103,11 @@ with pkgs;
|
|||
tessera = callPackage ../applications/blockchains/tessera { };
|
||||
|
||||
vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin {
|
||||
boost = boost165;
|
||||
boost = boost17x;
|
||||
withGui = true;
|
||||
};
|
||||
vertcoind = callPackage ../applications/blockchains/vertcoin {
|
||||
boost = boost165;
|
||||
boost = boost17x;
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
|
|
@ -38475,9 +38456,7 @@ with pkgs;
|
|||
|
||||
treefmt = callPackage ../development/tools/treefmt { };
|
||||
|
||||
bottom = callPackage ../tools/system/bottom {
|
||||
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit;
|
||||
};
|
||||
bottom = callPackage ../tools/system/bottom { };
|
||||
|
||||
cagebreak = callPackage ../applications/window-managers/cagebreak {
|
||||
wlroots = wlroots_0_14;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,11 @@
|
|||
{ lib
|
||||
, buildPackages, pkgs, targetPackages
|
||||
, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget
|
||||
, stdenv, splicePackages, newScope
|
||||
, generateSplicesForMkScope, makeScopeWithSplicing
|
||||
, stdenv
|
||||
, preLibcCrossHeaders
|
||||
}:
|
||||
|
||||
let
|
||||
otherSplices = {
|
||||
selfBuildBuild = pkgsBuildBuild.darwin;
|
||||
selfBuildHost = pkgsBuildHost.darwin;
|
||||
selfBuildTarget = pkgsBuildTarget.darwin;
|
||||
selfHostHost = pkgsHostHost.darwin;
|
||||
selfTargetTarget = pkgsTargetTarget.darwin or {}; # might be missing
|
||||
};
|
||||
|
||||
# Prefix for binaries. Customarily ends with a dash separator.
|
||||
#
|
||||
# TODO(@Ericson2314) Make unconditional, or optional but always true by
|
||||
|
|
@ -22,7 +14,7 @@ let
|
|||
(stdenv.targetPlatform.config + "-");
|
||||
in
|
||||
|
||||
lib.makeScopeWithSplicing splicePackages newScope otherSplices (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let
|
||||
makeScopeWithSplicing (generateSplicesForMkScope "darwin") (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let
|
||||
inherit (self) mkDerivation callPackage;
|
||||
|
||||
# Must use pkgs.callPackage to avoid infinite recursion.
|
||||
|
|
|
|||
|
|
@ -98,6 +98,8 @@ let
|
|||
|
||||
brisk-reconciler = callPackage ../development/ocaml-modules/brisk-reconciler { };
|
||||
|
||||
brr = callPackage ../development/ocaml-modules/brr { };
|
||||
|
||||
bwd = callPackage ../development/ocaml-modules/bwd { };
|
||||
|
||||
bz2 = callPackage ../development/ocaml-modules/bz2 { };
|
||||
|
|
@ -664,6 +666,8 @@ let
|
|||
|
||||
js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { };
|
||||
|
||||
js_of_ocaml-toplevel = callPackage ../development/tools/ocaml/js_of_ocaml/toplevel.nix {};
|
||||
|
||||
js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {};
|
||||
|
||||
jsonm = callPackage ../development/ocaml-modules/jsonm { };
|
||||
|
|
@ -950,6 +954,8 @@ let
|
|||
|
||||
nonstd = callPackage ../development/ocaml-modules/nonstd { };
|
||||
|
||||
note = callPackage ../development/ocaml-modules/note { };
|
||||
|
||||
notty = callPackage ../development/ocaml-modules/notty { };
|
||||
|
||||
npy = callPackage ../development/ocaml-modules/npy {
|
||||
|
|
|
|||
|
|
@ -18,86 +18,103 @@ lib: pkgs: actuallySplice:
|
|||
|
||||
let
|
||||
|
||||
spliceReal = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
|
||||
, pkgsHostHost, pkgsHostTarget
|
||||
, pkgsTargetTarget
|
||||
}: let
|
||||
mash =
|
||||
# Other pkgs sets
|
||||
pkgsBuildBuild // pkgsBuildTarget // pkgsHostHost // pkgsTargetTarget
|
||||
# The same pkgs sets one probably intends
|
||||
// pkgsBuildHost // pkgsHostTarget;
|
||||
merge = name: {
|
||||
inherit name;
|
||||
value = let
|
||||
defaultValue = mash.${name};
|
||||
# `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
|
||||
valueBuildBuild = pkgsBuildBuild.${name} or {};
|
||||
valueBuildHost = pkgsBuildHost.${name} or {};
|
||||
valueBuildTarget = pkgsBuildTarget.${name} or {};
|
||||
valueHostHost = pkgsHostHost.${name} or {};
|
||||
valueHostTarget = pkgsHostTarget.${name} or {};
|
||||
valueTargetTarget = pkgsTargetTarget.${name} or {};
|
||||
augmentedValue = defaultValue
|
||||
# TODO(@Artturin): remove before release 23.05 and only have __spliced.
|
||||
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = lib.warn "use ${name}.__spliced.buildHost instead of ${name}.nativeDrv" valueBuildHost; })
|
||||
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = lib.warn "use ${name}.__spliced.hostTarget instead of ${name}.crossDrv" valueHostTarget; })
|
||||
// {
|
||||
__spliced =
|
||||
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
|
||||
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; })
|
||||
// (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
|
||||
// (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
|
||||
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; })
|
||||
// (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget;
|
||||
});
|
||||
};
|
||||
# Get the set of outputs of a derivation. If one derivation fails to
|
||||
# evaluate we don't want to diverge the entire splice, so we fall back
|
||||
# on {}
|
||||
tryGetOutputs = value0: let
|
||||
inherit (builtins.tryEval value0) success value;
|
||||
in getOutputs (lib.optionalAttrs success value);
|
||||
getOutputs = value: lib.genAttrs
|
||||
(value.outputs or (lib.optional (value ? out) "out"))
|
||||
(output: value.${output});
|
||||
in
|
||||
# The derivation along with its outputs, which we recur
|
||||
# on to splice them together.
|
||||
if lib.isDerivation defaultValue then augmentedValue // spliceReal {
|
||||
pkgsBuildBuild = tryGetOutputs valueBuildBuild;
|
||||
pkgsBuildHost = tryGetOutputs valueBuildHost;
|
||||
pkgsBuildTarget = tryGetOutputs valueBuildTarget;
|
||||
pkgsHostHost = tryGetOutputs valueHostHost;
|
||||
pkgsHostTarget = getOutputs valueHostTarget;
|
||||
pkgsTargetTarget = tryGetOutputs valueTargetTarget;
|
||||
# Just recur on plain attrsets
|
||||
} else if lib.isAttrs defaultValue then spliceReal {
|
||||
pkgsBuildBuild = valueBuildBuild;
|
||||
pkgsBuildHost = valueBuildHost;
|
||||
pkgsBuildTarget = valueBuildTarget;
|
||||
pkgsHostHost = valueHostHost;
|
||||
pkgsHostTarget = valueHostTarget;
|
||||
pkgsTargetTarget = valueTargetTarget;
|
||||
# Don't be fancy about non-derivations. But we could have used used
|
||||
# `__functor__` for functions instead.
|
||||
} else defaultValue;
|
||||
};
|
||||
in lib.listToAttrs (map merge (lib.attrNames mash));
|
||||
spliceReal =
|
||||
{ pkgsBuildBuild
|
||||
, pkgsBuildHost
|
||||
, pkgsBuildTarget
|
||||
, pkgsHostHost
|
||||
, pkgsHostTarget
|
||||
, pkgsTargetTarget
|
||||
}:
|
||||
let
|
||||
mash =
|
||||
# Other pkgs sets
|
||||
pkgsBuildBuild // pkgsBuildTarget // pkgsHostHost // pkgsTargetTarget
|
||||
# The same pkgs sets one probably intends
|
||||
// pkgsBuildHost // pkgsHostTarget;
|
||||
merge = name: {
|
||||
inherit name;
|
||||
value =
|
||||
let
|
||||
defaultValue = mash.${name};
|
||||
# `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
|
||||
valueBuildBuild = pkgsBuildBuild.${name} or { };
|
||||
valueBuildHost = pkgsBuildHost.${name} or { };
|
||||
valueBuildTarget = pkgsBuildTarget.${name} or { };
|
||||
valueHostHost = pkgsHostHost.${name} or { };
|
||||
valueHostTarget = pkgsHostTarget.${name} or { };
|
||||
valueTargetTarget = pkgsTargetTarget.${name} or { };
|
||||
augmentedValue = defaultValue
|
||||
# TODO(@Artturin): remove before release 23.05 and only have __spliced.
|
||||
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = lib.warn "use ${name}.__spliced.buildHost instead of ${name}.nativeDrv" valueBuildHost; })
|
||||
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = lib.warn "use ${name}.__spliced.hostTarget instead of ${name}.crossDrv" valueHostTarget; })
|
||||
// {
|
||||
__spliced =
|
||||
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
|
||||
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; })
|
||||
// (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
|
||||
// (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
|
||||
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; })
|
||||
// (lib.optionalAttrs (pkgsTargetTarget ? ${name}) {
|
||||
targetTarget = valueTargetTarget;
|
||||
});
|
||||
};
|
||||
# Get the set of outputs of a derivation. If one derivation fails to
|
||||
# evaluate we don't want to diverge the entire splice, so we fall back
|
||||
# on {}
|
||||
tryGetOutputs = value0:
|
||||
let
|
||||
inherit (builtins.tryEval value0) success value;
|
||||
in
|
||||
getOutputs (lib.optionalAttrs success value);
|
||||
getOutputs = value: lib.genAttrs
|
||||
(value.outputs or (lib.optional (value ? out) "out"))
|
||||
(output: value.${output});
|
||||
in
|
||||
# The derivation along with its outputs, which we recur
|
||||
# on to splice them together.
|
||||
if lib.isDerivation defaultValue then augmentedValue // spliceReal {
|
||||
pkgsBuildBuild = tryGetOutputs valueBuildBuild;
|
||||
pkgsBuildHost = tryGetOutputs valueBuildHost;
|
||||
pkgsBuildTarget = tryGetOutputs valueBuildTarget;
|
||||
pkgsHostHost = tryGetOutputs valueHostHost;
|
||||
pkgsHostTarget = getOutputs valueHostTarget;
|
||||
pkgsTargetTarget = tryGetOutputs valueTargetTarget;
|
||||
# Just recur on plain attrsets
|
||||
} else if lib.isAttrs defaultValue then
|
||||
spliceReal
|
||||
{
|
||||
pkgsBuildBuild = valueBuildBuild;
|
||||
pkgsBuildHost = valueBuildHost;
|
||||
pkgsBuildTarget = valueBuildTarget;
|
||||
pkgsHostHost = valueHostHost;
|
||||
pkgsHostTarget = valueHostTarget;
|
||||
pkgsTargetTarget = valueTargetTarget;
|
||||
# Don't be fancy about non-derivations. But we could have used used
|
||||
# `__functor__` for functions instead.
|
||||
} else defaultValue;
|
||||
};
|
||||
in
|
||||
lib.listToAttrs (map merge (lib.attrNames mash));
|
||||
|
||||
splicePackages = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
|
||||
, pkgsHostHost, pkgsHostTarget
|
||||
, pkgsTargetTarget
|
||||
} @ args:
|
||||
splicePackages =
|
||||
{ pkgsBuildBuild
|
||||
, pkgsBuildHost
|
||||
, pkgsBuildTarget
|
||||
, pkgsHostHost
|
||||
, pkgsHostTarget
|
||||
, pkgsTargetTarget
|
||||
} @ args:
|
||||
if actuallySplice then spliceReal args else pkgsHostTarget;
|
||||
|
||||
splicedPackages = splicePackages {
|
||||
inherit (pkgs)
|
||||
pkgsBuildBuild pkgsBuildHost pkgsBuildTarget
|
||||
pkgsHostHost pkgsHostTarget
|
||||
pkgsTargetTarget
|
||||
;
|
||||
} // {
|
||||
splicedPackages = splicePackages
|
||||
{
|
||||
inherit (pkgs)
|
||||
pkgsBuildBuild pkgsBuildHost pkgsBuildTarget
|
||||
pkgsHostHost pkgsHostTarget
|
||||
pkgsTargetTarget
|
||||
;
|
||||
} // {
|
||||
# These should never be spliced under any circumstances
|
||||
inherit (pkgs)
|
||||
pkgsBuildBuild pkgsBuildHost pkgsBuildTarget
|
||||
|
|
@ -109,7 +126,10 @@ let
|
|||
};
|
||||
|
||||
splicedPackagesWithXorg = splicedPackages // builtins.removeAttrs splicedPackages.xorg [
|
||||
"callPackage" "newScope" "overrideScope" "packages"
|
||||
"callPackage"
|
||||
"newScope"
|
||||
"overrideScope"
|
||||
"packages"
|
||||
];
|
||||
|
||||
in
|
||||
|
|
@ -120,12 +140,30 @@ in
|
|||
# We use `callPackage' to be able to omit function arguments that can be
|
||||
# obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use
|
||||
# `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
|
||||
callPackage = pkgs.newScope {};
|
||||
callPackage = pkgs.newScope { };
|
||||
|
||||
callPackages = lib.callPackagesWith splicedPackagesWithXorg;
|
||||
|
||||
newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra);
|
||||
|
||||
# prefill 2 fields of the function for convenience
|
||||
makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
|
||||
|
||||
# generate 'otherSplices' for 'makeScopeWithSplicing'
|
||||
generateSplicesForMkScope = attr:
|
||||
let
|
||||
split = X: lib.splitString "." "${X}.${attr}";
|
||||
in
|
||||
{
|
||||
# nulls should never be reached
|
||||
selfBuildBuild = lib.attrByPath (split "pkgsBuildBuild") null pkgs;
|
||||
selfBuildHost = lib.attrByPath (split "pkgsBuildHost") null pkgs;
|
||||
selfBuildTarget = lib.attrByPath (split "pkgsBuildTarget") null pkgs;
|
||||
selfHostHost = lib.attrByPath (split "pkgsHostHost") null pkgs;
|
||||
selfHostTarget = lib.attrByPath (split "pkgsHostTarget") null pkgs;
|
||||
selfTargetTarget = lib.attrByPath (split "pkgsTargetTarget") { } pkgs;
|
||||
};
|
||||
|
||||
# Haskell package sets need this because they reimplement their own
|
||||
# `newScope`.
|
||||
__splicedPackages = splicedPackages // { recurseForDerivations = false; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue