Merge master into haskell-updates
This commit is contained in:
commit
e1187af074
33 changed files with 158 additions and 93 deletions
|
@ -17,8 +17,8 @@ let
|
|||
|
||||
compressCmd = getAttr cfg.compression {
|
||||
"none" = "cat";
|
||||
"gzip" = "${pkgs.gzip}/bin/gzip -c";
|
||||
"zstd" = "${pkgs.zstd}/bin/zstd -c";
|
||||
"gzip" = "${pkgs.gzip}/bin/gzip -c -${toString cfg.compressionLevel}";
|
||||
"zstd" = "${pkgs.zstd}/bin/zstd -c -${toString cfg.compressionLevel}";
|
||||
};
|
||||
|
||||
mkSqlPath = prefix: suffix: "${cfg.location}/${db}${prefix}.sql${suffix}";
|
||||
|
@ -130,16 +130,33 @@ in {
|
|||
The type of compression to use on the generated database dump.
|
||||
'';
|
||||
};
|
||||
|
||||
compressionLevel = mkOption {
|
||||
type = types.ints.between 1 19;
|
||||
default = 6;
|
||||
description = ''
|
||||
The compression level used when compression is enabled.
|
||||
gzip accepts levels 1 to 9. zstd accepts levels 1 to 19.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
assertions = [{
|
||||
assertion = cfg.backupAll -> cfg.databases == [];
|
||||
message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
|
||||
}];
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.backupAll -> cfg.databases == [];
|
||||
message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
|
||||
}
|
||||
{
|
||||
assertion = cfg.compression == "none" ||
|
||||
(cfg.compression == "gzip" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 9) ||
|
||||
(cfg.compression == "zstd" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 19);
|
||||
message = "config.services.postgresqlBackup.compressionLevel must be set between 1 and 9 for gzip and 1 and 19 for zstd";
|
||||
}
|
||||
];
|
||||
}
|
||||
(mkIf cfg.enable {
|
||||
systemd.tmpfiles.rules = [
|
||||
|
|
|
@ -1,20 +1,24 @@
|
|||
{ lib, stdenv, fetchurl, ncurses }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hexedit";
|
||||
version = "1.2.13";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://rigaux.org/${pname}-${version}.src.tgz";
|
||||
sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixel";
|
||||
repo = "hexedit";
|
||||
rev = version;
|
||||
sha256 = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "View and edit files in hexadecimal or in ASCII";
|
||||
homepage = "http://prigaux.chez.com/hexedit.html";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
homepage = "http://rigaux.org/hexedit.html";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ delroth ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "102.0-2",
|
||||
"packageVersion": "102.0.1-1",
|
||||
"source": {
|
||||
"rev": "102.0-2",
|
||||
"sha256": "1gr17sk9ans6f2w3y6zr2cy5pz84br2b0kfi9pqz58yjz94q7jm2"
|
||||
"rev": "102.0.1-1",
|
||||
"sha256": "10f9gngn04nwrhcqkdznx7209c4javscqz8arswyrn4c8rc5x6w5"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "102.0",
|
||||
"sha512": "c7dd6d8d74c46573b16d097a5e5d230669e5778cd680b3b6f30510e989d21543138ced3bb013998b76614aa380b28efd8542450c591d8b724e03bd163d012057"
|
||||
"version": "102.0.1",
|
||||
"sha512": "a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -49,12 +49,6 @@ in
|
|||
rec {
|
||||
mkKops = generic;
|
||||
|
||||
kops_1_21 = mkKops rec {
|
||||
version = "1.21.4";
|
||||
sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_22 = mkKops rec {
|
||||
version = "1.22.4";
|
||||
sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE=";
|
||||
|
@ -66,4 +60,11 @@ rec {
|
|||
sha256 = "sha256-9GANjGRS9QaJw+CEeMv/f+rEu37QV2YxMvSRSH6+3PM=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_24 = mkKops rec {
|
||||
version = "1.24.0";
|
||||
sha256 = "sha256-4vvmwqsRSu8hZZE7fZUTv9v19wRtJvA5IX5w9jr5pEI=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
, pango
|
||||
, cairo
|
||||
, readline
|
||||
, libsysprof-capture
|
||||
, glib
|
||||
, libxml2
|
||||
, dbus
|
||||
|
@ -60,6 +61,7 @@ in stdenv.mkDerivation rec {
|
|||
gobject-introspection
|
||||
cairo
|
||||
readline
|
||||
libsysprof-capture
|
||||
spidermonkey_91
|
||||
dbus # for dbus-run-session
|
||||
];
|
||||
|
@ -73,7 +75,6 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dprofiler=disabled"
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
];
|
||||
|
||||
|
|
|
@ -13,26 +13,26 @@ let
|
|||
url = "https://download.fcitx-im.org/data/table.tar.gz";
|
||||
sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1";
|
||||
};
|
||||
arpaVer = "20140820";
|
||||
arpaVer = "20220630";
|
||||
arpa = fetchurl {
|
||||
url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2";
|
||||
sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm";
|
||||
url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz";
|
||||
sha256 = "sha256-jTsPqPoWuT0NRZDwLaBAKcJxNktZJcHJAoRcN0oqAL8=";
|
||||
};
|
||||
dictVer = "20211021";
|
||||
dictVer = "20220706";
|
||||
dict = fetchurl {
|
||||
url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz";
|
||||
sha256 = "sha256-MAWX5vf3n3iEgP1mXeige/6QInBItafjn0D0OmKpgd8=";
|
||||
url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz";
|
||||
sha256 = "sha256-vNeR//eDr7QMHI6S2z+Dc0+Lk8nGriwV4eqHeLkHB3k=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libime";
|
||||
version = "1.0.12";
|
||||
version = "unstable-2022-07-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "libime";
|
||||
rev = version;
|
||||
sha256 = "sha256-7zm0eQgOZk7PYCBqq6FmPGIz1ZaVlEaT9QM5clhovuQ=";
|
||||
rev = "1adb14eb0617ef0eb0f07ad99684f43ca8a4395c";
|
||||
sha256 = "sha256-UldswsnkMuJh2G/EdsFl4CS7Y2RSRAb1hYeWUA2MHPw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, pytest, nose, glibcLocales
|
||||
, pytestCheckHook, nose, glibcLocales, fetchpatch
|
||||
, numpy, scipy, matplotlib, h5py }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -15,15 +15,28 @@ buildPythonPackage rec {
|
|||
sha256 = "ed0057dc22bd392df4b3bba23536117e1b2866e3201b12c5a37428d23421a5ba";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest nose glibcLocales ];
|
||||
patches = [
|
||||
# Change from scipy to locally defined epsilon
|
||||
# https://github.com/bayespy/bayespy/pull/126
|
||||
(fetchpatch {
|
||||
name = "locally-defined-epsilon.patch";
|
||||
url = "https://github.com/bayespy/bayespy/commit/9be53bada763e19c2b6086731a6aa542ad33aad0.patch";
|
||||
sha256 = "sha256-KYt/0GcaNWR9K9/uS2OXgK7g1Z+Bayx9+IQGU75Mpuo=";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook nose glibcLocales ];
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy matplotlib h5py ];
|
||||
|
||||
checkPhase = ''
|
||||
LC_ALL=en_US.utf-8 pytest -k 'not test_message_to_parents'
|
||||
'';
|
||||
disabledTests = [
|
||||
# Assertion error
|
||||
"test_message_to_parents"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "bayespy" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
homepage = "http://www.bayespy.org";
|
||||
description = "Variational Bayesian inference tools for Python";
|
||||
license = licenses.mit;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.16.8";
|
||||
version = "1.16.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-l98QfrRg7ghZ+jT9J2BNILUcinOKwhpnIMS+W8NQFr4=";
|
||||
sha256 = "sha256-1xxjFNkCb50ndmXuRjt7svPOvSyzZbw+J49Zpyy1FUc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "0.0.18";
|
||||
version = "0.0.23";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -22,8 +22,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jS+96LjHJyhkCREjMhhlWOlvRBhjiKmfNtEcBVS+YCU=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4npImK6OML0/nhM+S7YiguN7RNHOnxnH+WAuqcdiVSw=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinfra";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "Fizzadar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-frjPxSATvXgeACT4kThoiPu04Ez8bs8FIPdf5PVuiSg=";
|
||||
hash = "sha256-G0ApoSBs8RRq/sKxyyCB7uCIFNccDMMCqPMIAHuJLCI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyupgrade";
|
||||
version = "2.34.0";
|
||||
version = "2.37.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3Go0w/7jcv1XzZ7ypSdPzMZgzEj2+sMlrIm4X1r34MA=";
|
||||
sha256 = "sha256-nWiaKfs2eVnwyA+UACcB/OImWSb5Nn6n/8gcGPNevM4=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddnet";
|
||||
version = "16.2";
|
||||
version = "16.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddnet";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-VQISfScZ11DYiZhQVc8EvXYEAN2/580peP34bBTuXPo=";
|
||||
sha256 = "sha256-xDUvBsiQk7qZN9HEMCrCfxJSCZ/PruEdS5EjnHFufTA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpuid";
|
||||
version = "20220224";
|
||||
version = "20220620";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
|
||||
sha256 = "sha256-ShneKhGK7kT4Vs0b7PpaGSV0tZV3lTcqhuN9yiTaH50=";
|
||||
sha256 = "sha256-kVmhwJWm5ExspjBsUIC/4qe83iXo3Bbwb1+HTXcyyxo=";
|
||||
};
|
||||
|
||||
# For pod2man during the build process.
|
||||
|
|
|
@ -21,6 +21,7 @@ crystal.buildCrystalPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "iv-org";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
inherit (versions.invidious) rev sha256;
|
||||
};
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ info "Running scripts/fetch-player-dependencies.cr..."
|
|||
git -C "$git_dir" reset --hard "$new_rev"
|
||||
(cd "$git_dir" && crystal run scripts/fetch-player-dependencies.cr -- --minified)
|
||||
rm -f "$git_dir/assets/videojs/.gitignore"
|
||||
videojs_new_sha256=$(nix hash-path --type sha256 --base32 "$git_dir/assets/videojs")
|
||||
videojs_new_sha256=$(nix-hash --type sha256 --base32 "$git_dir/assets/videojs")
|
||||
json_set '.videojs.sha256' "$videojs_new_sha256"
|
||||
|
||||
if git -C "$git_dir" diff-tree --quiet "${old_rev}..${new_rev}" -- 'shard.lock'; then
|
||||
|
|
|
@ -4,9 +4,9 @@
|
|||
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
|
||||
},
|
||||
"invidious": {
|
||||
"rev": "ca27e096f3249533cc7a9b123a8a8378f3312bb7",
|
||||
"sha256": "0xjdzxnw6b5lk8pr82sjj60wfzxqkyamh0gpf2wxby52jvlbdcka",
|
||||
"version": "unstable-2022-05-11"
|
||||
"rev": "cbcf31a4f98706ea675cafb7509b37dc2b0ceace",
|
||||
"sha256": "sha256-RliUNAOsU3ewyUl8hz4hvtlk7ztexW9Bl/N1vKLc6Dg=",
|
||||
"version": "unstable-2022-07-10"
|
||||
},
|
||||
"lsquic": {
|
||||
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",
|
||||
|
|
22
pkgs/tools/admin/wander/default.nix
Normal file
22
pkgs/tools/admin/wander/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wander";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robinovitch61";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z3jvKBhzlATTh6zPoJoMmg/DAE5/Ur3Tb3sdgGPEm6k=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gWQ8GbtghhCRq6tOU6qmWBuponmfUkUDAk3+dPtmMiE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal app/TUI for HashiCorp Nomad";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/robinovitch61/wander";
|
||||
maintainers = teams.c3d2.members;
|
||||
};
|
||||
}
|
|
@ -41,13 +41,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5";
|
||||
version = "5.0.17";
|
||||
version = "5.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-N98LhzfeCenjmHEva5PBeiLE/xNOdNT/6WA8Fe+O64c=";
|
||||
sha256 = "sha256-ZhjNUWzi74lr8Wtf0f+VN1kc9C6q2TJ9ogXeu3NJKbI=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-chewing";
|
||||
version = "5.0.11";
|
||||
version = "5.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-w5ogK0jjvAEslXiCJvuhsS+z/Afy1KqDG7PzRQ+CMkY=";
|
||||
sha256 = "sha256-3VC6hp8WN6Ttfw5TcpgjTUYxXJxmU6SUw7ZfjR+Laig=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -31,13 +31,13 @@ in
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-chinese-addons";
|
||||
version = "5.0.13";
|
||||
version = "5.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-umtt1xOgOEGVYVH0y/qRy3ihtKsVxYGvMGi4WFI9beY=";
|
||||
sha256 = "sha256-ZIOPzRXW+aaVKDIBC3N04wx662r8WOa205CgTeYmudQ=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -14,18 +14,20 @@
|
|||
, xkeyboardconfig
|
||||
, libxkbfile
|
||||
, libXdmcp
|
||||
, plasma5Packages
|
||||
, plasma-framework
|
||||
, kcmSupport ? true
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-configtool";
|
||||
version = "5.0.13";
|
||||
version = "5.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sh3hd4hpqKKHdE8n5jf2v09ch2xUCCmapkp5tkeylKA=";
|
||||
sha256 = "sha256-nfVdYW//ehjTFvb5ciu7ajoUB5NPZ/BkLkChJiBJPWY=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -50,6 +52,8 @@ mkDerivation rec {
|
|||
] ++ lib.optionals kcmSupport [
|
||||
kdeclarative
|
||||
kwidgetsaddons
|
||||
plasma5Packages.kiconthemes
|
||||
plasma-framework
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-gtk";
|
||||
version = "5.0.15";
|
||||
version = "5.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Vm2Un4PZugATjDz+mcEOnoapw3yyVf8Q55f5LO6juCU=";
|
||||
sha256 = "sha256-gdYtQyCczJOGkCjl7fVCjcKkhEW3wDO5HDYNfMhnb1g=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-hangul";
|
||||
version = "5.0.9";
|
||||
version = "5.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jT9k5QXW3fdG6s91NjFZ3lrjADy8wxf2SRiVDSnr6So=";
|
||||
sha256 = "sha256-Hjnt9E24u1ycKreZf6Nb8cH7S3JKRlLSYAxhA11DMjs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-lua";
|
||||
version = "5.0.8";
|
||||
version = "5.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-VHGHKV5KLbfIMWLErLRNl8pOQOkYkc/f6VjZUSqluFk=";
|
||||
sha256 = "sha256-XeRMPbatXUudxo1EICL7z8V3slxkzo27f+D4xLjRtU4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-m17n";
|
||||
version = "5.0.9";
|
||||
version = "5.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-JySEzWyPZqVrvgRA4Hc0ZSGLdS29n8uoSQsFEMK6kbs=";
|
||||
sha256 = "sha256-u4rW89ofuKYCn+NcvdIy0eU+lZ7Lp9kp/d0NdHW2V1s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-qt";
|
||||
version = "5.0.13";
|
||||
version = "5.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eX0tdNFGFiWrxBgghSGLHzKhK/eQ6DLLu7+ggNqTScg=";
|
||||
sha256 = "sha256-LmE6HgNLoJmgJtJmubAIjFi8Xpnmw3hgqJh6HUcakzg=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-rime";
|
||||
version = "5.0.13";
|
||||
version = "5.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/oQdBCDV5obSHw7dzdceC+zWHcNve3NDlA50GhvkK8o=";
|
||||
sha256 = "sha256-EvYNeBmP2c+kDQ4GQU0SyGhxK4jolxMmhAaoVyINmfg=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-extra";
|
||||
version = "5.0.10";
|
||||
version = "5.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fKT1nCr6kAFJEdacff4qBr3uI5fvIwMDPkHVFGTQf10=";
|
||||
sha256 = "sha256-tn493mSC+bvCgbKV1j+HV0Oh7n1ZufZoOccpK2i0JeY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-other";
|
||||
version = "5.0.9";
|
||||
version = "5.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-y/OY7m136VQvK75079OTFqLLR2o0NCIc5llljrJ91DU=";
|
||||
sha256 = "sha256-jdc1W8aLkR2VcpjiEOJNApxNGgNqWreEBkW1pjuy1WU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-unikey";
|
||||
version = "5.0.10";
|
||||
version = "5.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-unikey";
|
||||
rev = version;
|
||||
sha256 = "sha256-gGKLv+IUcLOE3jHDzK7oX2R76cUT9VXaVFGEyNN0tV4=";
|
||||
sha256 = "sha256-pFFxTk97m/ThSrJglY+tSjjKCzXbj2EukdPg8fckoDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
with python3Packages;
|
||||
buildPythonPackage rec {
|
||||
pname = "pre-commit";
|
||||
version = "2.19.0";
|
||||
version = "2.20.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "pre-commit";
|
||||
repo = "pre-commit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5YV0FJhHiq/NJFKYvwddIWUQVxKJpnIJLLNmyY0NX4A=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-+JrnJz+wFbzVw9ysPX85DDE6suF3VU7gQZdp66x5TKY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wluma";
|
||||
version = "4.1.0";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximbaz";
|
||||
|
@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-kUYh4RmD4zRI3ZNZWl2oWcO0Ze5czLBXUgPMl/cLW/I=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0AeFFJd/eMuT1eNY+Vq8MEyItKNBsAlhKKa6CsttMIY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pkg-config
|
||||
|
@ -37,8 +39,6 @@ rustPlatform.buildRustPackage rec {
|
|||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}"
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-oOIL18gij7DdvgNOuaHtuyFemNBUB85Ouh/sdhKas+s=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatic brightness adjustment based on screen contents and ALS";
|
||||
homepage = "https://github.com/maximbaz/wluma";
|
||||
|
|
|
@ -11644,6 +11644,8 @@ with pkgs;
|
|||
|
||||
wal_e = callPackage ../tools/backup/wal-e { };
|
||||
|
||||
wander = callPackage ../tools/admin/wander { };
|
||||
|
||||
watchexec = callPackage ../tools/misc/watchexec {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
|
||||
};
|
||||
|
@ -34643,11 +34645,11 @@ with pkgs;
|
|||
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
|
||||
inherit (callPackage ../applications/networking/cluster/kops {})
|
||||
mkKops
|
||||
kops_1_21
|
||||
kops_1_22
|
||||
kops_1_23
|
||||
kops_1_24
|
||||
;
|
||||
kops = kops_1_23;
|
||||
kops = kops_1_24;
|
||||
|
||||
lguf-brightness = callPackage ../misc/lguf-brightness { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue