Merge master into staging-next

This commit is contained in:
github-actions[bot]
2023-09-13 18:01:09 +00:00
committed by GitHub
72 changed files with 9291 additions and 17330 deletions
+6
View File
@@ -18135,6 +18135,12 @@
githubId = 90482;
name = "Viktor Nordling";
};
vilsol = {
email = "me@vil.so";
github = "vilsol";
githubId = 1759390;
name = "Vilsol";
};
viluon = {
email = "nix@viluon.me";
github = "viluon";
+4 -4
View File
@@ -239,12 +239,12 @@ foreach my $u (@{$spec->{users}}) {
chmod oct($u->{homeMode}), $u->{home};
}
if (defined $u->{passwordFile}) {
if (-e $u->{passwordFile}) {
$u->{hashedPassword} = read_file($u->{passwordFile});
if (defined $u->{hashedPasswordFile}) {
if (-e $u->{hashedPasswordFile}) {
$u->{hashedPassword} = read_file($u->{hashedPasswordFile});
chomp $u->{hashedPassword};
} else {
warn "warning: password file $u->{passwordFile} does not exist\n";
warn "warning: password file $u->{hashedPasswordFile} does not exist\n";
}
} elsif (defined $u->{password}) {
$u->{hashedPassword} = hashPassword($u->{password});
+1 -1
View File
@@ -264,7 +264,7 @@ let
};
passwordFile = mkOption {
type = with types; nullOr (passwdEntry str);
type = with types; nullOr str;
default = null;
visible = false;
description = lib.mdDoc "Deprecated alias of hashedPasswordFile";
+3 -11
View File
@@ -2,17 +2,9 @@
{
options.programs.clash-verge = {
enable = lib.mkEnableOption (lib.mdDoc ''
Clash Verge.
'');
autoStart = lib.mkEnableOption (lib.mdDoc ''
Clash Verge Auto Launch.
'');
tunMode = lib.mkEnableOption (lib.mdDoc ''
Clash Verge Tun Mode.
'');
enable = lib.mkEnableOption (lib.mdDoc "Clash Verge");
autoStart = lib.mkEnableOption (lib.mdDoc "Clash Verge auto launch");
tunMode = lib.mkEnableOption (lib.mdDoc "Clash Verge TUN mode");
};
config =
+1 -1
View File
@@ -32,7 +32,7 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
};
users.berta = {
isNormalUser = true;
hashedPassword = hashed_bcrypt;
hashedPasswordFile = (pkgs.writeText "hashed_bcrypt" hashed_bcrypt).outPath;
shell = pkgs.bash;
};
users.yesim = {
File diff suppressed because it is too large Load Diff
@@ -337,12 +337,12 @@
};
dart = buildGrammar {
language = "dart";
version = "0.0.0+rev=bcef6d5";
version = "0.0.0+rev=7e447dc";
src = fetchFromGitHub {
owner = "UserNobody14";
repo = "tree-sitter-dart";
rev = "bcef6d57d0dd4df37bc9d8b1920ea4963c724826";
hash = "sha256-wTeHw/7og4GJSXISCBSL6foxzecFFB/fK03bzGup0sM=";
rev = "7e447dc18a2d293498670fb5ea16138648c883e5";
hash = "sha256-BCWtpTgEv/3ahiflK3wHmnhHjTmtmvJxHGo2X7FggsE=";
};
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
};
@@ -436,6 +436,17 @@
location = "crates/tree-sitter-ebnf";
meta.homepage = "https://github.com/RubixDev/ebnf";
};
eds = buildGrammar {
language = "eds";
version = "0.0.0+rev=fde6202";
src = fetchFromGitHub {
owner = "uyha";
repo = "tree-sitter-eds";
rev = "fde62029d4c715562230070b9af51a9500c2ce10";
hash = "sha256-E+VDOAnmbyUXzwhu+j2DXXBpuiI/d9gZdGsikAboLP4=";
};
meta.homepage = "https://github.com/uyha/tree-sitter-eds";
};
eex = buildGrammar {
language = "eex";
version = "0.0.0+rev=f742f2f";
@@ -460,12 +471,12 @@
};
elm = buildGrammar {
language = "elm";
version = "0.0.0+rev=b075803";
version = "0.0.0+rev=0694058";
src = fetchFromGitHub {
owner = "elm-tooling";
repo = "tree-sitter-elm";
rev = "b075803c445191af3cf7dbfdc84efef5f5bbc0f5";
hash = "sha256-KtijU8ZODsqcNZc4Roh0AILaBWFs+D1cnSUfwQlEx84=";
rev = "0694058bf0555adbf5f700ce4868d18e463cb824";
hash = "sha256-xalcXMXRHcpwhKLMF6p9y5lzC0ek/ljRq2Vnb1VwXBo=";
};
meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm";
};
@@ -680,12 +691,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=a59aadf";
version = "0.0.0+rev=297031d";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a";
hash = "sha256-HZJGKJ5KGcNIW6VEKHZLi9ai2bhklCNlbYAyz232+Ek=";
rev = "297031dce60e07acf90345d62777623469e46027";
hash = "sha256-/LieoIseeZwQttCHnAOfwWRpCmBnUdWTcGwSOyjHexg=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@@ -702,12 +713,12 @@
};
glsl = buildGrammar {
language = "glsl";
version = "0.0.0+rev=4296be4";
version = "0.0.0+rev=64e786e";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
rev = "4296be48e59be05284be2f79d62b155b61b20518";
hash = "sha256-AimWXes1VTmFELDsTwYpZdyHsdBOL0rfg8ScauWvWQM=";
rev = "64e786e36398b1e18ccfdbfd964d922a67392ebc";
hash = "sha256-6G5j3xfkbcFjAT6OWQyTgeryJEW2SSnyOhedF0QPmSw=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
};
@@ -878,12 +889,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=45e60a6";
version = "0.0.0+rev=d698c21";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "45e60a69b4dac922d81474b5d6fa88b4e5387b21";
hash = "sha256-qQqgiFJAX3hT1ecvKJ6fssWvtkT8i3IdRVBt6L0coI4=";
rev = "d698c21dbfcfa1df84cdaaf9dba32cba1e4f92b4";
hash = "sha256-oFpoErrhr83yG5c3IksjL/XjmsCrZGTP6+Sfu5fvOZM=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@@ -1153,23 +1164,23 @@
};
llvm = buildGrammar {
language = "llvm";
version = "0.0.0+rev=d47c95d";
version = "0.0.0+rev=1b96e58";
src = fetchFromGitHub {
owner = "benwilliamgraham";
repo = "tree-sitter-llvm";
rev = "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc";
hash = "sha256-CK7f0qSAsec2cuQElXLFRQ5uiQLGCyEpNIKTIDwbBrU=";
rev = "1b96e58faf558ce057d4dc664b904528aee743cb";
hash = "sha256-9OCiD7Hotl7EYoggX0lArwFvK2OZisBUsX7xv8+Ig+o=";
};
meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
};
lua = buildGrammar {
language = "lua";
version = "0.0.0+rev=88e4464";
version = "0.0.0+rev=9668709";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "tree-sitter-lua";
rev = "88e446476a1e97a8724dff7a23e2d709855077f2";
hash = "sha256-w+WVQHPiS/xyRz0obdJoUHZ7QzIDAvgtSzmE98yDORY=";
rev = "9668709211b2e683f27f414454a8b51bf0a6bda1";
hash = "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc=";
};
meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
};
@@ -1907,6 +1918,17 @@
};
meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy";
};
snakemake = buildGrammar {
language = "snakemake";
version = "0.0.0+rev=65a6c3b";
src = fetchFromGitHub {
owner = "osthomas";
repo = "tree-sitter-snakemake";
rev = "65a6c3b4671877821082164da0a310851b211953";
hash = "sha256-NfbRqT3wB6gncrbL/Kx2Qtk7k5lXK2KwdQ4aOV0Acx8=";
};
meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake";
};
solidity = buildGrammar {
language = "solidity";
version = "0.0.0+rev=1680203";
@@ -1931,12 +1953,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=6fa7161";
version = "0.0.0+rev=39750c4";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "6fa716163fcf183e4938c75f427379ceba881fbe";
hash = "sha256-AmfWf7qJyoUVBLxZuIdNSWP1C7GAcKeO9EoV3HFUzwI=";
rev = "39750c48bf9ad63bcc1399554355b0aa0aaa1c33";
hash = "sha256-33GpCN9qdCvCcYvE60HMzFM2QzUDbf2QxJDZ6L+q27Y=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@@ -1964,12 +1986,12 @@
};
strace = buildGrammar {
language = "strace";
version = "0.0.0+rev=ef4a74c";
version = "0.0.0+rev=0dc85e4";
src = fetchFromGitHub {
owner = "sigmaSd";
repo = "tree-sitter-strace";
rev = "ef4a74c43565572db9c06596d99ccb0210db13e5";
hash = "sha256-H/zu440AcF1l0yW4a3PEMfUMsJUxW0UEohOQPlX1rD0=";
rev = "0dc85e4cfcd0cc4b33f855ddb782d81d1297bf6e";
hash = "sha256-JK5+HlCELcBD2Af4uNNoBMYecDGnwcoTqdZr5mKBq+Q=";
};
meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace";
};
@@ -2008,12 +2030,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=29541ac";
version = "0.0.0+rev=10eb01d";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "29541ac9bbe2090de75d0b1e70360b85bbda1fef";
hash = "sha256-jT7SdhxX5AlZP33oH7NISV+HvJwQwsXMXDWzHorgnIc=";
rev = "10eb01d29827f24b1271672e89790661d94da9e1";
hash = "sha256-5oHc2mGxOuvFQ1h1FEK0oJ7PYnKayoJSVHeuYleVE8o=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2042,12 +2064,12 @@
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=6da5e3c";
version = "0.0.0+rev=c17070b";
src = fetchFromGitLab {
owner = "xasc";
repo = "tree-sitter-t32";
rev = "6da5e3cbabd376b566d04282005e52ffe67ef74a";
hash = "sha256-BRDlNZolMurXpUqnFbS+7ADTcuBthGDYVr6wBn9PIr4=";
rev = "c17070b014d02319b4cc335d28651926b0ee5ed6";
hash = "sha256-j1r++0Nff/slHJvOad289kFzlBIN2uuuEYrHJOGmTEc=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
};
@@ -2280,12 +2302,12 @@
};
vhs = buildGrammar {
language = "vhs";
version = "0.0.0+rev=fec6e98";
version = "0.0.0+rev=375b42e";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "tree-sitter-vhs";
rev = "fec6e981b7795b68262ddf229d73d2aa03a89b9a";
hash = "sha256-vGRmIFWUXSG3uDpKPcxALndV7gWiQ2nG4BOGL05oZ6U=";
rev = "375b42e9845f704dd491c17c7e37f7c972e0faf3";
hash = "sha256-A9m0MNAINMbrNr3BYBU/WMtC5edXWCaxvcfCwDFe8p4=";
};
meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs";
};
@@ -2346,12 +2368,12 @@
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=f1446e7";
version = "0.0.0+rev=899ebde";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "f1446e78183df1d12f864c3e514b24c1b00c0a47";
hash = "sha256-f19KOuce+Ls/Mmb0hnxVrDOc4mdZ4m9SsiZlgGuh1bk=";
rev = "899ebde73fac14dafc76a28d2bb6885d7bc5825e";
hash = "sha256-fAaA9XhnFILa/5P1ZufQufwuksXx4DbePTfb/WWyRsk=";
};
location = "libs/tree-sitter-wing";
generate = true;
@@ -978,7 +978,7 @@ self: super: {
pname = "sg-nvim-rust";
inherit (old) version src;
cargoHash = "sha256-1mb99WtELS64kfA2exUlVLzOj82xkFhWx0JHayosZL0=";
cargoHash = "sha256-JwEOfxGH2wiFkdepxBsUYrpQ2kMV6koqpkD7s+gbWw8=";
nativeBuildInputs = [ pkg-config ];
@@ -40,6 +40,7 @@ https://github.com/ycm-core/YouCompleteMe/,,
https://github.com/vim-scripts/a.vim/,,
https://github.com/mileszs/ack.vim/,,
https://github.com/eikenb/acp/,,
https://github.com/aznhe21/actions-preview.nvim/,,
https://github.com/Mofiqul/adwaita.nvim/,HEAD,
https://github.com/stevearc/aerial.nvim/,,
https://github.com/Numkil/ag.nvim/,,
@@ -349,6 +350,7 @@ https://github.com/Yggdroot/hiPairs/,,
https://github.com/tzachar/highlight-undo.nvim/,HEAD,
https://git.sr.ht/~soywod/himalaya-vim,,
https://github.com/mpickering/hlint-refactor-vim/,,
https://github.com/calops/hmts.nvim/,,
https://github.com/edluffy/hologram.nvim/,,
https://github.com/urbit/hoon.vim/,,
https://github.com/phaazon/hop.nvim/,,
@@ -617,6 +619,7 @@ https://github.com/LhKipp/nvim-nu/,HEAD,
https://github.com/ojroques/nvim-osc52/,,
https://github.com/gennaro-tedesco/nvim-peekup/,,
https://github.com/yorickpeterse/nvim-pqf/,HEAD,
https://github.com/jamestthompson3/nvim-remote-containers/,HEAD,
https://github.com/olrtg/nvim-rename-state/,HEAD,
https://github.com/petertriho/nvim-scrollbar/,HEAD,
https://github.com/dstein64/nvim-scrollview/,,
@@ -748,6 +751,7 @@ https://github.com/lotabout/skim.vim/,,
https://github.com/mopp/sky-color-clock.vim/,,
https://github.com/kovisoft/slimv/,,
https://github.com/mrjones2014/smart-splits.nvim/,,
https://github.com/m4xshen/smartcolumn.nvim/,,
https://github.com/gorkunov/smartpairs.vim/,,
https://github.com/ibhagwan/smartyank.nvim/,,
https://github.com/camspiers/snap/,,
@@ -800,6 +804,7 @@ https://github.com/vim-scripts/taglist.vim/,,
https://github.com/wellle/targets.vim/,,
https://github.com/tools-life/taskwiki/,,
https://github.com/tomtom/tcomment_vim/,,
https://github.com/renerocksai/telekasten.nvim/,,
https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
https://github.com/nvim-telescope/telescope-cheat.nvim/,,
https://github.com/fannheyward/telescope-coc.nvim/,,
@@ -418,7 +418,7 @@ rec {
forceShare = [ "man" "info" ];
nativeBuildInputs = oldAttrs.nativeBuildInputs or []
++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
vimCommandCheckHook vimGenDocHook
# many neovim plugins keep using buildVimPlugin
neovimRequireCheckHook
@@ -700,8 +700,8 @@ let
mktplcRef = {
name = "ruff";
publisher = "charliermarsh";
version = "2023.34.0";
sha256 = "sha256-KOntjiE+n1yf9047XDldGg2pT+zknI/aEg6h71LwEB8=";
version = "2023.38.0";
sha256 = "sha256-Gcw+X8e8MrTflotHUwkrdP/DD/6AX/kEgtRiqvqyqRM=";
};
meta = {
license = lib.licenses.mit;
+8 -8
View File
@@ -30,21 +30,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0j3lmyj77qalhn8hrgfg3zgw6jqv8rscfy16vhkl0ir2xnmb19jf";
x86_64-darwin = "06dx8lhw1cqignv06pcjjv8v743kr8bck1iqgl1881jmqyhggi4f";
aarch64-linux = "0nyd452wcp5qw2cx1zj89v4fgk3jvbk3hhiix9a0gv150q48vyfa";
aarch64-darwin = "1yfbsfnkjbf99yl1dcflpyxppa9mhnxigyyplz0jaqgpwmhs2s0b";
armv7l-linux = "1miz95rz2fdw7xplflnydzq57hnz894xg29mhpywwiib8kypfrm7";
x86_64-linux = "1gqpsgg6fsfssn03213sn31qcb5xnfnn3hd5g8j2mxfd0dyjgyir";
x86_64-darwin = "0h0mj3vdnwcdxk9cnss4v8mmcfhm1yknm1al8c2047wjsj8w4jmm";
aarch64-linux = "0qrph1a0cbr7sqx0qv4v05himsphlpwd1lgyliwqxzl8yxka8nwv";
aarch64-darwin = "0mjqy08v0idck7a05w8rinfccg7vn50z6b0jrvp2m5q2122c0rcc";
armv7l-linux = "1gp29rzc2iyl7vw2hlfjn5770mfpa6n9vc3f776msdxwrsia6xg9";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.81.1";
version = "1.82.0";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
rev = "6c3e3dba23e8fadc360aed75ce363ba185c49794";
rev = "8b617bd08fd9e3fc94d14adb8d358b56e3f72314";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
sha256 = "1xfyl81d5l2bl7k4vz4rnj84j1ijwv90sqgv9lnqzza2dfckfd6m";
sha256 = "192af63q9nklgsai71bss2bisc4wip1gbzmlpdvcjpi1hkspab2v";
};
};
@@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0wx53ajjwil82s3nl6wvpdf01mh33yqasf1ia54s1rfzz10fa1m6";
x86_64-darwin = "1avq0xlhsnxf6yfay1czi0rc0hy47ahj25rg07mzgb274p4x9q95";
aarch64-linux = "1chdcy59w4zm27ga71iph7yqq88lv2rw73br1nmmjznbqgzk9lpc";
aarch64-darwin = "140lrka50yqqd9dp9gb93jlc2zn2fjiq9palibwvgb14nzsb3x68";
armv7l-linux = "0qf95nxy55f9m2z91fykwjgffj7wqvlqjn2d2xnfapa457v5lbir";
x86_64-linux = "06d2m4g1y88jfnx5fhklm93b9arpg8kxb71ndy3jnliw3x9kgdbg";
x86_64-darwin = "04y0fqqhjmasan5066xlw9gx5prnrmhnz40ysmhjbsqi4mv8l6ry";
aarch64-linux = "1psz48a59dkqw4l7b49dnhp3q09d04d8k7spc5dcvcz3ghpgamal";
aarch64-darwin = "0mrz6x4ccb23121fp8b6aqgh0xkl9yaj8wfyvkxh5vadmcqhx4l7";
armv7l-linux = "186xxgk8hwxxa5lf799gkr7n046w5hjp5siz22jfwabsv3yr2573";
}.${system} or throwSystem;
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.81.1.23222";
version = "1.82.0.23250";
pname = "vscodium";
executableName = "codium";
@@ -61,7 +61,7 @@ in
downloadPage = "https://github.com/VSCodium/vscodium/releases";
license = licenses.mit;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ synthetica bobby285271 ];
maintainers = with maintainers; [ synthetica bobby285271 ludovicopiero ];
mainProgram = "codium";
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ];
};
+2 -2
View File
@@ -11,13 +11,13 @@
mkDerivation rec {
pname = "birdtray";
version = "1.11.3";
version = "1.11.4";
src = fetchFromGitHub {
owner = "gyunaev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3SZf0ZK4AV/kuFttaHnPJuOJ9rn7CqFfv28d8ancPKw=";
sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M=";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -2,24 +2,24 @@
let
pname = "joplin-desktop";
version = "2.11.11";
version = "2.12.16";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
suffix = {
x86_64-linux = "AppImage";
x86_64-darwin = "dmg";
aarch64-darwin = "dmg";
x86_64-linux = ".AppImage";
x86_64-darwin = ".dmg";
aarch64-darwin = "-arm64.dmg";
}.${system} or throwSystem;
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
sha256 = {
x86_64-linux = "sha256-r64+y+LfMrJnUdabVdak5+LQB50YLOuMXftlZ4s3C/w=";
x86_64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg=";
aarch64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg=";
x86_64-linux = "sha256-9ib8lymmSINqC0oXUxkKcpKfPh7qmU3YytU1/4aKMLg=";
x86_64-darwin = "sha256-vWc5yx3i5Ru8vrQbrTQwr43ZMBzOAb9254cxTHg6A/Q=";
aarch64-darwin = "sha256-dhwPqT+zfBYOVUV5JprPfgrSJR2ZNsC3LJmRHGJVM4k=";
}.${system} or throwSystem;
};
@@ -0,0 +1,27 @@
{ stdenv
, lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "matcha-rss-digest";
version = "0.6";
src = fetchFromGitHub {
owner = "piqoni";
repo = "matcha";
rev = "v${version}";
hash = "sha256-Zk85k2SllPR9zznLGevwH6hS1EEW2qEa9YXbSguRVeM=";
};
vendorHash = "sha256-Dw1z23DRG0OtakJfrgpTfd71F58KfGsqz215zK0XOdI=";
meta = with lib; {
homepage = "https://github.com/piqoni/matcha";
description = "Daily digest generator from a list of RSS feeds";
license = licenses.mit;
mainProgram = "matcha";
maintainers = with maintainers; [ foo-dogsquared ];
};
}
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "glooctl";
version = "1.14.12";
version = "1.15.4";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-0ZrR3y3bTXLCOgN+c96lEfNnT+GKXeEBHifM9jfWTBI=";
hash = "sha256-dQvvWlfCCc9QZFdOryX0bvLVdoBlhVMeP8MqQAYKua4=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
vendorHash = "sha256-2DKRF68dNkFgSeGqI68j2knnGVfVxo0UvGD7YvPwx4M=";
vendorHash = "sha256-FU8Siea+oH4xtSVwGk/dcivS6eNpIkWZiZqQ3EX9dwI=";
nativeBuildInputs = [ installShellFiles ];
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubevpn";
version = "1.1.36";
version = "1.2.0";
src = fetchFromGitHub {
owner = "KubeNetworks";
repo = "kubevpn";
rev = "v${version}";
sha256 = "sha256-wL6L94NNIPTYeUx+k78cFUdTMo9vIvzoKfXa2anCFQM=";
sha256 = "sha256-C/GXcINuAtDdSN5CdoN62zeYlT9L6cXDTDR9S3eMP4w=";
};
vendorHash = "sha256-24mw5ku0pQX2QNQPA9E+wowS3y0J+oKiIxuyVGcgBro=";
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "wgcf";
version = "2.2.18";
version = "2.2.19";
src = fetchFromGitHub {
owner = "ViRb3";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-MTh92TlMQeIMmysQLcdsz45JHGJdOyR4oABjJUPobfE=";
hash = "sha256-wEBPaqqpiQdFohlzpVDVMwYq8+NjSQrh58yWl/W+n8M=";
};
subPackages = ".";
vendorHash = "sha256-4VOjxGboYO00tJ17LNAYXiKQVUSUoveEYG/L+idYY6s=";
vendorHash = "sha256-i1CM0rG2DmgYMa+Na0In4fVJSGZlMTRajjLEZUvrmE8=";
meta = with lib; {
description = "Cross-platform, unofficial CLI for Cloudflare Warp";
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "drat-trim-unstable";
version = "2020-06-05";
pname = "drat-trim";
version = "2023-05-22";
src = fetchFromGitHub {
owner = "marijnheule";
repo = "drat-trim";
rev = "9afad0f7156a1e9c6ce19dce5d72cf1cb9a3ef27";
sha256 = "1zq585igfaknwqbvv2cji744016zxadbvr0ifr5l6yq13m0vvn3b";
rev = "refs/tags/v05.22.2023";
hash = "sha256-sV3A0f1TLSaTIdAtT6y8rU3ZS2UqEePJYSf3UySOlSA=";
};
postPatch = ''
@@ -1,15 +1,15 @@
{
"version": "16.3.2",
"repo_hash": "sha256-SFxmbVWFEq0kWhzCLESdAksxUd0tiNeLGCOKNRHKMqI=",
"version": "16.3.3",
"repo_hash": "sha256-+h3ksxuphegTvjrKTWk68fgan1n2g64b1sn5nMoYhLc=",
"yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.3.2-ee",
"rev": "v16.3.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.3.2",
"GITLAB_PAGES_VERSION": "16.3.2",
"GITALY_SERVER_VERSION": "16.3.3",
"GITLAB_PAGES_VERSION": "16.3.3",
"GITLAB_SHELL_VERSION": "14.26.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8",
"GITLAB_WORKHORSE_VERSION": "16.3.2"
"GITLAB_WORKHORSE_VERSION": "16.3.3"
}
}
@@ -13,7 +13,7 @@
}:
let
version = "16.3.2";
version = "16.3.3";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -24,7 +24,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-Q2wXoc4tLJvc0LwSct3cCswOqhUJSVVhoG/uFXeVOB4=";
hash = "sha256-V9uh5QkvQ1ifO5DNCivg47NBjgE06Ehz7DnmBeU3lVY=";
};
vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0=";
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.3.2";
version = "16.3.3";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-1e3s+RLuNilNtsKzfKrsbAD0dzA87LbLH/c43CKh5EU=";
hash = "sha256-TPXMXuxckALObfEcIguJbGToIGp8b2bpd974epaXpyk=";
};
vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM=";
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.3.2";
version = "16.3.3";
src = fetchFromGitLab {
owner = data.owner;
@@ -0,0 +1,31 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "esbuild-config";
version = "1.0.1";
src = fetchFromGitHub {
owner = "bpierre";
repo = "esbuild-config";
rev = "v${version}";
hash = "sha256-u3LgecKfgPSN5xMyqBjeAn4/XswM3iEGbZ+JGrVF1Co=";
};
cargoHash = "sha256-Z7uYOjMNxsEmsEXDOIr1zIq4nCgHvHIqpRnRH037b8g=";
# Cargo.lock is outdated
postConfigure = ''
cargo metadata --offline
'';
meta = with lib; {
description = "Config files for esbuild";
homepage = "https://github.com/bpierre/esbuild-config";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "esbuild-config";
};
}
File diff suppressed because it is too large Load Diff
+62
View File
@@ -0,0 +1,62 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, bzip2
, openssl
, zstd
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "symbolicator";
version = "23.8.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "symbolicator";
rev = version;
hash = "sha256-cCorFBZLLVLp+j94MyXJMPE1GcmAkK8AZq6DHuTNYtA=";
fetchSubmodules = true;
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cpp_demangle-0.4.1" = "sha256-9QopX2TOJc8bZ+UlSOFdjoe8NTJLVGrykyFL732tE3A=";
"reqwest-0.11.18" = "sha256-t6fs2bbBfgcspCrGfWIFCYbYZ7GPcBWI0dy68YdklOQ=";
};
};
nativeBuildInputs = [
pkg-config
rustPlatform.bindgenHook
];
buildInputs = [
bzip2
openssl
zstd
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
env = {
SYMBOLICATOR_GIT_VERSION = src.rev;
SYMBOLICATOR_RELEASE = version;
ZSTD_SYS_USE_PKG_CONFIG = true;
};
# tests require network access
doCheck = false;
meta = with lib; {
description = "Native Symbolication as a Service";
homepage = "https://getsentry.github.io/symbolicator/";
changelog = "https://github.com/getsentry/symbolicator/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "symbolicator";
};
}
@@ -2,11 +2,12 @@
, stdenv
, fetchFromGitHub
, autoreconfHook
, callPackage
, pkg-config
, pcre
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "ucg";
version = "unstable-2022-09-03";
@@ -28,20 +29,11 @@ stdenv.mkDerivation {
pcre
];
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
testFile=$(mktemp /tmp/ucg-test.XXXX)
echo -ne 'Lorem ipsum dolor sit amet\n2.7182818284590' > $testFile
$out/bin/ucg 'dolor' $testFile || { rm $testFile; exit -1; }
$out/bin/ucg --ignore-case 'lorem' $testFile || { rm $testFile; exit -1; }
$out/bin/ucg --word-regexp '2718' $testFile && { rm $testFile; exit -1; }
$out/bin/ucg 'pisum' $testFile && { rm $testFile; exit -1; }
rm $testFile
runHook postInstallCheck
'';
passthru.tests = {
simple = callPackage ./tests/simple.nix {
ucg = finalAttrs.finalPackage;
};
};
meta = {
homepage = "https://gvansickle.github.io/ucg/";
@@ -53,9 +45,10 @@ stdenv.mkDerivation {
appropriate with grep. Search patterns are specified as PCRE regexes.
'';
license = lib.licenses.gpl3Plus;
mainProgram = "ucg";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
broken = stdenv.isAarch64 || stdenv.isDarwin;
};
}
})
# TODO: report upstream
+26
View File
@@ -0,0 +1,26 @@
{ lib
, stdenv
, ucg
}:
stdenv.mkDerivation {
pname = "ucg-test";
inherit (ucg) version;
nativeBuildInputs = [ ucg ];
dontInstall = true;
buildCommand = ''
testFile=$(mktemp /tmp/ucg-test.XXXX)
echo -ne 'Lorem ipsum dolor sit amet\n2.7182818284590' > $testFile
ucg 'dolor' $testFile || { rm $testFile; exit -1; }
ucg --ignore-case 'lorem' $testFile || { rm $testFile; exit -1; }
ucg --word-regexp '2718' $testFile && { rm $testFile; exit -1; }
ucg 'pisum' $testFile && { rm $testFile; exit -1; }
rm $testFile
touch $out
'';
meta.timeout = 10;
}
+1638
View File
File diff suppressed because it is too large Load Diff
+60
View File
@@ -0,0 +1,60 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, makeBinaryWrapper
, stdenv
, pkg-config
, openssl
, nmap
}:
rustPlatform.buildRustPackage rec {
pname = "unimap";
version = "0.6.0";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = "unimap";
rev = version;
hash = "sha256-7UbzE5VXycjo7KNpPe2oqwyZDT4Vk8rQZ6HXT1q9Cw4=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"trust-dns-proto-0.20.4" = "sha256-+oAjyyTXbKir8e5kn8CUmQy5qmzQ47ryvBBdZtzj1TY=";
};
};
nativeBuildInputs = [
installShellFiles
makeBinaryWrapper
] ++ lib.optionals (stdenv.hostPlatform.isAarch && stdenv.isLinux) [
pkg-config
];
# only depends on openssl on aarch/arm linux
buildInputs = lib.optionals (stdenv.hostPlatform.isAarch && stdenv.isLinux) [
openssl
];
env = lib.optionalAttrs (stdenv.hostPlatform.isAarch && stdenv.isLinux) {
OPENSSL_NO_VENDOR = true;
};
postInstall = ''
installManPage unimap.1
wrapProgram $out/bin/unimap \
--prefix PATH : ${lib.makeBinPath [ nmap ]}
'';
meta = with lib; {
description = "Scan only once by IP address and reduce scan times with Nmap for large amounts of data";
homepage = "https://github.com/Edu4rdSHL/unimap";
changelog = "https://github.com/Edu4rdSHL/unimap/releases/tag/${src.rev}";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ figsoda ];
mainProgram = "unimap";
};
}
+2 -2
View File
@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "kora-icon-theme";
version = "1.5.7";
version = "1.5.8";
src = fetchFromGitHub {
owner = "bikass";
repo = "kora";
rev = "v${version}";
sha256 = "sha256-VAlfrUWgxcG17ZTlA357gengXTilwuZOBscIzadAsaU=";
sha256 = "sha256-ZPjtY6s3Sgl0aU2pAxagTMFIOcwDAZQRYtvOC0FBJaI=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ddccontrol-db";
version = "20230727";
version = "20230821";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = pname;
rev = version;
sha256 = "sha256-TRbFwaYRVHgg7dyg/OFPFkZ9nZ747zaNhnnfMljSOOE=";
sha256 = "sha256-R+DXpT9Tgt311G/OtmKp3sqN0ex/rlLt3JuSK7kciC0=";
};
nativeBuildInputs = [ autoreconfHook intltool ];
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel";
version = "3.0.4";
version = "3.0.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-WU2TSMuR+RRleR6ZbIXymG31l2f8XLINPkh5X9rUDcY=";
sha256 = "sha256-xowGdaH0e6y0Q2xSl0kUa01rxxoEQ0qXB3sUol0YDBA=";
};
patches = [
File diff suppressed because it is too large Load Diff
@@ -11,19 +11,22 @@
rustPlatform.buildRustPackage rec {
pname = "scryer-prolog";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "mthom";
repo = "scryer-prolog";
rev = "v${version}";
sha256 = "bDLVOXX9nv6Guu5czRFkviJf7dBiaqt5O8SLUJlcBZo=";
hash = "sha256-68wtRFkJh8OIdauSIyJ29en399TLnaRaRxw+5bkykxk=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"dashu-0.3.1" = "sha256-bovPjLs98oj8/e/X/9GIYCzArzGfshjoeHU7IHdnq30=";
"libffi-3.2.0" = "sha256-GcNcXJCfiJp/7X5FXQJ/St0SmsPlCyeM8/s9FR+VE+M=";
"modular-bitfield-0.11.2" = "sha256-vcx+xt5owZVWOlKwudAr0EB1zlLLL5pVfWokw034BQI=";
"num-modular-0.5.2" = "sha256-G4Kr3BMbXprC6tbG3mY/fOi2sQzaepOTeC4vDiOKWUM=";
};
};
@@ -0,0 +1,53 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, buildPackages
# libkcapi offers multiple tools. They can be disabled for minimization.
, kcapi-test ? true
, kcapi-speed ? true
, kcapi-hasher ? true
, kcapi-rngapp ? true
, kcapi-encapp ? true
, kcapi-dgstapp ? true
}:
stdenv.mkDerivation rec {
pname = "libkcapi";
version = "1.4.0";
src = fetchFromGitHub {
owner = "smuellerDD";
repo = "libkcapi";
rev = "v${version}";
hash = "sha256-G/4G8179Gc8RfQfQImOCsBC8WXKK7jQJfUSXm0hYLJ0=";
};
nativeBuildInputs = [ autoreconfHook ];
# libkcapi looks also for a host c compiler when cross-compiling
# otherwise you obtain following error message:
# "error: no acceptable C compiler found in $PATH"
depsBuildBuild = [
buildPackages.stdenv.cc
];
enableParallelBuilding = true;
configureFlags =
lib.optional kcapi-test "--enable-kcapi-test" ++
lib.optional kcapi-speed "--enable-kcapi-speed" ++
lib.optional kcapi-hasher "--enable-kcapi-hasher" ++
lib.optional kcapi-rngapp "--enable-kcapi-rngapp" ++
lib.optional kcapi-encapp "--enable-kcapi-encapp" ++
lib.optional kcapi-dgstapp "--enable-kcapi-dgstapp"
;
meta = {
homepage = "http://www.chronox.de/libkcapi.html";
description = "Linux Kernel Crypto API User Space Interface Library";
license = with lib.licenses; [ bsd3 gpl2Only ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ orichter thillux ];
};
}
@@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
# NOTE: You must also bump:
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
version = "9.6.0";
version = "9.7.0";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-dQr6bUaZOX1MN+MZxbsPqbv3bsyyWBM0SBYlSnV04K0=";
sha256 = "sha256-7huo2UsbNG/HG2dpdVT5qcJuFmYZE6Jdave8Gb1kHME=";
fetchSubmodules = true;
};
@@ -110,6 +110,7 @@ mapAliases {
stf = throw "stf was removed because it was broken"; # added 2023-08-21
surge = pkgs.surge-cli; # Added 2023-09-08
swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09
inherit (pkgs) terser; # Added 2023-08-31
thelounge = pkgs.thelounge; # Added 2023-05-22
three = throw "three was removed because it was no longer needed"; # Added 2023-09-08
inherit (pkgs) titanium; # added 2023-08-17
@@ -242,7 +242,6 @@
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
, "teck-programmer"
, "tern"
, "terser"
, "textlint"
, "textlint-plugin-latex"
, "textlint-rule-abbr-within-parentheses"
-31
View File
@@ -106636,37 +106636,6 @@ in
bypassCache = true;
reconstructLock = true;
};
terser = nodeEnv.buildNodePackage {
name = "terser";
packageName = "terser";
version = "5.19.2";
src = fetchurl {
url = "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz";
sha512 = "qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==";
};
dependencies = [
sources."@jridgewell/gen-mapping-0.3.3"
sources."@jridgewell/resolve-uri-3.1.1"
sources."@jridgewell/set-array-1.1.2"
sources."@jridgewell/source-map-0.3.5"
sources."@jridgewell/sourcemap-codec-1.4.15"
sources."@jridgewell/trace-mapping-0.3.19"
sources."acorn-8.10.0"
sources."buffer-from-1.1.2"
sources."commander-2.20.3"
sources."source-map-0.6.1"
sources."source-map-support-0.5.21"
];
buildInputs = globalBuildInputs;
meta = {
description = "JavaScript parser, mangler/compressor and beautifier toolkit for ES6+";
homepage = "https://terser.org";
license = "BSD-2-Clause";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
textlint = nodeEnv.buildNodePackage {
name = "textlint";
packageName = "textlint";
@@ -0,0 +1,54 @@
{ lib
, beautifulsoup4
, buildPythonPackage
, celery
, django
, fetchFromGitHub
, importlib-metadata
, python
, pythonOlder
, requests
, structlog
}:
buildPythonPackage rec {
pname = "django-google-analytics-app";
version = "6.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "praekeltfoundation";
repo = "django-google-analytics";
rev = "refs/tags/${version}";
hash = "sha256-0KLfGZY8qq5JGb+LJXpQRS76+qXtrf/hv6QLenm+BhQ=";
};
propagatedBuildInputs = [
beautifulsoup4
celery
django
importlib-metadata
requests
structlog
];
checkPhase = ''
runHook preCheck
${python.interpreter} -m django check --settings=test_settings
runHook postCheck
'';
pythonImportsCheck = [
"google_analytics"
];
meta = with lib; {
description = "Django Google Analytics brings the power of server side/non-js Google Analytics to your Django projects";
homepage = "https://github.com/praekeltfoundation/django-google-analytics/";
changelog = "https://github.com/praekeltfoundation/django-google-analytics/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ derdennisop ];
};
}
@@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, django
, fetchFromGitHub
, pytest-django
, python
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "django-simple-history";
version = "3.4.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "jazzband";
repo = "django-simple-history";
rev = "refs/tags/${version}";
hash = "sha256-XY6YNajwX5z3AXkYYGFtrURDqxub9EQwu52jQ7CZwrI=";
};
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
django
];
checkPhase = ''
${python.interpreter} runtests.py
'';
pythonImportsCheck = [
"simple_history"
];
meta = with lib; {
description = "django-simple-history stores Django model state on every create/update/delete";
homepage = "https://github.com/jazzband/django-simple-history/";
changelog = "https://github.com/jazzband/django-simple-history/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ derdennisop ];
};
}
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "libtmux";
version = "0.23.1";
version = "0.23.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "tmux-python";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-uMsQFDPLsphS6T55sDMKFawYgAycp8u9NizF5ZHnMqQ=";
hash = "sha256-W1gBhukBooPo8uej6i8i3UxLuDeBBeSX5xU50SyjjlA=";
};
postPatch = ''
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "libvirt";
version = "9.6.0";
version = "9.7.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
rev = "v${version}";
hash = "sha256-DIyvd13BeKP4HzgHz1FGUTau19MJgBKPiHnpK5nq0os=";
hash = "sha256-DFZPZx+jkxdNha+h50IXxl6wOwA1VjudRICgxD2V4+k=";
};
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -16,7 +16,7 @@
let
pname = "dump_syms";
version = "2.2.1";
version = "2.2.2";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -25,10 +25,10 @@ rustPlatform.buildRustPackage {
owner = "mozilla";
repo = pname;
rev = "v${version}";
hash = "sha256-YzGFzmAGHev3gM6+l0sC+nCdyEYZI2G30U1JBrZ2uSU=";
hash = "sha256-8kyicTtY7h1CDM4UGOHsppRRTraU6JLe24MKtoduiz0=";
};
cargoSha256 = "sha256-gWLd1MUpCeVRUgzqkA5USmlYDq8BmmB/EQfiFl9JsjA=";
cargoSha256 = "sha256-5WiGckh/jq7AHH3JWZL8tIsj1Gqr8iLX7IyppKsW96k=";
nativeBuildInputs = [
pkg-config
@@ -0,0 +1,22 @@
{ buildNpmPackage, fetchFromGitHub, lib }:
buildNpmPackage rec {
pname = "terser";
version = "5.19.3";
src = fetchFromGitHub {
owner = "terser";
repo = "terser";
rev = "v${version}";
hash = "sha256-ZI5ElHnQwoCJspGL/v0PqddMUAAhQGWDZA9utWZD/nM=";
};
npmDepsHash = "sha256-M7LGXoZFBQrXpkiofnam7tgFkk6+N7ckPxTcwAAuqxU=";
meta = with lib; {
description = "JavaScript parser, mangler and compressor toolkit for ES6+";
homepage = "https://terser.org";
license = licenses.bsd2;
maintainers = with maintainers; [ talyz ];
};
}
+20 -10
View File
@@ -1,32 +1,42 @@
{ buildNpmPackage
, darwin
, fetchFromGitHub
, lib
, python3
, stdenv
}:
buildNpmPackage rec {
pname = "nest-cli";
version = "9.4.2";
version = "10.1.17";
src = fetchFromGitHub {
owner = "nestjs";
repo = pname;
rev = version;
hash = "sha256-9I6ez75byOPVKvX93Yv1qSM3JaWlmmvZCTjNB++cmw0=";
hash = "sha256-03GDrKjlvl3O3kJlbbyDYxtlfwLkZbvxC9gvP534zSY=";
};
# Generated a new package-lock.json by running `npm upgrade`
# The upstream lockfile is using an old version of `fsevents`,
# which does not build on Darwin
postPatch = ''
cp ${./package-lock.json} ./package-lock.json
'';
npmDepsHash = "sha256-nZ9ant2c+15bRBikFcKZW8aiFqI3WC6hktSiBfnma/I=";
npmDepsHash = "sha256-QA2ZgbXiG84HuutJ2ZCGMrnqpwrPlHL/Bur7Pak8WcQ=";
env = {
npm_config_build_from_source = true;
};
nativeBuildInputs = [
python3
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
meta = with lib; {
description = "CLI tool for Nest applications 🍹";
description = "CLI tool for Nest applications";
homepage = "https://nestjs.com";
license = licenses.mit;
mainProgram = "nest";
maintainers = [ maintainers.ehllie ];
broken = stdenv.isDarwin; # https://github.com/nestjs/nest-cli/pull/2281
};
}
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pulumictl";
version = "0.0.43";
version = "0.0.44";
src = fetchFromGitHub {
owner = "pulumi";
repo = "pulumictl";
rev = "v${version}";
sha256 = "sha256-iz0ahzR0+CpNZSLbR9zyIRS5k3y1GYbh7BPif9I6n4k=";
sha256 = "sha256-7Q+1shNZ18BZ6W6CslwUZhX0LtxPdTXOSNH5VhBHFxE=";
};
vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk=";
vendorHash = "sha256-XOgHvOaHExazQfsu1brYDq1o2fUh6dZeJlpVhCQX9ns=";
ldflags = [
"-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}"
+3 -14
View File
@@ -1,32 +1,21 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "snazy";
version = "0.51.2";
version = "0.52.0";
src = fetchFromGitHub {
owner = "chmouel";
repo = pname;
rev = version;
hash = "sha256-k8dcALE5+5kqNKhmiLT0Ir8SRYOIp8eV3a/xYWrKpNw=";
hash = "sha256-ax16BO2I+LgaVilqrsVToulBRcyr0C/QUtrdn0nUfBU=";
};
cargoHash = "sha256-mBA2BhGeYR57UrqI1qtByTkTocMymjCWlWhh4+Ko8wY=";
cargoPatches = [
# update Cargo.toml to fix the version
# https://github.com/chmouel/snazy/pull/178
(fetchpatch {
name = "update-version-in-cargo-toml.patch";
url = "https://github.com/chmouel/snazy/commit/4fd92c7336f51d032a0baf60fd5ab8c1056ad14f.patch";
hash = "sha256-WT/HHB9HB+X/L5FZdvQAG8K7PrYHQD8F5aWQVaMJuIU=";
})
];
cargoHash = "sha256-go6y/NH3vFb8xtAGVpgy0GQfMfzXfn8hI+tJnUdCFAU=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.1.84";
version = "0.1.90";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-StcakZFJxHRY36xuxZm/W9xoEye4HRPfC4dtczeT7nk=";
hash = "sha256-dgfPhx2IJxkMji6nw+GSg1xHxyh3xjSr7KLdVv9PbUI=";
};
vendorHash = "sha256-cfgI/kJOtH1Ptd1MUHvt+e2ErU5wL+8Xm4cfQ64iAhc=";
vendorHash = "sha256-DnTjkv3lPUNB1WIQ2ncUaafdUP+y1t0UfaPfV4PW7VM=";
subPackages = [ "." ];
+2 -9
View File
@@ -17,8 +17,8 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "heroic-gogdl";
rev = "d2fa34bfba7beb2ecc0e3fc70a657f2c612c8a10";
hash = "sha256-YCqtfY49lDg6sLrF/INOZVD9cMCwvejhySzUWrxHKAw=";
rev = "89d15f1593cc26f15a5f8f409bb623764c095d37";
hash = "sha256-EECpXGVhcwihKB8fLObVvYzFD8uh7CxYKtFiGc0Jqbk=";
};
disabled = pythonOlder "3.8";
@@ -28,13 +28,6 @@ buildPythonApplication rec {
requests
];
patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/Heroic-Games-Launcher/heroic-gogdl/pull/37.patch";
hash = "sha256-oZLetPoWzsEDrL0Bh89HB4hTn70FTh8aXj9mKGr4Dqw=";
})
];
pythonImportsCheck = [ "gogdl" ];
meta = with lib; {
+5 -2
View File
@@ -80,8 +80,8 @@ buildBazelPackage rec {
fetchAttrs = {
sha256 = {
x86_64-linux = "sha256-KcTh6Fd1EUXcXByPSwMVy5J/6VSVGWBmHr8asS1/ffU=";
aarch64-linux = "sha256-v1T6/qfVapsNFQiB9vdZvxBZ3RoNO7MxgRh3s9dA+pQ=";
x86_64-linux = "sha256-+8MnbcFUyAE2122VA5olWAW8ZgjGweumRI62bxi9KOI=";
aarch64-linux = "sha256-4PH8rgsHxEwtx8RQGjLbAxHpLfWVqRLOvSX9sqQoy4Y=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
dontUseCmakeConfigure = true;
dontUseGnConfigure = true;
@@ -103,6 +103,9 @@ buildBazelPackage rec {
rm -r $bazelOut/external/local_jdk
rm -r $bazelOut/external/bazel_gazelle_go_repository_tools/bin
# Remove compiled python
find $bazelOut -name '*.pyc' -delete
# Remove Unix timestamps from go cache.
rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb}
'';
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grafana-dash-n-grab";
version = "0.4.5";
version = "0.5.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "esnet";
repo = "gdg";
sha256 = "sha256-Vn/kaSSe0rvS38HqXw7P2ZMQDCC4K8WSRdO0pdMLuhk=";
sha256 = "sha256-GQJBAjlxjEeNZrYzb/XP83+xma8LLzemKFqxlrDOP64=";
};
vendorHash = "sha256-2qEOVAbEEgGK83n4TSK0tksecETkJuCIqN9x6vfAimI=";
vendorHash = "sha256-7KP/j5WQowxUM+6jeC2GEycrC12sSbQYxcuXmD9j7M8=";
ldflags = [
"-s"
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "redis_exporter";
version = "1.53.0";
version = "1.54.0";
src = fetchFromGitHub {
owner = "oliver006";
repo = "redis_exporter";
rev = "v${version}";
sha256 = "sha256-KeHWflzwSxWaplAPtqof7NGJ9SH4mnjRAffhP/Dth5I=";
sha256 = "sha256-EIkMxmaugAPPeJfAA9HBbPp59bVHvgP0ZdUy0xhrrlY=";
};
vendorHash = "sha256-it69pime0RAhhu/qlRFGediemMllGhA3srHpGcUet7k=";
+2 -1
View File
@@ -41,6 +41,7 @@
, dart-sass-embedded
, jq
, moreutils
, terser
, plugins ? []
}@args:
@@ -223,7 +224,7 @@ let
postgresql
redis
nodePackages.uglify-js
nodePackages.terser
terser
nodePackages.patch-package
yarn
nodejs_16
+2 -2
View File
@@ -6,12 +6,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "ansible-lint";
version = "6.18.0";
version = "6.19.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-VHRO5/j9DsOAUfC23yFTUjk5o5HuS7SPCIW1/N2C+bk=";
hash = "sha256-JsOqEkljatkIRJ7yBL4KBDpa8R6jvUWUnI5KaA8hfn4=";
};
postPatch = ''
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fluent-bit";
version = "2.1.8";
version = "2.1.9";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${finalAttrs.version}";
hash = "sha256-iWbWkKd0Rpg0EU3H//sAxth1v1S52yPwGn1AzeC9xkA=";
hash = "sha256-G/DYGmZMB1vMJJK6vIWxGqhN8WRNjNXoMn9AY75Gw4M=";
};
nativeBuildInputs = [ cmake flex bison ];
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "interactsh";
version = "1.1.5";
version = "1.1.6";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-p6VB3BB8iP65ZDgwIM+DqilxRx1+8l9bBickqLMAYqk=";
hash = "sha256-cSqDiJEJdtHwL/xumZPOp1JHg7SUZ/47nKFv4bWBo5U=";
};
vendorHash = "sha256-NXBqFARgItXXhFIhRNz/DDbKGm7MH3kgawFiXHbV/RQ=";
vendorHash = "sha256-xtV+QLheWU6RJSjmoOunrsOfUhNCDWJORQDBAmJd2Io=";
modRoot = ".";
subPackages = [
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "moar";
version = "1.16.0";
version = "1.16.1";
src = fetchFromGitHub {
owner = "walles";
repo = pname;
rev = "v${version}";
hash = "sha256-m3IG5xZITh+iAE233NFMI+25VRt6GvK694oVd1wU5jA=";
hash = "sha256-r1M47KYFJYhLX1HK0uPVkupghyoqdbhStgaquvC4MQI=";
};
vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo=";
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "speedtest-go";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "showwin";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-nuZKYGumxSzhdbrMQzady1ja3aozzTyOx9cfRTin08w=";
hash = "sha256-aVvowxwP9Mr1hmcgwizXPfy5527iR7cjsNaND/nmXUw=";
};
vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E=";
+38 -12
View File
@@ -1,27 +1,53 @@
{ lib, buildGoModule, fetchFromGitHub, kubernetes-helm }:
{ lib
, fetchFromGitHub
, buildGoModule
, fuse
}:
let
fuseftp = buildGoModule rec {
pname = "go-fuseftp";
version = "0.4.2";
src = fetchFromGitHub {
owner = "datawire";
repo = "go-fuseftp";
rev = "v${version}";
hash = "sha256-bkaC+EOqFPQA4fDkVhO6EqgGhOJy31yGwVbbPoRd+70=";
};
vendorHash = "sha256-Dk4wvg2lTGTw8vP42+XuvmMXeMluR0SPwlVHLEB8yCQ=";
buildInputs = [ fuse ];
ldflags = [ "-s" "-w" ];
subPackages = [ "pkg/main" ];
};
in
buildGoModule rec {
pname = "telepresence2";
version = "2.6.4";
version = "2.15.1";
src = fetchFromGitHub {
owner = "telepresenceio";
repo = "telepresence";
rev = "v${version}";
sha256 = "sha256-AZW58L0971GVnvafecHfVg3MWr/xGHi4ptycXcV63Fg=";
hash = "sha256-67a5e7Lun/mlRwRoD6eomQpgUXqzAUx8IS7Mv86j6Gw=";
};
# The Helm chart is go:embed'ed as a tarball in the binary.
# That tarball is generated by running ./build-aux/package_embedded_chart/main.go,
# which tries to invoke helm from tools/bin/helm.
# Oh well…
propagatedBuildInputs = [
fuseftp
];
# telepresence depends on fuseftp existing as a built binary, as it gets embedded
# CGO gets disabled to match their build process as that is how it's done upstream
preBuild = ''
mkdir -p tools/bin
ln -sfn ${kubernetes-helm}/bin/helm tools/bin/helm
go run ./build-aux/package_embedded_chart/main.go ${src.rev}
cp ${fuseftp}/bin/main ./pkg/client/remotefs/fuseftp.bits
export CGO_ENABLED=0
'';
vendorHash = "sha256-aa40+6cjpA6/bqpFiqayCkX0PBToPmsp99ykv6e7Huc=";
vendorHash = "sha256-/13OkcLJI/q14tyFsynL5ZAIITH1w9XWpzRqZoJJesE=";
ldflags = [
"-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"
@@ -33,7 +59,7 @@ buildGoModule rec {
description = "Local development against a remote Kubernetes or OpenShift cluster";
homepage = "https://telepresence.io";
license = licenses.asl20;
maintainers = with maintainers; [ mausch ];
maintainers = with maintainers; [ mausch vilsol ];
mainProgram = "telepresence";
};
}
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "lastpass-cli";
version = "1.3.4";
version = "1.3.6";
src = fetchFromGitHub {
owner = "lastpass";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bPAENorvj48cyRpnMLmyENXlipSGhTLW+XVoyrPogTE=";
sha256 = "sha256-ntUBwZ0bVkkpvWK/jQBkLNpCYEDI14/ki0cLwYpEWXk=";
};
patches = [
@@ -39,6 +39,7 @@ buildPythonApplication rec {
urllib3
tlv8
typing-extensions
importlib-metadata
];
nativeBuildInputs = [
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "sshocker";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "lima-vm";
repo = "sshocker";
rev = "refs/tags/v${version}";
hash = "sha256-u/H9X0YbjVFK8IMUmL6OdarP/ojqXjZAHI+k61Ja++w=";
hash = "sha256-Z1Dg+AeyfFmUDc3jV8/tOcUrxuyInfwubzo0cLpfFl8=";
};
vendorHash = "sha256-WcPKMF8KNx7zlsdTnFf8vnW/uZZL1F4JWqMK7+qmyCk=";
vendorHash = "sha256-ceQzYByJNXr02IDBKhYuqnKfaTbnX5T03p2US4HRu6I=";
ldflags = [
"-s"
+33
View File
@@ -0,0 +1,33 @@
{ lib
, nix-update-script
, fetchFromGitLab
, buildNpmPackage
, nodejs
}:
buildNpmPackage rec {
pname = "math-preview";
version = "5.1.1";
src = fetchFromGitLab {
owner = "matsievskiysv";
repo = "math-preview";
rev = "v${version}";
hash = "sha256-P3TZ/D6D2PvwPV6alSrDEQujzgI8DhK4VOuCC0BCIFo=";
};
npmDepsHash = "sha256-GAPhG3haM9UNdj6tCz8I4j7v6rvNbatdu7NjCeENj3s=";
dontNpmBuild = true;
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Emacs preview math inline";
license = licenses.gpl3Plus;
homepage = "https://gitlab.com/matsievskiysv/math-preview";
maintainers = with maintainers; [ renesat ];
inherit (nodejs.meta) platforms;
};
}
+4 -4
View File
@@ -504,7 +504,7 @@ dependencies = [
[[package]]
name = "typstfmt"
version = "0.2.3"
version = "0.2.4"
dependencies = [
"lexopt",
"typstfmt_lib",
@@ -512,7 +512,7 @@ dependencies = [
[[package]]
name = "typstfmt_lib"
version = "0.2.3"
version = "0.2.4"
dependencies = [
"globmatch",
"insta",
@@ -529,9 +529,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.11"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-math-class"
+2 -2
View File
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "typstfmt";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "astrale-sharp";
repo = "typstfmt";
rev = version;
hash = "sha256-DipssOPbu7rSyfhqpuOqS7Ih+/PlK+/BT+R1Sm4mFPk=";
hash = "sha256-d0vlZqg0RcRvZM7xYdMLX2/UeolUbqZ9H4drJRRKBmc=";
};
cargoLock = {
+9 -3
View File
@@ -8864,8 +8864,6 @@ with pkgs;
robodoc = callPackage ../tools/text/robodoc { };
ucg = callPackage ../tools/text/ucg { };
grive2 = callPackage ../tools/filesystems/grive2 { };
groff = callPackage ../tools/text/groff { };
@@ -15801,7 +15799,7 @@ with pkgs;
flasm = callPackage ../development/compilers/flasm { };
flyctl = callPackage ../development/web/flyctl { };
flyctl = callPackage ../development/web/flyctl { buildGoModule = buildGo121Module; };
fluidd = callPackage ../applications/misc/fluidd { };
@@ -19824,6 +19822,8 @@ with pkgs;
mastodon-archive = callPackage ../tools/backup/mastodon-archive { };
math-preview = callPackage ../tools/text/math-review { };
maven = maven3;
maven3 = callPackage ../development/tools/build-managers/apache-maven { };
@@ -20446,6 +20446,8 @@ with pkgs;
terrascan = callPackage ../tools/security/terrascan { };
terser = callPackage ../development/tools/misc/terser { };
tesh = callPackage ../tools/text/tesh {};
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
@@ -22979,6 +22981,8 @@ with pkgs;
libinklevel = callPackage ../development/libraries/libinklevel { };
libkcapi = callPackage ../development/libraries/libkcapi { };
libnats-c = callPackage ../development/libraries/libnats-c { };
liburing = callPackage ../development/libraries/liburing { };
@@ -32740,6 +32744,8 @@ with pkgs;
marker = callPackage ../applications/editors/marker { };
matcha-rss-digest = callPackage ../applications/misc/matcha-rss-digest { };
meek = callPackage ../tools/networking/meek { };
meerk40t = callPackage ../applications/misc/meerk40t { };
+2 -2
View File
@@ -23064,12 +23064,12 @@ with self; {
SysVirt = buildPerlModule rec {
pname = "Sys-Virt";
version = "9.4.0";
version = "9.7.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-perl";
rev = "v${version}";
hash = "sha256-3ER6kcUfNM5ULhN/MlOil4Rx3O84fLnIvH+Cb/oXTFM=";
hash = "sha256-tXXB6Gj27oFZv9WD4dXWdY55jDDLrGYbud4qoyjNe5A=";
};
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
+4
View File
@@ -2908,6 +2908,8 @@ self: super: with self; {
django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { };
django-google-analytics-app = callPackage ../development/python-modules/django-google-analytics-app { };
django-guardian = callPackage ../development/python-modules/django-guardian { };
django-haystack = callPackage ../development/python-modules/django-haystack { };
@@ -3038,6 +3040,8 @@ self: super: with self; {
django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { };
django-simple-history = callPackage ../development/python-modules/django-simple-history { };
django-sites = callPackage ../development/python-modules/django-sites { };
django-sr = callPackage ../development/python-modules/django-sr { };