Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
39a2f44695
51 changed files with 577 additions and 176 deletions
|
|
@ -248,7 +248,7 @@ rec {
|
|||
/* Apply fold functions to values grouped by key.
|
||||
|
||||
Example:
|
||||
foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }]
|
||||
foldAttrs (item: acc: [item] ++ acc) [] [{ a = 2; } { a = 3; }]
|
||||
=> { a = [ 2 3 ]; }
|
||||
*/
|
||||
foldAttrs = op: nul:
|
||||
|
|
|
|||
|
|
@ -12835,6 +12835,12 @@
|
|||
fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B";
|
||||
}];
|
||||
};
|
||||
tljuniper = {
|
||||
email = "tljuniper1@gmail.com";
|
||||
github = "tljuniper";
|
||||
githubId = 48209000;
|
||||
name = "Anna Gillert";
|
||||
};
|
||||
tmarkovski = {
|
||||
email = "tmarkovski@gmail.com";
|
||||
github = "tmarkovski";
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./use-gcc.patch ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: /build/cc566Cj9.o:(.bss+0x0): multiple definition of `mpc123_file_reader'; ao.o:(.bss+0x40): first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
buildInputs = [ gettext libmpcdec libao ];
|
||||
|
||||
installPhase =
|
||||
|
|
|
|||
42
pkgs/applications/misc/activate-linux/default.nix
Normal file
42
pkgs/applications/misc/activate-linux/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pkg-config
|
||||
, xorg
|
||||
, cairo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "activate-linux";
|
||||
version = "unstable-2022-05-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrGlockenspiel";
|
||||
repo = pname;
|
||||
rev = "18a6dc9771c568c557569ef680386d5d67f25e96";
|
||||
sha256 = "wYoCyWZqu/jgqAuNYdNr2bjpz4pFRTnAF7qF4BRs9GE=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXinerama
|
||||
cairo
|
||||
];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "The \"Activate Windows\" watermark ported to Linux";
|
||||
homepage = "https://github.com/MrGlockenspiel/activate-linux";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ alexnortung ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "101.0.4951.64",
|
||||
"sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w",
|
||||
"sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v",
|
||||
"version": "102.0.5005.61",
|
||||
"sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
|
||||
"sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-03-14",
|
||||
"version": "2022-04-14",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
|
||||
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
|
||||
"rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
|
||||
"sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "101.0.4951.41",
|
||||
"sha256_linux": "0zsh6cm7h1m0k5mx1cd29knxjxaadjjcbp7m5fr2mx9c21a1nlcr",
|
||||
"sha256_darwin": "09py50436y81lw2vk44256dmzsg8dqj14fd0g0gs1cc3ps6q4awl",
|
||||
"sha256_darwin_aarch64": "0krjijd0zgwg8d44miz43xrjdlvfiymbrrz5r1hzpx64555ch12y"
|
||||
"version": "102.0.5005.27",
|
||||
"sha256_linux": "1978xwj9kf8nihgakmnzgibizq6wp74qp2d2fxgrsgggjy1clmbv",
|
||||
"sha256_darwin": "0abnqpdm5hgirzj9g2zwkjcc7cwnnr3va4qn09g5yqndlbvi9nqd",
|
||||
"sha256_darwin_aarch64": "0mw7vypghnw3qdci8g11hgfwbfln471dq1mymxn4bi7691xxb6a2"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo";
|
||||
version = "3.3.2";
|
||||
version = "3.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tl1UpoXBuIyJyMLHeIhQ6EHG1XqAGE6Tw5jU6rW+DXc=";
|
||||
sha256 = "sha256-EeGpJliE38MroeScdmeMp36rEDld59zDEM5i4QqxYik=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0=";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.23";
|
||||
version = "0.8.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-y3NsYPGVlWA/N2AYw3EQKUwLeGYwRI29tC9iTPeyU3Q=";
|
||||
sha256 = "sha256-TK81Cqhddbqh6cizyOoLuBTE2KxFQzy07EdkQ9bYNs0=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.3.12";
|
||||
version = "3.3.13";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DrM2925PcNuwJooq9qGHgIq64JWHb7byDeaeVsWgEjc=";
|
||||
hash = "sha256-QfsHVP2FIp2kn6blKbeerNxUOWXbxpgRkSBGorViVYs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,23 +1,24 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub
|
||||
, ocaml_extlib, ocamlfuse, gapi_ocaml, ocaml_sqlite3
|
||||
, tiny_httpd
|
||||
, ounit
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "google-drive-ocamlfuse";
|
||||
version = "0.7.26";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
version = "0.7.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astrada";
|
||||
repo = "google-drive-ocamlfuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8s3DnpdYIVyJj5rtsof3WpLvX9wCrWU47dp4D6c986s=";
|
||||
sha256 = "sha256:1layxqz5iz6wnvk83579m1im9vzq608h7n1h04znpkan0fls6nad";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 ];
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit ];
|
||||
|
||||
buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 tiny_httpd ];
|
||||
|
||||
meta = {
|
||||
inherit (src.meta) homepage;
|
||||
|
|
|
|||
|
|
@ -159,66 +159,58 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
|
||||
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
#### ALIASES - added 2018-01
|
||||
#### ALIASES
|
||||
|
||||
terminal = xfce4-terminal;
|
||||
thunar-build = thunar-bare;
|
||||
thunarx-2-dev = thunar-build;
|
||||
thunar_volman = thunar-volman;
|
||||
xfce4panel = xfce4-panel;
|
||||
xfce4session = xfce4-session;
|
||||
xfce4settings = xfce4-settings;
|
||||
xfce4_power_manager = xfce4-power-manager;
|
||||
xfce4_appfinder = xfce4-appfinder;
|
||||
xfce4_dev_tools = xfce4-dev-tools;
|
||||
xfce4notifyd = xfce4-notifyd;
|
||||
xfce4taskmanager = xfce4-taskmanager;
|
||||
xfce4terminal = xfce4-terminal;
|
||||
xfce4volumed_pulse = xfce4-volumed-pulse;
|
||||
xfce4icontheme = xfce4-icon-theme;
|
||||
xfwm4themes = xfwm4-themes;
|
||||
terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24
|
||||
thunar-build = throw "xfce.thunar-build has been removed, use xfce.thunar-bare instead"; # added 2022-05-24
|
||||
thunarx-2-dev = throw "xfce.thunarx-2-dev has been removed, use xfce.thunar-bare instead"; # added 2022-05-24
|
||||
thunar_volman = throw "xfce.thunar_volman has been removed, use xfce.thunar-volman instead"; # added 2022-05-24
|
||||
xfce4panel = throw "xfce.xfce4panel has been removed, use xfce.xfce4-panel instead"; # added 2022-05-24
|
||||
xfce4session = throw "xfce.xfce4session has been removed, use xfce.xfce4-session instead"; # added 2022-05-24
|
||||
xfce4settings = throw "xfce.xfce4settings has been removed, use xfce.xfce4-settings instead"; # added 2022-05-24
|
||||
xfce4_power_manager = throw "xfce.xfce4_power_manager has been removed, use xfce.xfce4-power-manager instead"; # added 2022-05-24
|
||||
xfce4_appfinder = throw "xfce.xfce4_appfinder has been removed, use xfce.xfce4-appfinder instead"; # added 2022-05-24
|
||||
xfce4_dev_tools = throw "xfce.xfce4_dev_tools has been removed, use xfce.xfce4-dev-tools instead"; # added 2022-05-24
|
||||
xfce4notifyd = throw "xfce.xfce4notifyd has been removed, use xfce.xfce4-notifyd instead"; # added 2022-05-24
|
||||
xfce4taskmanager = throw "xfce.xfce4taskmanager has been removed, use xfce.xfce4-taskmanager instead"; # added 2022-05-24
|
||||
xfce4terminal = throw "xfce.xfce4terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24
|
||||
xfce4volumed_pulse = throw "xfce.xfce4volumed_pulse has been removed, use xfce.xfce4-volumed-pulse instead"; # added 2022-05-24
|
||||
xfce4icontheme = throw "xfce.xfce4icontheme has been removed, use xfce.xfce4-icon-theme instead"; # added 2022-05-24
|
||||
xfwm4themes = throw "xfce.xfwm4themes has been removed, use xfce.xfwm4-themes instead"; # added 2022-05-24
|
||||
xfce4_battery_plugin = throw "xfce.xfce4_battery_plugin has been removed, use xfce.xfce4-battery-plugin instead"; # added 2022-05-24
|
||||
xfce4_clipman_plugin = throw "xfce.xfce4_clipman_plugin has been removed, use xfce.xfce4-clipman-plugin instead"; # added 2022-05-24
|
||||
xfce4_cpufreq_plugin = throw "xfce.xfce4_cpufreq_plugin has been removed, use xfce.xfce4-cpufreq-plugin instead"; # added 2022-05-24
|
||||
xfce4_cpugraph_plugin = throw "xfce.xfce4_cpugraph_plugin has been removed, use xfce.xfce4-cpugraph-plugin instead"; # added 2022-05-24
|
||||
xfce4_datetime_plugin = throw "xfce.xfce4_datetime_plugin has been removed, use xfce.xfce4-datetime-plugin instead"; # added 2022-05-24
|
||||
xfce4_dockbarx_plugin = throw "xfce.xfce4_dockbarx_plugin has been removed, use xfce.xfce4-dockbarx-plugin instead"; # added 2022-05-24
|
||||
xfce4_embed_plugin = throw "xfce.xfce4_embed_plugin has been removed, use xfce.xfce4-embed-plugin instead"; # added 2022-05-24
|
||||
xfce4_eyes_plugin = throw "xfce.xfce4_eyes_plugin has been removed, use xfce.xfce4-eyes-plugin instead"; # added 2022-05-24
|
||||
xfce4_fsguard_plugin = throw "xfce.xfce4_fsguard_plugin has been removed, use xfce.xfce4-fsguard-plugin instead"; # added 2022-05-24
|
||||
xfce4_genmon_plugin = throw "xfce.xfce4_genmon_plugin has been removed, use xfce.xfce4-genmon-plugin instead"; # added 2022-05-24
|
||||
xfce4_hardware_monitor_plugin = throw "xfce.xfce4_hardware_monitor_plugin has been removed, use xfce.xfce4-hardware-monitor-plugin instead"; # added 2022-05-24
|
||||
xfce4_namebar_plugin = throw "xfce.xfce4_namebar_plugin has been removed, use xfce.xfce4-namebar-plugin instead"; # added 2022-05-24
|
||||
xfce4_netload_plugin = throw "xfce.xfce4_netload_plugin has been removed, use xfce.xfce4-netload-plugin instead"; # added 2022-05-24
|
||||
xfce4_notes_plugin = throw "xfce.xfce4_notes_plugin has been removed, use xfce.xfce4-notes-plugin instead"; # added 2022-05-24
|
||||
xfce4_mailwatch_plugin = throw "xfce.xfce4_mailwatch_plugin has been removed, use xfce.xfce4-mailwatch-plugin instead"; # added 2022-05-24
|
||||
xfce4_mpc_plugin = throw "xfce.xfce4_mpc_plugin has been removed, use xfce.xfce4-mpc-plugin instead"; # added 2022-05-24
|
||||
xfce4_sensors_plugin = throw "xfce.xfce4_sensors_plugin has been removed, use xfce.xfce4-sensors-plugin instead"; # added 2022-05-24
|
||||
xfce4_systemload_plugin = throw "xfce.xfce4_systemload_plugin has been removed, use xfce.xfce4-systemload-plugin instead"; # added 2022-05-24
|
||||
xfce4_timer_plugin = throw "xfce.xfce4_timer_plugin has been removed, use xfce.xfce4-timer-plugin instead"; # added 2022-05-24
|
||||
xfce4_verve_plugin = throw "xfce.xfce4_verve_plugin has been removed, use xfce.xfce4-verve-plugin instead"; # added 2022-05-24
|
||||
xfce4_xkb_plugin = throw "xfce.xfce4_xkb_plugin has been removed, use xfce.xfce4-xkb-plugin instead"; # added 2022-05-24
|
||||
xfce4_weather_plugin = throw "xfce.xfce4_weather_plugin has been removed, use xfce.xfce4-weather-plugin instead"; # added 2022-05-24
|
||||
xfce4_whiskermenu_plugin = throw "xfce.xfce4_whiskermenu_plugin has been removed, use xfce.xfce4-whiskermenu-plugin instead"; # added 2022-05-24
|
||||
xfce4_windowck_plugin = throw "xfce.xfce4_windowck_plugin has been removed, use xfce.xfce4-windowck-plugin instead"; # added 2022-05-24
|
||||
xfce4_pulseaudio_plugin = throw "xfce.xfce4_pulseaudio_plugin has been removed, use xfce.xfce4-pulseaudio-plugin instead"; # added 2022-05-24
|
||||
libxfce4ui_gtk3 = throw "xfce.libxfce4ui_gtk3 has been removed, use xfce.libxfce4ui instead"; # added 2022-05-24
|
||||
xfce4panel_gtk3 = throw "xfce.xfce4panel_gtk3 has been removed, use xfce.xfce4-panel instead"; # added 2022-05-24
|
||||
xfce4_power_manager_gtk3 = throw "xfce.xfce4_power_manager_gtk3 has been removed, use xfce.xfce4-power-manager instead"; # added 2022-05-24
|
||||
gtk = throw "xfce.gtk has been removed, use gtk2 instead"; # added 2022-05-24
|
||||
gtksourceview = throw "xfce.gtksourceview has been removed, use gtksourceview instead"; # added 2022-05-24
|
||||
dconf = throw "xfce.dconf has been removed, use dconf instead"; # added 2022-05-24
|
||||
vte = throw "xfce.vte has been removed, use vte instead"; # added 2022-05-24
|
||||
|
||||
xfce4_battery_plugin = xfce4-battery-plugin;
|
||||
xfce4_clipman_plugin = xfce4-clipman-plugin;
|
||||
xfce4_cpufreq_plugin = xfce4-cpufreq-plugin;
|
||||
xfce4_cpugraph_plugin = xfce4-cpugraph-plugin;
|
||||
xfce4_datetime_plugin = xfce4-datetime-plugin;
|
||||
xfce4_dockbarx_plugin = xfce4-dockbarx-plugin;
|
||||
xfce4_embed_plugin = xfce4-embed-plugin;
|
||||
xfce4_eyes_plugin = xfce4-eyes-plugin;
|
||||
xfce4_fsguard_plugin = xfce4-fsguard-plugin;
|
||||
xfce4_genmon_plugin = xfce4-genmon-plugin;
|
||||
xfce4_hardware_monitor_plugin = xfce4-hardware-monitor-plugin;
|
||||
xfce4_namebar_plugin = xfce4-namebar-plugin;
|
||||
xfce4_netload_plugin = xfce4-netload-plugin;
|
||||
xfce4_notes_plugin = xfce4-notes-plugin;
|
||||
xfce4_mailwatch_plugin = xfce4-mailwatch-plugin;
|
||||
xfce4_mpc_plugin = xfce4-mpc-plugin;
|
||||
xfce4_sensors_plugin = xfce4-sensors-plugin;
|
||||
xfce4_systemload_plugin = xfce4-systemload-plugin;
|
||||
xfce4_timer_plugin = xfce4-timer-plugin;
|
||||
xfce4_verve_plugin = xfce4-verve-plugin;
|
||||
xfce4_xkb_plugin = xfce4-xkb-plugin;
|
||||
xfce4_weather_plugin = xfce4-weather-plugin;
|
||||
xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin;
|
||||
xfce4_windowck_plugin = xfce4-windowck-plugin;
|
||||
xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin;
|
||||
xinitrc = xfce4-session.xinitrc; # added 2019-11-04
|
||||
|
||||
xfce4-dict-plugin = throw "deprecated 2020-04-19: xfce4-dict-plugin is now part of xfce4-dict."; # added 2020-04-19
|
||||
|
||||
# added 2019-11-04
|
||||
libxfce4ui_gtk3 = libxfce4ui;
|
||||
xfce4panel_gtk3 = xfce4-panel;
|
||||
xfce4_power_manager_gtk3 = xfce4-power-manager;
|
||||
gtk = pkgs.gtk2;
|
||||
libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library";
|
||||
xinitrc = xfce4-session.xinitrc;
|
||||
libglade = throw "libglade has been removed";
|
||||
inherit (pkgs.gnome) gtksourceview;
|
||||
thunar-bare = thunar.override {
|
||||
thunarPlugins = [];
|
||||
};
|
||||
|
||||
# added 2019-11-30
|
||||
inherit (pkgs) dconf vte;
|
||||
thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
|
||||
, stdenv, writeScript, lib }:
|
||||
let
|
||||
version = "0.32.0";
|
||||
version = "0.35.0";
|
||||
owner = "erlang-ls";
|
||||
repo = "erlang_ls";
|
||||
deps = import ./rebar-deps.nix {
|
||||
|
|
@ -19,7 +19,7 @@ rebar3Relx {
|
|||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "sha256-aYMfsaqdsxlWatvXBWIxKJ7baruH1kqp2nrXL+/IrUQ=";
|
||||
sha256 = "sha256-5pGFLatcNqxpQZtu/qgwX88C8TZvk+U8ez2IGf+jgRA=";
|
||||
rev = version;
|
||||
};
|
||||
releaseType = "escript";
|
||||
|
|
|
|||
|
|
@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/jcbeaudoin/MKCL/commit/0777dd08254c88676f4f101117b10786b22111d6.patch";
|
||||
sha256 = "1dnr1jzha77nrxs22mclrcqyqvxxn6q1sfn35qjs77fi3jcinjsc";
|
||||
})
|
||||
|
||||
# Pull upstream fix for -fno-common toolchins like gcc-10
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://gitlab.common-lisp.net/mkcl/mkcl/-/commit/ef1981dbf4ceb1793cd6434e66e97b3db48b4ea0.patch";
|
||||
sha256 = "00y6qanwvgb1r4haaqmvz7lbqa51l4wcnns1rwlfgvcvkpjc3dif";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-activemq";
|
||||
version = "5.17.0";
|
||||
version = "5.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "sha256-6war1/Re+tQvT1a2cf7n3/TMrDh+B2Wx0lbhm+pm+Jc=";
|
||||
sha256 = "sha256-YX7CUQLMYiUubZsGzElnZq8RbJdSUlW8jEs+de6eAMg=";
|
||||
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librseq";
|
||||
version = "0.1.0pre70_${builtins.substring 0 7 src.rev}";
|
||||
version = "0.1.0pre71_${builtins.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "compudj";
|
||||
repo = "librseq";
|
||||
rev = "d1cdec98d476b16ca5e2d9d7eabcf9f1c97e6111";
|
||||
sha256 = "0vgillrxc1knq591gjj99x2ws6q1xpm5dmfrhsxisngfpcnjr10v";
|
||||
rev = "170f840b498e1aff068b90188727a656111bfc2f";
|
||||
sha256 = "0rdx59y8y9x8cfmmx5gl66gibkzpk3kw5lrrqhrxan8zr37a055y";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, ninja
|
||||
, fetchpatch
|
||||
, secureBuild ? false
|
||||
}:
|
||||
|
||||
|
|
@ -8,21 +7,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mimalloc";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q3W/w1Ofqt6EbKF/Jf9wcC+7jAxh59B3cOGxudWQXlA=";
|
||||
sha256 = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "older-macos-fixes.patch";
|
||||
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
|
||||
sha256 = "15qx2a3axhhwbfzxdis98b8j14y9cfgca0i484aj2pjpqnm0pb8c";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = let
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-net";
|
||||
version = "3.0.1";
|
||||
version = "4.0.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-net/releases/download/v${version}/mirage-net-v${version}.tbz";
|
||||
sha256 = "0yfvl0fgs7xy5i7kkparaa7a315a2h7kb1z24fmmnwnyaji57dg3";
|
||||
sha256 = "sha256-Zo7/0Ye4GgqzJFCHDBXbuJ/5ETl/8ziolRgH4lDhlM4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cstruct fmt lwt macaddr mirage-device ];
|
||||
|
|
|
|||
28
pkgs/development/ocaml-modules/tiny_httpd/default.nix
Normal file
28
pkgs/development/ocaml-modules/tiny_httpd/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub
|
||||
, result
|
||||
, seq
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tiny_httpd";
|
||||
version = "0.12";
|
||||
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c-cube";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:1z9hzc0ib7pg9fsjmpggjqwrnip57izr2v0na7vc7s25lxsiag6a";
|
||||
};
|
||||
|
||||
buildInputs = [ result ];
|
||||
propagatedBuildInputs = [ seq ];
|
||||
|
||||
meta = {
|
||||
description = "Minimal HTTP server using good old threads";
|
||||
inherit (src.meta) homepage;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
, dash-table
|
||||
, pytest-mock
|
||||
, mock
|
||||
, pyyaml
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
|
@ -40,6 +41,7 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
pytest-mock
|
||||
mock
|
||||
pyyaml
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
|
|
|||
42
pkgs/development/python-modules/greeneye-monitor/default.nix
Normal file
42
pkgs/development/python-modules/greeneye-monitor/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, siobrultech-protocols
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "greeneye-monitor";
|
||||
version = "3.0.3";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jkeljo";
|
||||
repo = "greeneye-monitor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-weZTOVFBlB6TxFs8pLWfyB7WD/bn3ljBjX2tVi1Zc/I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
siobrultech-protocols
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "greeneye.monitor" ];
|
||||
|
||||
meta = {
|
||||
description = "Receive data packets from GreenEye Monitor";
|
||||
homepage = "https://github.com/jkeljo/greeneye-monitor";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "librouteros";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "luqasz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Zo9HCjYe9cCkqXhikAjDQKQXGkrMni3f+9KoqhZskNk=";
|
||||
sha256 = "sha256-VwpZ1RY6Sul7xvWY7ZoOxZ7KgbRmKRwcVdF9e2b3f6Q=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
43
pkgs/development/python-modules/mkdocs-macros/default.nix
Normal file
43
pkgs/development/python-modules/mkdocs-macros/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, callPackage
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, mkdocs
|
||||
, mkdocs-macros
|
||||
, mkdocs-material
|
||||
, jinja2
|
||||
, dateutil
|
||||
, termcolor
|
||||
, pyyaml
|
||||
, runCommand
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-macros-plugin";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256:0206cm0153vzp10c8a15bi2znisq5pv59zi9vrcm74pnpk5f2r4y";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
dateutil
|
||||
termcolor
|
||||
pyyaml
|
||||
mkdocs
|
||||
];
|
||||
|
||||
passthru.tests.example-doc = callPackage ./tests.nix { };
|
||||
|
||||
pythonImportsCheck = [ "mkdocs_macros" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/fralau/mkdocs_macros_plugin";
|
||||
description = "Create richer and more beautiful pages in MkDocs, by using variables and calls to macros in the markdown code.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tljuniper ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, callPackage
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, runCommand
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
# Is required for properly testing mkdocs-macros
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-macros-test";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256:1w12skm8l0r2x6z1va996lvq6z1873d0xzql9n0aja0g0v6s7ay5";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "mkdocs_macros_test" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/fralau/mkdocs-macros-test";
|
||||
description = "Implementation of a (model) pluglet for mkdocs-macros";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tljuniper ];
|
||||
};
|
||||
}
|
||||
49
pkgs/development/python-modules/mkdocs-macros/tests.nix
Normal file
49
pkgs/development/python-modules/mkdocs-macros/tests.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ setuptools
|
||||
, mkdocs
|
||||
, mkdocs-macros
|
||||
, mkdocs-material
|
||||
, runCommand
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (mkdocs-macros) pname version src;
|
||||
|
||||
mkdocs-macros-test = callPackage ./mkdocs-macros-test.nix { };
|
||||
|
||||
env = {
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
mkdocs
|
||||
mkdocs-macros
|
||||
mkdocs-macros-test
|
||||
mkdocs-material
|
||||
];
|
||||
};
|
||||
in
|
||||
runCommand "mkdocs-macros-example-docs" env ''
|
||||
set -euo pipefail
|
||||
mkdir $out
|
||||
|
||||
base_dir=${pname}-${version}/test
|
||||
tar --extract "--file=${src}"
|
||||
|
||||
for test_dir in $base_dir/*/; do
|
||||
pushd $test_dir
|
||||
mkdocs build --site-dir=$out/$test_dir
|
||||
popd
|
||||
done
|
||||
|
||||
# Do some static checks on the generated content
|
||||
pushd $out/$base_dir
|
||||
# Non-existent variables
|
||||
cat debug/index.html | grep "another one: that"
|
||||
# File inclusion
|
||||
cat module/index.html | grep "part from an <em>included</em> file!"
|
||||
# Variable replacement
|
||||
cat module_dir/index.html | grep "total costs is 50 euros"
|
||||
# New syntax with square brackets
|
||||
cat new_syntax/index.html | grep "expensive"
|
||||
# General info on macros
|
||||
cat simple/index.html | grep "Macros Plugin Environment"
|
||||
''
|
||||
38
pkgs/development/python-modules/panasonic-viera/default.nix
Normal file
38
pkgs/development/python-modules/panasonic-viera/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, pycryptodome
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "panasonic-viera";
|
||||
version = "0.4.0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "panasonic_viera";
|
||||
inherit version;
|
||||
sha256 = "baad2db7958ddbc7288d0f1c50a9eeddd8b83f3d30ad14ac3f6c51fe953e0eb6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pycryptodome
|
||||
xmltodict
|
||||
];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "panasonic_viera" ];
|
||||
|
||||
meta = {
|
||||
description = "Library to control Panasonic Viera TVs";
|
||||
homepage = "https://github.com/florianholzapfel/panasonic-viera";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "0.1.1";
|
||||
version = "0.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jGKB2LYp2RGy+E76ZvRdOzPdT+7fL4ZTEilHDiXbAMw=";
|
||||
hash = "sha256-kvQOSy0PdI9zfo0w3merPdbKybBIQpxv5KZQ2GA/WtM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetgear";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "MatMaul";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-XGD1kA64rUC6WvG7VGX+f3g7fBvWqfA4ujiWAQzKeEA=";
|
||||
sha256 = "sha256-/JynomaMARuE3svTdnnczHmP839S0EXLbE7xG9dYEv0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvicare";
|
||||
version = "2.16.1";
|
||||
version = "2.16.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "somm15";
|
||||
repo = "PyViCare";
|
||||
rev = version;
|
||||
sha256 = "sha256-fBqFvMb6/dg8PU2JYrXbOonXnS64d4ij81dRb30bVRc=";
|
||||
sha256 = "sha256-BmDwLMe6uOCLcRHG5EcLsaWhnQ/sbtAdagYFXmqP3l8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version_config=True," 'version="${version}",' \
|
||||
--replace "'setuptools-git-versioning'" " "
|
||||
--replace "'setuptools-git-versioning<1.8.0'" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "siobrultech-protocols";
|
||||
version = "0.5.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sdwilsh";
|
||||
repo = "siobrultech-protocols";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bpWOfdwNHJXfKcANSu69YgXsxsfUhaH63/fXF6H+MNg=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"siobrultech_protocols.gem.api"
|
||||
"siobrultech_protocols.gem.protocol"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A Sans-I/O Python client library for Brultech Devices";
|
||||
homepage = "https://github.com/sdwilsh/siobrultech-protocols";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,18 +1,24 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, datasets
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, buildPythonPackage
|
||||
, rustPlatform
|
||||
, setuptools-rust
|
||||
, libiconv
|
||||
, numpy
|
||||
, datasets
|
||||
, openssl
|
||||
, pkg-config
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, rustPlatform
|
||||
, Security
|
||||
, setuptools-rust
|
||||
}:
|
||||
|
||||
let
|
||||
# See https://github.com/huggingface/tokenizers/blob/main/bindings/python/tests/utils.py for details
|
||||
# about URLs and file names
|
||||
robertaVocab = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-vocab.json";
|
||||
sha256 = "0m86wpkfb2gdh9x9i9ng2fvwk1rva4p0s98xw996nrjxs7166zwy";
|
||||
|
|
@ -49,33 +55,42 @@ let
|
|||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt";
|
||||
sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f";
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "tokenizers";
|
||||
version = "unstable-2021-08-13";
|
||||
version = "0.12.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "e7dd6436dd4a4ffd9e8a4f110ca68e6a38677cb6";
|
||||
sha256 = "1p7w9a43a9h6ys5nsa4g89l65dj11037p7a1lqkj4x1yc9kv2y1r";
|
||||
rev = "python-v${version}";
|
||||
hash = "sha256-XIXKgcqa6ToAH4OkyaaJALOS9F+sD8d5Z71RttRcIsw=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src sourceRoot;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "1yb4jsx6mp9jgd1g3mli6vr6mri2afnwqlmxq1rpvn34z6b3iw9q";
|
||||
sha256 = "sha256-Euvf0LNMa2Od+6gY1Ldge/7VPrH5mJoZduRRsb+lM/E=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/bindings/python";
|
||||
|
||||
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
setuptools-rust
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
]);
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Security
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -89,7 +104,7 @@ in buildPythonPackage rec {
|
|||
];
|
||||
|
||||
postUnpack = ''
|
||||
# Add data files for tests, otherwise tests attempt network access.
|
||||
# Add data files for tests, otherwise tests attempt network access
|
||||
mkdir $sourceRoot/tests/data
|
||||
( cd $sourceRoot/tests/data
|
||||
ln -s ${robertaVocab} roberta-base-vocab.json
|
||||
|
|
@ -103,24 +118,28 @@ in buildPythonPackage rec {
|
|||
ln -s ${openaiMerges} openai-gpt-merges.txt )
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
echo 'import multiprocessing; multiprocessing.set_start_method("fork")' >> tests/__init__.py
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"tokenizers"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Downloads data using the datasets module.
|
||||
# Downloads data using the datasets module
|
||||
"TestTrainFromIterators"
|
||||
# Those tests require more data
|
||||
"test_from_pretrained"
|
||||
"test_from_pretrained_revision"
|
||||
"test_continuing_prefix_trainer_mistmatch"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/huggingface/tokenizers";
|
||||
description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";
|
||||
homepage = "https://github.com/huggingface/tokenizers";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
|
|
@ -18,10 +18,10 @@ buildGoModule rec {
|
|||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nFHf+X7Onf06o3G77mrfszfrWGq65y3VJffkuAxXk50=";
|
||||
sha256 = "sha256-EZqWamNfv4+f1Ajm6StEdDLOwwWdJr1mrzd3+ba3YHI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nG0u5hZ/YRn+yUoEGTBo6ZdOp0e+sH6Jl9F+QhpfYAU=";
|
||||
vendorSha256 = "sha256-fADaYrGtg4B7XqD2MUMw30xfGT70Hx+iue79AIDsSRc=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ronn installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.25.1";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NQ+Tv3KUrvX+MWM1ZFmsJ4JKoSIpSBjGNiruJkRd6rE=";
|
||||
sha256 = "sha256-RlDvTabpW2DQHJe4wFYBBuNrkfKTYbyudoX26MyvGBQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clj-kondo";
|
||||
version = "2022.04.23";
|
||||
version = "2022.04.25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-TFDaIpsR1Q0510HZl31bB9jh9D3K0LspCARiE7QKLx0=";
|
||||
sha256 = "sha256-BqqeJQ7mBMofX6efJCSUr6qMZXubO9CuDiCNNNKT3DA=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ijq";
|
||||
version = "0.3.6";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~gpanders";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mPO3P+NGFIoHuvMFwj87S8H8LQx7QpfPy2zi91la2C0=";
|
||||
sha256 = "sha256-N4wrm0nUmQ0NTsLkomJrcSiYJWgFUEh1/yn3pagM9vI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HbrmfZ/P5bUF7Qio5L1sb/HAYk/tL2SOmxHCXvSw72I=";
|
||||
vendorSha256 = "sha256-DX8m5FsqMZnzk1wgJA/ESZl0QeDv3p9huF4h1HY9DIA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper scdoc ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2022.05.03-12.35.40";
|
||||
version = "2022.05.23-13.18.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5jh4umT93P53ufgdKYHNtiDJ1QpoJ8QpfAti0+tmvmc=";
|
||||
sha256 = "sha256-puoHuFk1ZF6pu5SFflL0Zn5Xe4j4be9eCG5svYMSf4I=";
|
||||
};
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
|
||||
sha256 = "b4984b5d8411542ec7d4732c950340d16e379ad76c40e57c3d41a8e7adda2faf";
|
||||
sha256 = "47da76d6b6438abf31f32f1e12ce4aca944fb4c88527a61f721f7928e58a2b38";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "betterlockscreen";
|
||||
version = "4.0.3";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pavanjadhaw";
|
||||
repo = "betterlockscreen";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d4uI/S7Kr8yvzc4/L0BX8+TBXb4AVNMJp4gb8uXgBwA=";
|
||||
sha256 = "sha256-ZZnwByxfESE8ZOOh1vnbphUHDolo9MIQh3erjtBLmWQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1026,7 +1026,8 @@
|
|||
greeclimate
|
||||
];
|
||||
"greeneye_monitor" = ps: with ps; [
|
||||
]; # missing inputs: greeneye_monitor
|
||||
greeneye-monitor
|
||||
];
|
||||
"greenwave" = ps: with ps; [
|
||||
]; # missing inputs: greenwavereality
|
||||
"group" = ps: with ps; [
|
||||
|
|
@ -1949,7 +1950,8 @@
|
|||
panacotta
|
||||
];
|
||||
"panasonic_viera" = ps: with ps; [
|
||||
]; # missing inputs: panasonic_viera
|
||||
panasonic-viera
|
||||
];
|
||||
"pandora" = ps: with ps; [
|
||||
pexpect
|
||||
];
|
||||
|
|
@ -3370,6 +3372,7 @@
|
|||
"gpslogger"
|
||||
"graphite"
|
||||
"gree"
|
||||
"greeneye_monitor"
|
||||
"group"
|
||||
"growatt_server"
|
||||
"guardian"
|
||||
|
|
@ -3548,6 +3551,7 @@
|
|||
"ovo_energy"
|
||||
"owntracks"
|
||||
"p1_monitor"
|
||||
"panasonic_viera"
|
||||
"panel_custom"
|
||||
"panel_iframe"
|
||||
"peco"
|
||||
|
|
|
|||
|
|
@ -270,7 +270,6 @@ in python.pkgs.buildPythonApplication rec {
|
|||
checkInputs = with python.pkgs; [
|
||||
# test infrastructure (selectively from requirement_test.txt)
|
||||
freezegun
|
||||
jsonpickle
|
||||
pytest-aiohttp
|
||||
pytest-freezegun
|
||||
pytest-mock
|
||||
|
|
@ -281,7 +280,6 @@ in python.pkgs.buildPythonApplication rec {
|
|||
requests-mock
|
||||
respx
|
||||
stdlib-list
|
||||
tqdm
|
||||
# required by tests/auth/mfa_modules
|
||||
pyotp
|
||||
] ++ lib.concatMap (component: getPackages component python.pkgs) [
|
||||
|
|
@ -305,6 +303,8 @@ in python.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# we neither run nor distribute hassfest
|
||||
"tests/hassfest"
|
||||
# we don't care about code quality
|
||||
"tests/pylint"
|
||||
# don't bulk test all components
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "timescaledb";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ postgresql openssl libkrb5 ];
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "timescale";
|
||||
repo = "timescaledb";
|
||||
rev = version;
|
||||
sha256 = "sha256-P0gdw6Ai5+6A/+bmlTkmKpy18UkbRgJN3wCzLQI5oMA=";
|
||||
sha256 = "sha256-h9mDa4dfr7ksIqd6OZg6L3jyiwPL+fmJJzoXFZH8mqM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
|
||||
|
|
|
|||
31
pkgs/servers/sql/postgresql/ext/wal2json.nix
Normal file
31
pkgs/servers/sql/postgresql/ext/wal2json.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, stdenv, fetchFromGitHub, bison, flex, postgresql }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wal2json";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eulerto";
|
||||
repo = "wal2json";
|
||||
rev = "wal2json_${builtins.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "sha256-EB+tCaILWsU9fDhqosl6EyMoYBd6SHISFfyxiZ9pNOk=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
makeFlags = [ "USE_PGXS=1" ];
|
||||
|
||||
installPhase = ''
|
||||
install -D -t $out/lib *.so
|
||||
install -D -t $out/share/postgresql/extension sql/*.sql
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PostgreSQL JSON output plugin for changeset extraction";
|
||||
homepage = "https://github.com/eulerto/wal2json";
|
||||
changelog = "https://github.com/eulerto/wal2json/releases/tag/wal2json_${version}";
|
||||
maintainers = with maintainers; [ euank ];
|
||||
platforms = postgresql.meta.platforms;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
@ -65,4 +65,6 @@ self: super: {
|
|||
repmgr = super.callPackage ./ext/repmgr.nix { };
|
||||
|
||||
rum = super.callPackage ./ext/rum.nix { };
|
||||
|
||||
wal2json = super.callPackage ./ext/wal2json.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.117";
|
||||
version = "3.0.119";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-iltyw2Qw7WSq96T/upGwSyjqWK8KOo/pK7HR+25n2js=";
|
||||
sha256 = "sha256-vvQevEEVu8ySnbSXoFxQZLa+yqml18duilmnefDsR+I=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-f3GXkAvTe8rPFWCR5TM4mDK/VOQWt2lrZrfJ/Wvw8Uc=";
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ let
|
|||
in
|
||||
with python.pkgs; buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2022.5.0";
|
||||
version = "2022.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ys4oGYZvOxKOLyeIFPR33L2uCAB1lybSo6nCIYFuA/0=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-pX84pXiRxg0HxB6rOuApqnzaFchmF4xHCGKk8suu4yA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "1.6.3";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CZU1pQixbv/Fvqy6lMLXNYWj+2/pplNq+IXloED1Pt8=";
|
||||
sha256 = "sha256-/vP8q2tWDR8EXDekpcONXIgdzRHh3mZzZGY04wb4aA0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
|
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
|||
done
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-5iAo8Gqvbba8W1KXtmFoKx+W1s3dwxR/T+v/R5+S38g=";
|
||||
cargoSha256 = "sha256-6y0Du3YGfH+SDbG3NdokJyG+Y1q5cI4UZp6XwFdvYxk=";
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boundary";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
|||
aarch64-darwin = "darwin_arm64";
|
||||
};
|
||||
sha256 = selectSystem {
|
||||
x86_64-linux = "sha256-cZ41+VwbTQ/X/A0+OL1ZVXVv3eu90H5kMLiHqyc3688=";
|
||||
aarch64-linux = "sha256-2svJx3rp0swyuXz3WCLRvDTRkweLMVIKrgYekcG8LdE=";
|
||||
x86_64-darwin = "sha256-zkSESscsapyoMlFdaTzmooOEjUTte8MDNIGVhy9knzc=";
|
||||
aarch64-darwin = "sha256-A7KNhTWuLjNaO2GyldCDquRur0i5KoXl6GZYQIqt0cI=";
|
||||
x86_64-linux = "sha256-JvWzDdslO1S/nVsIwvFAEhLo/kkHIE1AVwoI980LV4Y=";
|
||||
aarch64-linux = "sha256-IwD7iazbh94c9CZfFsg5t39D8oVWgpfXP1H0/GsTe3Y=";
|
||||
x86_64-darwin = "sha256-SkNSZVdbR6KW/vChDdvHMP+fGQp+mPVxKpEHb7BR4+4=";
|
||||
aarch64-darwin = "sha256-Mx9YhMk5eBgtDiYWPq7jfhrM3TjH0VCUE1QXycz5Cfc=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cfripper";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wep1hGYq0UUHeEL674N6cvGg9u9FqGqS0XCUZYUZGzs=";
|
||||
hash = "sha256-xDLzxe8lelHMU58SaThQ2NSfWDZ0DCYSHkiLPifxQGw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "scorecard";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ossf";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MTqXQCPmm2NoueVd3bbQlRz4pi2dOZ9l2EUfb60LwsM=";
|
||||
sha256 = "sha256-+aocaMnEDqaOjiCPmAxhf1tiqMN6DKo64N0ARMmY71E=";
|
||||
# populate values otherwise taken care of by goreleaser,
|
||||
# unfortunately these require us to use git. By doing
|
||||
# this in postFetch we can delete .git afterwards and
|
||||
|
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-JT1hoEm3eBjR5mlNJ+/tBpHIw6FSvFXC/nEVPkbIfq8=";
|
||||
vendorSha256 = "sha256-0VEo08lGVQ3ROdqFrpNVgdtfaKqNY4hhjZ0i3U52P4M=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@ with pkgs;
|
|||
|
||||
appthreat-depscan = callPackage ../development/tools/appthreat-depscan { };
|
||||
|
||||
activate-linux = callPackage ../applications/misc/activate-linux { };
|
||||
|
||||
authy = callPackage ../applications/misc/authy { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# This file defines the structure of the `config` nixpkgs option.
|
||||
|
||||
{ lib, ... }:
|
||||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
@ -33,6 +33,11 @@ let
|
|||
|
||||
/* Config options */
|
||||
|
||||
warnUndeclaredOptions = mkOption {
|
||||
description = "Whether to warn when <literal>config</literal> contains an unrecognized attribute.";
|
||||
default = false;
|
||||
};
|
||||
|
||||
doCheckByDefault = mkMassRebuild {
|
||||
feature = "run <literal>checkPhase</literal> by default";
|
||||
};
|
||||
|
|
@ -122,6 +127,20 @@ let
|
|||
|
||||
in {
|
||||
|
||||
freeformType =
|
||||
let t = lib.types.attrsOf lib.types.raw;
|
||||
in t // {
|
||||
merge = loc: defs:
|
||||
let r = t.merge loc defs;
|
||||
in r // { _undeclared = r; };
|
||||
};
|
||||
|
||||
inherit options;
|
||||
|
||||
config = {
|
||||
warnings = lib.optionals config.warnUndeclaredOptions (
|
||||
lib.mapAttrsToList (k: v: "undeclared Nixpkgs option set: config.${k}") config._undeclared
|
||||
);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,15 +79,13 @@ in let
|
|||
./config.nix
|
||||
({ options, ... }: {
|
||||
_file = "nixpkgs.config";
|
||||
# filter-out known options, FIXME: remove this eventually
|
||||
config = builtins.intersectAttrs options config1;
|
||||
config = config1;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
# take all the rest as-is
|
||||
config = lib.showWarnings configEval.config.warnings
|
||||
(config1 // builtins.removeAttrs configEval.config [ "_module" ]);
|
||||
config = lib.showWarnings configEval.config.warnings configEval.config;
|
||||
|
||||
# A few packages make a new package set to draw their dependencies from.
|
||||
# (Currently to get a cross tool chain, or forced-i686 package.) Rather than
|
||||
|
|
|
|||
|
|
@ -1165,6 +1165,8 @@ let
|
|||
|
||||
tcpip = callPackage ../development/ocaml-modules/tcpip { };
|
||||
|
||||
tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { };
|
||||
|
||||
tsort = callPackage ../development/ocaml-modules/tsort { };
|
||||
|
||||
tuntap = callPackage ../development/ocaml-modules/tuntap { };
|
||||
|
|
|
|||
|
|
@ -3700,6 +3700,8 @@ in {
|
|||
|
||||
green = callPackage ../development/python-modules/green { };
|
||||
|
||||
greeneye-monitor = callPackage ../development/python-modules/greeneye-monitor { };
|
||||
|
||||
greenlet = callPackage ../development/python-modules/greenlet { };
|
||||
|
||||
grequests = callPackage ../development/python-modules/grequests { };
|
||||
|
|
@ -5336,6 +5338,7 @@ in {
|
|||
|
||||
mkdocs = callPackage ../development/python-modules/mkdocs { };
|
||||
mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { };
|
||||
mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { };
|
||||
mkdocs-material = callPackage ../development/python-modules/mkdocs-material { };
|
||||
mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { };
|
||||
mkdocs-minify = callPackage ../development/python-modules/mkdocs-minify { };
|
||||
|
|
@ -6113,6 +6116,8 @@ in {
|
|||
|
||||
panacotta = callPackage ../development/python-modules/panacotta { };
|
||||
|
||||
panasonic-viera = callPackage ../development/python-modules/panasonic-viera { };
|
||||
|
||||
pandas = callPackage ../development/python-modules/pandas { };
|
||||
|
||||
pandas-datareader = callPackage ../development/python-modules/pandas-datareader { };
|
||||
|
|
@ -9557,6 +9562,8 @@ in {
|
|||
|
||||
signify = callPackage ../development/python-modules/signify { };
|
||||
|
||||
siobrultech-protocols = callPackage ../development/python-modules/siobrultech-protocols { };
|
||||
|
||||
siosocks = callPackage ../development/python-modules/siosocks { };
|
||||
|
||||
sip = callPackage ../development/python-modules/sip { };
|
||||
|
|
@ -10370,7 +10377,9 @@ in {
|
|||
|
||||
token-bucket = callPackage ../development/python-modules/token-bucket { };
|
||||
|
||||
tokenizers = toPythonModule (callPackage ../development/python-modules/tokenizers { });
|
||||
tokenizers = callPackage ../development/python-modules/tokenizers {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
tokenize-rt = toPythonModule (callPackage ../development/python-modules/tokenize-rt { });
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue