Merge master into haskell-updates
This commit is contained in:
@@ -3533,6 +3533,16 @@
|
||||
githubId = 28303440;
|
||||
name = "Max Hausch";
|
||||
};
|
||||
cherrykitten = {
|
||||
email = "contact@cherrykitten.dev";
|
||||
github = "cherrykitten";
|
||||
githubId = 20300586;
|
||||
matrix = "@sammy:cherrykitten.dev";
|
||||
name = "CherryKitten";
|
||||
keys = [{
|
||||
fingerprint = "264C FA1A 194C 585D F822 F673 C01A 7CBB A617 BD5F";
|
||||
}];
|
||||
};
|
||||
chessai = {
|
||||
email = "chessai1996@gmail.com";
|
||||
github = "chessai";
|
||||
@@ -3854,6 +3864,14 @@
|
||||
githubId = 180339;
|
||||
name = "Andrew Cobb";
|
||||
};
|
||||
coca = {
|
||||
github = "Coca162";
|
||||
githubId = 62479942;
|
||||
name = "Coca";
|
||||
keys = [{
|
||||
fingerprint = "99CB 86FF 62BB 7DA4 8903 B16D 0328 2DF8 8179 AB19";
|
||||
}];
|
||||
};
|
||||
coconnor = {
|
||||
email = "coreyoconnor@gmail.com";
|
||||
github = "coreyoconnor";
|
||||
@@ -20579,6 +20597,12 @@
|
||||
fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E";
|
||||
}];
|
||||
};
|
||||
toasteruwu = {
|
||||
email = "Aki@ToasterUwU.com";
|
||||
github = "ToasterUwU";
|
||||
githubId = 43654377;
|
||||
name = "Aki";
|
||||
};
|
||||
tobiasBora = {
|
||||
email = "tobias.bora.list@gmail.com";
|
||||
github = "tobiasBora";
|
||||
@@ -21692,6 +21716,12 @@
|
||||
github = "wegank";
|
||||
githubId = 9713184;
|
||||
};
|
||||
weitzj = {
|
||||
name = "Jan Weitz";
|
||||
email = "nixpkgs@janweitz.de";
|
||||
github = "weitzj";
|
||||
githubId = 829277;
|
||||
};
|
||||
welteki = {
|
||||
email = "welteki@pm.me";
|
||||
github = "welteki";
|
||||
|
||||
@@ -135,7 +135,7 @@ in
|
||||
};
|
||||
|
||||
version = lib.mkOption {
|
||||
type = types.nullOr (types.strMatching "^[a-z0-9._-]+$");
|
||||
type = types.nullOr (types.strMatching "^[a-z0-9._-~^]+$");
|
||||
default = null;
|
||||
description = ''
|
||||
Image version.
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
cfg.package
|
||||
pkgs.sshfs
|
||||
];
|
||||
networking.firewall = rec {
|
||||
allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
|
||||
|
||||
@@ -28,7 +28,13 @@ in
|
||||
configFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = "the thermald manual configuration file.";
|
||||
description = ''
|
||||
The thermald manual configuration file.
|
||||
|
||||
Leave unspecified to run with the `--adaptive` flag instead which will have thermald use your computer's DPTF adaptive tables.
|
||||
|
||||
See `man thermald` for more information.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkPackageOption pkgs "thermald" { };
|
||||
@@ -49,8 +55,7 @@ in
|
||||
--no-daemon \
|
||||
${optionalString cfg.debug "--loglevel=debug"} \
|
||||
${optionalString cfg.ignoreCpuidCheck "--ignore-cpuid-check"} \
|
||||
${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
|
||||
${optionalString (cfg.configFile == null) "--adaptive"} \
|
||||
${if cfg.configFile != null then "--config-file ${cfg.configFile}" else "--adaptive"} \
|
||||
--dbus-enable
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -103,6 +103,18 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
persistentTimer = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
example = true;
|
||||
description = ''
|
||||
Set the `persistentTimer` option for the
|
||||
{manpage}`systemd.timer(5)`
|
||||
which triggers the snapshot immediately if the last trigger
|
||||
was missed (e.g. if the system was powered down).
|
||||
'';
|
||||
};
|
||||
|
||||
cleanupInterval = mkOption {
|
||||
type = types.str;
|
||||
default = "1d";
|
||||
@@ -198,7 +210,14 @@ in
|
||||
inherit documentation;
|
||||
requires = [ "local-fs.target" ];
|
||||
serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --timeline";
|
||||
startAt = cfg.snapshotInterval;
|
||||
};
|
||||
|
||||
systemd.timers.snapper-timeline = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
Persistent = cfg.persistentTimer;
|
||||
OnCalendar = cfg.snapshotInterval;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.snapper-cleanup = {
|
||||
|
||||
@@ -4,7 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.qtile;
|
||||
pyEnv = pkgs.python3.withPackages (p: [ (cfg.package.unwrapped or cfg.package) ] ++ (cfg.extraPackages p));
|
||||
in
|
||||
|
||||
{
|
||||
@@ -48,13 +47,24 @@ in
|
||||
];
|
||||
'';
|
||||
};
|
||||
|
||||
finalPackage = mkOption {
|
||||
type = types.package;
|
||||
visible = false;
|
||||
readOnly = true;
|
||||
description = "The resulting Qtile package, bundled with extra packages";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.qtile.finalPackage = pkgs.python3.withPackages (p:
|
||||
[ (cfg.package.unwrapped or cfg.package) ] ++ (cfg.extraPackages p)
|
||||
);
|
||||
|
||||
services.xserver.windowManager.session = [{
|
||||
name = "qtile";
|
||||
start = ''
|
||||
${pyEnv}/bin/qtile start -b ${cfg.backend} \
|
||||
${cfg.finalPackage}/bin/qtile start -b ${cfg.backend} \
|
||||
${optionalString (cfg.configFile != null)
|
||||
"--config \"${cfg.configFile}\""} &
|
||||
waitPID=$!
|
||||
|
||||
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = lib.optionalString (audacious-plugins != null) ''
|
||||
ln -s ${audacious-plugins}/lib/audacious $out/lib
|
||||
ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmmp";
|
||||
version = "2.1.7";
|
||||
version = "2.1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-5qdnvGFgFEk+00tjnVhqW29AyyjCfiFQOyYyVmAjHnM=";
|
||||
hash = "sha256-hGphQ8epqym47C9doiSOQd3yc28XwV2UsNc7ivhaae4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
@@ -36,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tidal-hifi";
|
||||
version = "5.11.0";
|
||||
version = "5.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
|
||||
sha256 = "sha256-vuvL6yYF43++De5RLsMgoSpmIjfLzvq5QpRfdJTESuw=";
|
||||
sha256 = "sha256-DwUKoDaXA99ILxlyay5dRL/ewnzyqSSR6fxPxkr8X34=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exodus";
|
||||
version = "24.19.3";
|
||||
version = "24.19.4";
|
||||
|
||||
src = fetchurl {
|
||||
name = "exodus-linux-x64-${finalAttrs.version}.zip";
|
||||
url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
|
||||
curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
|
||||
hash = "sha256-zqi1En22H3b2pD95C747gF9TtyMCX4TzXC10mP7iUoM=";
|
||||
hash = "sha256-+g7DdDrSVmBl1wCSCoJcO2gmbWQBnJUYqjT+GuDlCYw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "greetd";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-w68iKabVVIHB+ujCd5q+L4T6+Tfqedou3wXOuMGi6aw=";
|
||||
sha256 = "sha256-QFxE5c4XDOBa3rKpUFur6xOG+5m0NSCOWo7960ZWEow=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vn1ih4YXsltR1zdy7BzS3CSJO9Uewx/654lRTSkWV0k=";
|
||||
cargoHash = "sha256-w7V5ZBFy5MIEQKOPPgsc7XnrXsF5rEDNzUKeLPPy4P4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
scdoc
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
"new": "cmp-tmux"
|
||||
},
|
||||
"fern-vim": {
|
||||
"date": "2024-05-16",
|
||||
"date": "2024-05-17",
|
||||
"new": "vim-fern"
|
||||
},
|
||||
"gina-vim": {
|
||||
"date": "2024-05-16",
|
||||
"date": "2024-05-17",
|
||||
"new": "vim-gina"
|
||||
},
|
||||
"gist-vim": {
|
||||
@@ -60,7 +60,7 @@
|
||||
"new": "vim-suda"
|
||||
},
|
||||
"vim-fsharp": {
|
||||
"date": "2024-05-16",
|
||||
"date": "2024-05-17",
|
||||
"new": "zarchive-vim-fsharp"
|
||||
},
|
||||
"vim-jade": {
|
||||
|
||||
@@ -189,8 +189,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "LazyVim";
|
||||
repo = "LazyVim";
|
||||
rev = "183d6eea606556c8bd7f80a70660c54670e04649";
|
||||
sha256 = "0wyhm6x8kk3yyli3lk94cr4nh83y805vqrwzi14pdh83rzkcy57c";
|
||||
rev = "07923f3701af23504bb09bf6cc11c4fb0a1894e7";
|
||||
sha256 = "1ggnx9gw4x6cis570djvpmk21cnfixay2b1k2c3gs7vxmfivh0lj";
|
||||
};
|
||||
meta.homepage = "https://github.com/LazyVim/LazyVim/";
|
||||
};
|
||||
@@ -534,12 +534,12 @@ final: prev:
|
||||
|
||||
aerial-nvim = buildVimPlugin {
|
||||
pname = "aerial.nvim";
|
||||
version = "2024-05-07";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "aerial.nvim";
|
||||
rev = "228fad11393322537d9662c0347f75549a3d6c0a";
|
||||
sha256 = "1498ys4z2pzkk6x59ygnq18j53zypin2zxmlc4vvc74v640v3iml";
|
||||
rev = "97a838ccc03ba010a667cba49d9820f6823f4d51";
|
||||
sha256 = "0pkbyiskvqpnl5d6lr60agdqn52skx87x5jdzflni087wxffr0ag";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
||||
@@ -2515,12 +2515,12 @@ final: prev:
|
||||
|
||||
conform-nvim = buildVimPlugin {
|
||||
pname = "conform.nvim";
|
||||
version = "2024-05-13";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "conform.nvim";
|
||||
rev = "59d0dd233a2cafacfa1235ab22054c4d80a72319";
|
||||
sha256 = "0kh6hylhzqr7jl6b1gmjpyjipxb589hp93vdrk11gz3vk9ricjn9";
|
||||
rev = "00f9d91391b04b1935e2f15948bd96cc111e7d3a";
|
||||
sha256 = "0ydckbdj7zps3i04hb5cx5ddzxy5g1pc022i6zfrpfs0yqv9jjiv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/conform.nvim/";
|
||||
@@ -2816,12 +2816,12 @@ final: prev:
|
||||
|
||||
debugprint-nvim = buildVimPlugin {
|
||||
pname = "debugprint.nvim";
|
||||
version = "2024-05-07";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andrewferrier";
|
||||
repo = "debugprint.nvim";
|
||||
rev = "94d7d988c1d7dcb2f4c55d01d54bdb95c597639c";
|
||||
sha256 = "0nvyb0d8c7klyng700wpard9jyhl0n3363v4czxqs3fisx4ppq9x";
|
||||
rev = "1a77a32dda9ba25000118c82aa9146b780dfb540";
|
||||
sha256 = "048bvdz06f1hxmix3nhjj5dwynhaazg6895mnd1lj3m8z3rfs9gh";
|
||||
};
|
||||
meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
|
||||
};
|
||||
@@ -2924,12 +2924,12 @@ final: prev:
|
||||
|
||||
denops-vim = buildVimPlugin {
|
||||
pname = "denops.vim";
|
||||
version = "2024-05-14";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-denops";
|
||||
repo = "denops.vim";
|
||||
rev = "bcc88ca61f1edcbe364dbfb4967204193efc6e9a";
|
||||
sha256 = "04ac7h2xy0w52a8psnk3zvxa1nv4vsvxswannlxxa1w7fxzfh2b3";
|
||||
rev = "9dd9ae9da9b8d65916dd44e0e4d881665397de63";
|
||||
sha256 = "1cvicx69741jna07vm4rchclnspcbpdj8yyik0bsicf95w5w6blp";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-denops/denops.vim/";
|
||||
};
|
||||
@@ -3310,24 +3310,24 @@ final: prev:
|
||||
|
||||
dressing-nvim = buildVimPlugin {
|
||||
pname = "dressing.nvim";
|
||||
version = "2024-04-24";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "dressing.nvim";
|
||||
rev = "5162edb1442a729a885c45455a07e9a89058be2f";
|
||||
sha256 = "04h3q6ls7r9kx17l1kmcb82s4220sd98rxfm0w9cif4dq1gzpap3";
|
||||
rev = "572314728cb1ce012e825fd66331f52c94acac12";
|
||||
sha256 = "1i65g5qlk2i16d74frpwra8m8cvvcwj6d1hncd2gdk1h4pssxgyc";
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
|
||||
};
|
||||
|
||||
dropbar-nvim = buildVimPlugin {
|
||||
pname = "dropbar.nvim";
|
||||
version = "2024-04-27";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bekaboo";
|
||||
repo = "dropbar.nvim";
|
||||
rev = "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d";
|
||||
sha256 = "1m7ld10gr4cqhm8hw4qqlcvgdk32yb5p7n2rgr5x8339xnv2xwha";
|
||||
rev = "9fc10fa1a34ec3e55b470962e4e94644611bd209";
|
||||
sha256 = "135qc6ix0kav0knq4y5843525z5kh1rs2d56k71rk9986kb4vlk1";
|
||||
};
|
||||
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
|
||||
};
|
||||
@@ -3889,12 +3889,12 @@ final: prev:
|
||||
|
||||
fuzzy-nvim = buildVimPlugin {
|
||||
pname = "fuzzy.nvim";
|
||||
version = "2023-05-15";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tzachar";
|
||||
repo = "fuzzy.nvim";
|
||||
rev = "67a42ad2fa6d5ff41f0ef3cf69bb247410da5d7a";
|
||||
sha256 = "1hkyvx98irnwqlsrpxsnfy3d289pvxpmgarkarakfkfhjw9nq2cq";
|
||||
rev = "e29d96b5fab9bb9f613c86bd54ea9b7ef2de61bb";
|
||||
sha256 = "1z7ksmhyg6dch7hf4257fvvyqfwzw4q6na1gy01irf379f89xlm2";
|
||||
};
|
||||
meta.homepage = "https://github.com/tzachar/fuzzy.nvim/";
|
||||
};
|
||||
@@ -5269,12 +5269,12 @@ final: prev:
|
||||
|
||||
lazy-nvim = buildVimPlugin {
|
||||
pname = "lazy.nvim";
|
||||
version = "2024-05-13";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "lazy.nvim";
|
||||
rev = "e44636a43376e8a1e851958f7e9cbe996751d59f";
|
||||
sha256 = "0v05ga62zp0ls6ziqjfsznqrvc3n57vr3yl2ni9pi9ba6dn8zj27";
|
||||
rev = "05240b41548c4245a04d34ee54f789e824129991";
|
||||
sha256 = "1if5nq5z329l815nzrqs383ycck9s3hm5mhvz2ar001alszg4azc";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/lazy.nvim/";
|
||||
};
|
||||
@@ -5808,12 +5808,12 @@ final: prev:
|
||||
|
||||
luasnip = buildNeovimPlugin {
|
||||
pname = "luasnip";
|
||||
version = "2024-05-14";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "7b1dda0dfdefc10b2501295eba5e463dbd7c338f";
|
||||
sha256 = "1p8dgdhnf2c7kifb9r53brl1sa0fsnw3wl2hf55wch1nynw3mly8";
|
||||
rev = "78296bfabf756dbb6c7134aa219e75564dddf40f";
|
||||
sha256 = "14z095b95qaxvpaz22pfls4by59fdxqjbkkv7ggjhhhhf0y3by94";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
@@ -6497,8 +6497,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neoconf.nvim";
|
||||
rev = "a0aa3cc5e12a6c5eb8543e2508149f263fc32b2a";
|
||||
sha256 = "0d7nj6jdh0qfhsc6s88nnrb0kc0h2rg5vryc5dl76dpj8gal49sa";
|
||||
rev = "f5717f0ff26189e6a7bc9c3ae705d9e6cff20a99";
|
||||
sha256 = "099rhngmw5vqnh0jkgkbrnc5apvh06jqg3khrsap3m1s2snw5799";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neoconf.nvim/";
|
||||
};
|
||||
@@ -6565,12 +6565,12 @@ final: prev:
|
||||
|
||||
neogit = buildVimPlugin {
|
||||
pname = "neogit";
|
||||
version = "2024-05-13";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NeogitOrg";
|
||||
repo = "neogit";
|
||||
rev = "bc0c609e3568a171e0549b449aa1b2b4b5b20e8c";
|
||||
sha256 = "0fh9r9riqcqwckjhmdjfa45x5wxqv6x9as7k719g3nsmxc318xy6";
|
||||
rev = "9040f6face04f93e6903f25f038d67550fc9027b";
|
||||
sha256 = "1sdkn3aapqd5kgbgm1gyam7fc46xzvq4f2ivayrdx9jln61pp8y5";
|
||||
};
|
||||
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
||||
};
|
||||
@@ -7280,8 +7280,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "noice.nvim";
|
||||
rev = "872036f4f25fd67c6a6cf3dc004022a72c6d0a6d";
|
||||
sha256 = "0pzywf6fn501xdzi89k6fr25q5vnmw6mi7d1gjkpmypdqd1wly1n";
|
||||
rev = "2c49d4a7fdeaca930bb08a8239bdf5bccc26507b";
|
||||
sha256 = "0slxiq7s1b0iars3p59bp2krk2zf2wr95qz9paa1jdkc6i7azzmf";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/noice.nvim/";
|
||||
};
|
||||
@@ -7628,8 +7628,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "e1330ec3b260df05f5e855d040871bbd4e819b41";
|
||||
sha256 = "127k4xwnrr1kjlsv751kmrn6pgw8i7w5kfbidi15280ja03fs4fp";
|
||||
rev = "5a2f7121869394502521c52b2bc581ab22c69447";
|
||||
sha256 = "17z6p952a5f027cpvrc0yi65784nc832hjdyv25igf3x1l6bd6ai";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
@@ -7816,12 +7816,12 @@ final: prev:
|
||||
|
||||
nvim-jdtls = buildVimPlugin {
|
||||
pname = "nvim-jdtls";
|
||||
version = "2024-03-07";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-jdtls";
|
||||
rev = "8eb5f0dbe6e126b392ddcaf45893358619893e45";
|
||||
sha256 = "04v31198sqrw18ycrxhz94zq4q9bn879cdlyc06f8fc2hwqnz1ya";
|
||||
rev = "29255ea26dfb51ef0213f7572bff410f1afb002d";
|
||||
sha256 = "1h3hdl99mb5r8mslcp7s78abyrrjjhmkndbif8c5iah7wmfnyq2c";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
|
||||
};
|
||||
@@ -7899,12 +7899,12 @@ final: prev:
|
||||
|
||||
nvim-lint = buildVimPlugin {
|
||||
pname = "nvim-lint";
|
||||
version = "2024-05-13";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-lint";
|
||||
rev = "f3bcc28ffccb768212247294acccc106e029fc3c";
|
||||
sha256 = "0q4fq77v2imls0plcasgmrxbpc3q8qddn6n3w42xygkm9bna8a01";
|
||||
rev = "1f98d6c863f91706369d74aeb2eb3f02b2e96861";
|
||||
sha256 = "1g5zryga6pjg5hm5475qszl3rd8s5iahds8qc2rjvqjkrh20h05h";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
|
||||
};
|
||||
@@ -8259,12 +8259,12 @@ final: prev:
|
||||
|
||||
nvim-surround = buildVimPlugin {
|
||||
pname = "nvim-surround";
|
||||
version = "2024-04-30";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kylechui";
|
||||
repo = "nvim-surround";
|
||||
rev = "6d0dc3dbb557bcc6a024969da461df4ba803fc48";
|
||||
sha256 = "0ig2izp7jhahri926avzwpzz9qklbnvpma6n9m7mfipf7jcn95rw";
|
||||
rev = "79aaa42da1f698ed31bcbe7f83081f69dca7ba17";
|
||||
sha256 = "040mfsmxr7yfpmfi797vzaxcfp98l897nrz2pd5a6ghpvj3b83ij";
|
||||
};
|
||||
meta.homepage = "https://github.com/kylechui/nvim-surround/";
|
||||
};
|
||||
@@ -8331,12 +8331,12 @@ final: prev:
|
||||
|
||||
nvim-treesitter-context = buildVimPlugin {
|
||||
pname = "nvim-treesitter-context";
|
||||
version = "2024-05-15";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter-context";
|
||||
rev = "7068ad6d16c682db0f6bf25f64ccfee34ec5d452";
|
||||
sha256 = "0lnwmwjidaayiph8bdq6vzn1rwp2mm5fwq0v7qfl75gsbwj5r6bj";
|
||||
rev = "6d076414ffedd80411cb0260da8da2788e816e33";
|
||||
sha256 = "0a5dgb81iy8jikcvd8ixvicp84wifzkwp47dpm1vpjyvwamj2jvv";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
|
||||
};
|
||||
@@ -8583,12 +8583,12 @@ final: prev:
|
||||
|
||||
oil-nvim = buildVimPlugin {
|
||||
pname = "oil.nvim";
|
||||
version = "2024-05-15";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "oil.nvim";
|
||||
rev = "f630887cd845a7341bc16488fe8aaecffe3aaa8a";
|
||||
sha256 = "0d28rx4qqqha9ikcajx7yka0kzbf93yfqhkvmsykm0855h88ivx5";
|
||||
rev = "9e3a02252dc5686f374f79f50a13cfe7547c05af";
|
||||
sha256 = "04wqq3s4mwz1f5v85iyh6wx43q4sfj5iqhg82krs7n4rq9nh3r4s";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/oil.nvim/";
|
||||
@@ -8812,12 +8812,12 @@ final: prev:
|
||||
|
||||
overseer-nvim = buildVimPlugin {
|
||||
pname = "overseer.nvim";
|
||||
version = "2024-05-14";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "overseer.nvim";
|
||||
rev = "226789848772d99b3b61363b6ea7663882f8c05e";
|
||||
sha256 = "09gqpdr59mbvnwi36dikwckkcqs4gxk00wdwvnx22qm68gjizs9y";
|
||||
rev = "7a9b654df4b3b246d05fff857f32e9fb8ddfb013";
|
||||
sha256 = "1qp5vkswgl3cz7qcnsl8dywwwcg8561dqhyp08zd2ifj933r1b5j";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/overseer.nvim/";
|
||||
@@ -8945,12 +8945,12 @@ final: prev:
|
||||
|
||||
persistence-nvim = buildVimPlugin {
|
||||
pname = "persistence.nvim";
|
||||
version = "2024-01-19";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "persistence.nvim";
|
||||
rev = "4982499c1636eac254b72923ab826ee7827b3084";
|
||||
sha256 = "0d71vmhgiakf4fpxnx56ymgmad7zww5nl1q2dhxg8pqkq7jdnh5n";
|
||||
rev = "5fe077056c821aab41f87650bd6e1c48cd7dd047";
|
||||
sha256 = "1saanhqa9ldm1xlq5w28w72yxkwh60cay3cazi62zwmph0mgygp9";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/persistence.nvim/";
|
||||
};
|
||||
@@ -9598,8 +9598,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrcjkb";
|
||||
repo = "rustaceanvim";
|
||||
rev = "253ce043dcb41d92a6d99a317c9fab61e3df6f47";
|
||||
sha256 = "0vxyczrb765v6rnnxr1csdms86a9vq9cqqrdrawlzxhzyxn87hf8";
|
||||
rev = "50c09f3afa35d3b32e09ac1b155e95c53a98b8e8";
|
||||
sha256 = "0ws8c2bpnhkvgslpa95llydn60kyh7qg66y6a7h9g89mwxda0m6v";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
|
||||
};
|
||||
@@ -10124,12 +10124,12 @@ final: prev:
|
||||
|
||||
staline-nvim = buildVimPlugin {
|
||||
pname = "staline.nvim";
|
||||
version = "2024-03-08";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tamton-aquib";
|
||||
repo = "staline.nvim";
|
||||
rev = "c49f2deaba3d3c669e7243b57619e0078e7a351b";
|
||||
sha256 = "1d3mp5ymzi5pb8y246h38bydd2cw4iacakaj9a7r7hf87i6kfz6k";
|
||||
rev = "2bda31da08c620adce08df8359bd402044399340";
|
||||
sha256 = "17wkf3j7nyjk4ch88hkgb68lyr34z0kk9qhmk7n4h673jhn2lh34";
|
||||
};
|
||||
meta.homepage = "https://github.com/tamton-aquib/staline.nvim/";
|
||||
};
|
||||
@@ -11090,12 +11090,12 @@ final: prev:
|
||||
|
||||
tokyonight-nvim = buildVimPlugin {
|
||||
pname = "tokyonight.nvim";
|
||||
version = "2024-05-15";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "tokyonight.nvim";
|
||||
rev = "c91aef1125e052c9d862e68389e4185ec56f6cde";
|
||||
sha256 = "0j9lblrhydjk9ny84bbd83vp4vh4bvpi1qs8dbzxx4j7970mmawl";
|
||||
rev = "634015fff1457ed66cf5364213a2bbbc51a82d6c";
|
||||
sha256 = "0fk0afw5d8nwpz1244c0d6sk8hjk63swapwrxcxk0c1f12qc364l";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
|
||||
};
|
||||
@@ -11359,8 +11359,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "05b941c9c85c0e17bc6e0310231a29594848a938";
|
||||
sha256 = "1i303qgd2xb5v3fyk9fj3lfshpxcwxjf01091dsxfv8mjhfv1v53";
|
||||
rev = "faa7b92c6f1d05d20b3ba7249e5c2dd3a76c19c1";
|
||||
sha256 = "05nimvwjyg2sphgfv2xq6wggl54frh7lrgsxv7jg1c9w1lmg6z77";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
@@ -16567,12 +16567,12 @@ final: prev:
|
||||
|
||||
vimspector = buildVimPlugin {
|
||||
pname = "vimspector";
|
||||
version = "2024-05-08";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "puremourning";
|
||||
repo = "vimspector";
|
||||
rev = "c664d723ffe5d5179b906d8ef370b59e70b84f5a";
|
||||
sha256 = "1953bdv2x0xs0cc6vjv3lsy9ipgv16la981wf83x64kxb1mkds0b";
|
||||
rev = "c37d50fc463013bdad2ba044615b0bc2ce163681";
|
||||
sha256 = "1iqx1x5mig0zd9vrc81fqavz4i59065a6yavqicws2d8la8rppv2";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/puremourning/vimspector/";
|
||||
@@ -16760,12 +16760,12 @@ final: prev:
|
||||
|
||||
wiki-vim = buildVimPlugin {
|
||||
pname = "wiki.vim";
|
||||
version = "2024-05-14";
|
||||
version = "2024-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "wiki.vim";
|
||||
rev = "0dc5fff1c9c5b703dc6e6e17abc5b3c5050d168e";
|
||||
sha256 = "0na7j7c6wsjc3nghwfvxw9718bf6032l21d978n6aq6d0zrga0n3";
|
||||
rev = "2cdd5e5a73dd2fe54935b929aa802c39264b552e";
|
||||
sha256 = "1qqkyy6s1367xss7rj7rssz0m7h2bh76nml0i7nv7f88rclgrsh8";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/wiki.vim/";
|
||||
};
|
||||
|
||||
@@ -406,8 +406,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
publisher = "asvetliakov";
|
||||
version = "1.8.1";
|
||||
sha256 = "0kqzry0cbvvy1pkbx5rhnk5ry7j91cbf11vz1s1jrqc7j0hq0yx8";
|
||||
version = "1.11.4";
|
||||
hash = "sha256-dAovrYfA5muPNhFIHycxuO0CIWPT4T9hsEzri1JDOUI=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
|
||||
|
||||
@@ -43,11 +43,11 @@ let
|
||||
gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";
|
||||
supported = {
|
||||
x86_64-linux = {
|
||||
hash = "sha256-p8WFmkQKdzXF0FTWHabyeFMkwXa2RkDRM9SvvkBIOLY=";
|
||||
hash = "sha256-arTBt3UWA5zoo0dL044Sx/NT1LUS76XfGIS96NOMvJk=";
|
||||
arch = "linux-x64";
|
||||
};
|
||||
aarch64-linux = {
|
||||
hash = "sha256-HISE8/M9IpeI8iX0mmw9owExnpgiwpesE7YG/+QFYgc=";
|
||||
hash = "sha256-oVuDxx117bVd/jDqn9KivTwR5T2X5UZMHk/nZ/e/IOg=";
|
||||
arch = "linux-arm64";
|
||||
};
|
||||
};
|
||||
@@ -58,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = base // {
|
||||
name = "cpptools";
|
||||
publisher = "ms-vscode";
|
||||
version = "1.20.2";
|
||||
version = "1.20.5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -105,9 +105,9 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging.";
|
||||
homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [
|
||||
lib.maintainers.jraygauthier
|
||||
lib.maintainers.stargate01
|
||||
maintainers = with lib.maintainers; [
|
||||
jraygauthier
|
||||
stargate01
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
|
||||
@@ -19,8 +19,6 @@ python3Packages.buildPythonApplication rec {
|
||||
colorama imagesize lxml requests setuptools six
|
||||
];
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.3";
|
||||
|
||||
meta = {
|
||||
description = "A comic strip downloader and archiver";
|
||||
mainProgram = "dosage";
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.29.6.4";
|
||||
version = "3.29.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "qcad-${version}-src";
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/Tz3brcny9wp8DnCvO7GpPczglJpJD0kWzBR6exRlPA=";
|
||||
hash = "sha256-2x3np1cmjJ/IN/vSqKX6mTQbtFROxPzhXPjeJ6mxe9k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
+7
-6
@@ -12,15 +12,16 @@ index 525693b6c10ab..245491e137d39 100644
|
||||
"ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM=$enable_media_foundation_widevine_cdm",
|
||||
]
|
||||
diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni
|
||||
index 58f073ca562ca..4b242c2618dfb 100644
|
||||
index 8b97b7a57419e..69fe548ec2845 100644
|
||||
--- a/third_party/widevine/cdm/widevine.gni
|
||||
+++ b/third_party/widevine/cdm/widevine.gni
|
||||
@@ -41,8 +41,7 @@ enable_library_widevine_cdm =
|
||||
# Widevine CDM can be deployed as a component. Currently only supported on
|
||||
# desktop platforms. The CDM can be bundled regardless whether
|
||||
# it's a component. See below.
|
||||
@@ -42,9 +42,7 @@ enable_library_widevine_cdm =
|
||||
# desktop platforms. Not enabled for lacros (as it is changing to use the
|
||||
# ash updated version). The CDM can be bundled regardless whether it's a
|
||||
# component. See below.
|
||||
-enable_widevine_cdm_component =
|
||||
- enable_library_widevine_cdm && (is_win || is_mac || is_linux || is_chromeos)
|
||||
- enable_library_widevine_cdm &&
|
||||
- (is_win || is_mac || is_linux || is_chromeos_ash)
|
||||
+enable_widevine_cdm_component = false
|
||||
|
||||
# Enable (Windows) Media Foundation Widevine CDM component.
|
||||
|
||||
@@ -1,37 +1,37 @@
|
||||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-00582jnlAkVkqFsylZnTWfHh5TJkz+m9W8QCXYKerfo=";
|
||||
hash_darwin = "sha256-ahwPSPoB2h6Zq4ePbvSmYs3WNc+MpBXQYyYLf0ZS3ss=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-EV45I6lav93uMzgZkjypq1RazqtP1W8w8/c4dVZ5hjI=";
|
||||
hash_linux = "sha256-xCizRpHgcent3D/tMBK+CtXiwtTdH61fja1u8QyECCA=";
|
||||
version = "124.0.6367.207";
|
||||
"sha256-NVqr/i4S4XP+z0+YT6CuDnmyN4GtS6ttyJDOQ05KB+0=";
|
||||
hash_linux = "sha256-PKuhfBw5FblCUQ60yeQC0McvYu7gPfwwIW1ysN/MwVA=";
|
||||
version = "125.0.6422.60";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
hash = "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ=";
|
||||
rev = "22581fb46c0c0c9530caa67149ee4dd8811063cf";
|
||||
hash = "sha256-lrVAb6La+cvuUCNI90O6M/sheOEVFTjgpfA3O/6Odp0=";
|
||||
rev = "d823fd85da3fb83146f734377da454473b93a2b2";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2024-03-14";
|
||||
version = "2024-04-10";
|
||||
};
|
||||
};
|
||||
hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8=";
|
||||
version = "124.0.6367.207";
|
||||
hash = "sha256-ewX7oRna7IYCXhAe98HS5HbS1psIEAguhZJ1ymK+dPE=";
|
||||
version = "125.0.6422.60";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
gn = {
|
||||
hash = "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ=";
|
||||
rev = "22581fb46c0c0c9530caa67149ee4dd8811063cf";
|
||||
hash = "sha256-lrVAb6La+cvuUCNI90O6M/sheOEVFTjgpfA3O/6Odp0=";
|
||||
rev = "d823fd85da3fb83146f734377da454473b93a2b2";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2024-03-14";
|
||||
version = "2024-04-10";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-7Z9j+meVRZYLmreCzHlJe71E9kj5YJ4rrfpQ/deNTpM=";
|
||||
rev = "124.0.6367.207-1";
|
||||
hash = "sha256-I3RQBa4LLuOdZQFKHIqePj9Ozw61dsuAOctqN1abij0=";
|
||||
rev = "125.0.6422.60-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8=";
|
||||
version = "124.0.6367.207";
|
||||
hash = "sha256-ewX7oRna7IYCXhAe98HS5HbS1psIEAguhZJ1ymK+dPE=";
|
||||
version = "125.0.6422.60";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
let
|
||||
pname = "polypane";
|
||||
version = "18.0.4";
|
||||
version = "19.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-FqaXLoFgkKHzOvy7f9R36uIDnv2c6HrVF6T3VK5Aw3c=";
|
||||
sha256 = "sha256-yRJsyJ4dhPAbqVmUmVnFlGGQ5CUJZ0VG19TMnSW0tJ4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-gadget";
|
||||
version = "0.28.0";
|
||||
version = "0.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inspektor-gadget";
|
||||
repo = "inspektor-gadget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iQ+9CN6De2jz3+dZ26jgqbXAx9Fef8ROgVX8kKYMAG0=";
|
||||
hash = "sha256-+eysHATyAdCN6HVPN2bgc/ICo+XXaef0H0UDW2xCcjc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0XByai7fEnkmEEkH1koVM1+z3UNFLbsUCK3sP4KBe+A=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeone";
|
||||
version = "1.7.4";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GK5SEQjQb553MypcRpTfmewVhucP1fRldpXhfLERkMo=";
|
||||
hash = "sha256-BYfnHgTiHMmKdW25XymP2nDYQDOEHSIUOjrtwaoc1JU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pt3EWohdXOBgE3SfEEODUi1uX/X+jJ2JrBbLFIXDbwY=";
|
||||
vendorHash = "sha256-tAThtZJ5DRzveJRG58VPxJWrZjB+dnXhX/50lZEHUGc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "tftui";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idoavrah";
|
||||
repo = "terraform-tui";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2Kya0MRa1kc3B5nqs2MNprtnjOGyMLQh2OSErdT5W8M=";
|
||||
hash = "sha256-5eMOd+jpJh5jxthzk5JCl3vvri0PtffolSzdHY/3nbg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "4.10.0";
|
||||
version = "4.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7Gmb28/k72wfd2bWDCk7onUBAzNs6b5q52lCn0WB3B8=";
|
||||
hash = "sha256-TBLxwHiL3knM+GQoTYD2L/deASPpbUsDlGk4VeVmki4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uYClwaFSj03K4YD/jvn67sIko72jDqd5Fv2zoCXZZbw=";
|
||||
vendorHash = "sha256-kmnV1W0HGlxFZYYUeUd9D/zOabUhM5kDoTZTnRYJ2sM=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -26,11 +26,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zeek";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.zeek.org/zeek-${version}.tar.gz";
|
||||
hash = "sha256-Y1Z+j5+Ffqho5Q2O8uQgNxsxPE7gqHaxe1SZEJDA0oY=";
|
||||
hash = "sha256-ZOOlK9mfZVrfxvgFREgqcRcSs18EMpADD8Y4Ev391Bw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "7.9.0-beta.1";
|
||||
version = "7.10.0-beta.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-NZo2H+rX7sy+aPP9Bl9EWPEROkhLXG2puUdbc0s7Nbw=";
|
||||
hash = "sha256-8S7O5v514OjUgXRuYvqOf83377RefZrFrQD2MbLm0QA=";
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, wrapGAppsHook3
|
||||
, makeDesktopItem
|
||||
@@ -21,20 +20,16 @@ let
|
||||
pin = "2.2.1-20230117.075740-16";
|
||||
};
|
||||
};
|
||||
jackson-datatype-jsr310 = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.15.3/jackson-datatype-jsr310-2.15.3.jar";
|
||||
hash = "sha256-vqHXgAnrxOXVSRij967F2p+9CfZiwZGiF//PN+hSfF4=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.12";
|
||||
version = "5.13";
|
||||
pname = "jabref";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JabRef";
|
||||
repo = "jabref";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+ltd9hItmMkEpKzX6TFfFy5fiOkLBK/tQNsh8OVDeoc=";
|
||||
hash = "sha256-inE2FXAaEEiq7343KwtjEiTEHLtn01AzP0foTpsLoAw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -47,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
categories = [ "Office" ];
|
||||
icon = "jabref";
|
||||
exec = "JabRef %U";
|
||||
startupWMClass = "org.jabref.gui.JabRefMain";
|
||||
startupWMClass = "org.jabref.gui.JabRefGUI";
|
||||
mimeTypes = [ "text/x-bibtex" ];
|
||||
})
|
||||
];
|
||||
@@ -69,13 +64,11 @@ stdenv.mkDerivation rec {
|
||||
| sh
|
||||
mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \
|
||||
$out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot}
|
||||
# This is used but not cached by Gradle.
|
||||
cp ${jackson-datatype-jsr310} $out/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.15.3/jackson-datatype-jsr310-2.15.3.jar
|
||||
'';
|
||||
# Don't move info to share/
|
||||
forceShare = [ "dummy" ];
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-baP/zNgcc6oYwwbWvT7ontULcKKCw0rTQRkdZMgcWfY=";
|
||||
outputHash = "sha256-lpFIhvPgkzIsHR6IVnn+oPhdSjo0yOIw7USo2+SJCVQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -93,9 +86,6 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java \
|
||||
--replace '/usr' '/run/current-system/sw'
|
||||
|
||||
# Don't fetch predatory sources. These source are fetched from online webpages.
|
||||
sed -i -e '/new PJSource/,/);/c);' src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListCrawler.java
|
||||
|
||||
# Add back downloadDependencies task for deps download which is removed upstream in https://github.com/JabRef/jabref/pull/10326
|
||||
cat <<EOF >> build.gradle
|
||||
task downloadDependencies {
|
||||
@@ -117,9 +107,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preBuild = ''
|
||||
# Use the local packages from -deps
|
||||
sed -i -e '/repositories {/a maven { url uri("${deps}") }' \
|
||||
build.gradle \
|
||||
settings.gradle
|
||||
sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle
|
||||
sed -i -e '1i pluginManagement { repositories { maven { url uri("${deps}") } } }' settings.gradle
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -170,9 +159,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1
|
||||
|
||||
# workaround for https://github.com/NixOS/nixpkgs/issues/162064
|
||||
unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/
|
||||
|
||||
DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g')
|
||||
|
||||
runHook postInstall
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
let
|
||||
pname = "mendeley";
|
||||
version = "2.114.0";
|
||||
version = "2.114.1";
|
||||
|
||||
executableName = "${pname}-reference-manager";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
|
||||
hash = "sha256-1eLxk+nlgHoe0Gmo/DXlTOnWssrN9cAubvqpV6SqQS8=";
|
||||
hash = "sha256-bvX5onyTPc4G+9PcrSXhsfkNbU6DZ5T3ljf+r77bjKw=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.7.2";
|
||||
version = "2.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vXW2d45Mth3Y95xPPH8bFjVLWVdUl+WuvSXJyPD3FyU=";
|
||||
hash = "sha256-Jcy/nds/JuivRV8mRtq2FbBB2L/CGqmoHoG1wVCwHFU=";
|
||||
};
|
||||
|
||||
# subpath installation is broken with uvicorn >= 0.26
|
||||
@@ -74,7 +74,7 @@ let
|
||||
cd src-ui
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-MJ5pnQChghZBfVN6Lbz6VcMtbe8QadiFLTsMF5TlebQ=";
|
||||
npmDepsHash = "sha256-xRUZnFekzWHPtlUbpt0JZmlNjdjS1bBZDz8MmH8DC2U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -244,6 +244,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
disabledTests = [
|
||||
# FileNotFoundError(2, 'No such file or directory'): /build/tmp...
|
||||
"test_script_with_output"
|
||||
"test_script_exit_non_zero"
|
||||
# AssertionError: 10 != 4 (timezone/time issue)
|
||||
# Due to getting local time from modification date in test_consumer.py
|
||||
"testNormalOperation"
|
||||
|
||||
@@ -64,6 +64,12 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove the build command line from the source.
|
||||
# This avoids dependencies to .dev inputs
|
||||
./remove-compiler-options.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3 which openssh makeWrapper pkg-config ]
|
||||
++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
|
||||
|
||||
@@ -75,6 +81,7 @@ stdenv.mkDerivation rec {
|
||||
libvori
|
||||
libxc
|
||||
libxsmm
|
||||
mpi
|
||||
spglib
|
||||
scalapack
|
||||
blas
|
||||
@@ -101,7 +108,7 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [ mpi ];
|
||||
propagatedBuildInputs = [ (lib.getBin mpi) ];
|
||||
propagatedUserEnvPkgs = [ mpi ];
|
||||
|
||||
makeFlags = [
|
||||
@@ -149,14 +156,16 @@ stdenv.mkDerivation rec {
|
||||
-D__PLUMED2 -D__HDF5 -D__GSL -D__SIRIUS -D__LIBVDWXC -D__SPFFT -D__SPLA \
|
||||
${lib.strings.optionalString (gpuBackend == "cuda") "-D__OFFLOAD_CUDA -D__ACC -D__DBCSR_ACC -D__NO_OFFLOAD_PW"} \
|
||||
${lib.strings.optionalString (gpuBackend == "rocm") "-D__OFFLOAD_HIP -D__DBCSR_ACC -D__NO_OFFLOAD_PW"}
|
||||
CFLAGS = -fopenmp -I${lib.getDev hdf5-fortran}/include -I${lib.getDev gsl}/include
|
||||
CFLAGS = -fopenmp
|
||||
FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \
|
||||
-ftree-vectorize -funroll-loops -msse2 \
|
||||
-std=f2008 \
|
||||
-fopenmp -ftree-vectorize -funroll-loops \
|
||||
-I${lib.getDev libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \
|
||||
${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \
|
||||
-I${lib.getDev libint}/include \
|
||||
-I${lib.getDev sirius}/include/sirius \
|
||||
-I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include \
|
||||
-I${lib.getDev libxc}/include \
|
||||
-I${lib.getDev libxsmm}/include \
|
||||
-I${lib.getDev hdf5-fortran}/include \
|
||||
-fallow-argument-mismatch
|
||||
LIBS = -lfftw3 -lfftw3_threads \
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
diff --git a/src/start/cp2k.F b/src/start/cp2k.F
|
||||
index f69146ea3..a195f0620 100644
|
||||
--- a/src/start/cp2k.F
|
||||
+++ b/src/start/cp2k.F
|
||||
@@ -58,8 +58,7 @@ PROGRAM cp2k
|
||||
USE input_cp2k, ONLY: create_cp2k_root_section
|
||||
USE input_section_types, ONLY: section_release,&
|
||||
section_type
|
||||
- USE iso_fortran_env, ONLY: compiler_options,&
|
||||
- compiler_version
|
||||
+ USE iso_fortran_env, ONLY: compiler_version
|
||||
USE kinds, ONLY: default_path_length
|
||||
USE machine, ONLY: default_output_unit
|
||||
#include "../base/base_uses.f90"
|
||||
@@ -70,7 +69,6 @@ PROGRAM cp2k
|
||||
arg_att, command
|
||||
CHARACTER(LEN=default_path_length), &
|
||||
DIMENSION(:, :), ALLOCATABLE :: initial_variables, initial_variables_tmp
|
||||
- CHARACTER(LEN=:), ALLOCATABLE :: compiler_options_string
|
||||
INTEGER :: output_unit, l, i, var_set_sep, inp_var_idx
|
||||
INTEGER :: ierr, i_arg
|
||||
LOGICAL :: check, usage, echo_input, command_line_error
|
||||
@@ -328,14 +326,6 @@ PROGRAM cp2k
|
||||
WRITE (output_unit, "(T2,A)") cp2k_version, &
|
||||
"Source code revision "//TRIM(compile_revision), &
|
||||
TRIM(cp2k_flags())
|
||||
- compiler_options_string = compiler_options()
|
||||
- WRITE (output_unit, "(T2,A,A)") "compiler: ", compiler_version()
|
||||
- WRITE (output_unit, "(T2,A)") "compiler options:"
|
||||
- DO i = 0, (LEN(compiler_options_string) - 1)/68
|
||||
- WRITE (output_unit, "(T4,A)") &
|
||||
- compiler_options_string(i*68 + 1:MIN(LEN(compiler_options_string), (i + 1)*68))
|
||||
- END DO
|
||||
- DEALLOCATE (compiler_options_string)
|
||||
END IF
|
||||
END IF
|
||||
|
||||
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config ] ++ (with ocamlPackages; [ ocaml findlib camlp5 ]);
|
||||
buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]);
|
||||
|
||||
dontAddPrefix = true;
|
||||
configureFlags = [ "--prefix" "$(out)" ];
|
||||
prefixKey = "--prefix ";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A program for proof-tree visualization";
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, Cocoa
|
||||
@@ -23,18 +22,18 @@
|
||||
, qtwebengine
|
||||
, qtx11extras
|
||||
, jellyfin-web
|
||||
, withDbus ? stdenv.isLinux, dbus
|
||||
, withDbus ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "jellyfin-media-player";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-media-player";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-97/9UYXOsg8v7QoRqo5rh0UGhjjS85K9OvUwtlG249c=";
|
||||
sha256 = "sha256-XeDyNSQpnTgV6u1vT69DEfbFHvBu1LNhvsQmKvUYq2o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
diff --git a/resources/settings/settings_description.json b/resources/settings/settings_description.json
|
||||
index 20fff81..9979de5 100644
|
||||
index 3329d0d..ccd5718 100644
|
||||
--- a/resources/settings/settings_description.json
|
||||
+++ b/resources/settings/settings_description.json
|
||||
@@ -118,7 +118,7 @@
|
||||
},
|
||||
{
|
||||
@@ -127,7 +127,7 @@
|
||||
"value": "checkForUpdates",
|
||||
"display_name": "Check For Updates",
|
||||
"help": "Allows user to disable update check plugin script.",
|
||||
- "default": true
|
||||
+ "default": false
|
||||
},
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.1.11";
|
||||
version = "2.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QQgpvvk7S6ARzBct/4AQP66End30EXcUPqv8a4Udoas=";
|
||||
hash = "sha256-iSC1Q7fdf+4YH4vLFPOscRWxNv/xygYx872u8msmMmc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ddev";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddev";
|
||||
repo = "ddev";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+CyihuSo/ssX8tX2rYi3c41eAwdG58aagAsYiBBjQ48=";
|
||||
hash = "sha256-qGuYH2xYmd3CYoYobjoum+zUImcsiaG5No36FG0H0bA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ lib, buildPythonApplication, fetchPypi, pythonOlder
|
||||
{ lib, buildPythonApplication, fetchPypi
|
||||
, installShellFiles
|
||||
, mock, pytest, nose
|
||||
, pyyaml, colorama, docopt
|
||||
, dockerpty, docker, jsonschema, requests
|
||||
, six, texttable, websocket-client, cached-property
|
||||
, enum34, functools32, paramiko, distro, python-dotenv
|
||||
, paramiko, distro, python-dotenv
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
@@ -24,9 +24,7 @@ buildPythonApplication rec {
|
||||
pyyaml colorama dockerpty docker
|
||||
jsonschema requests six texttable websocket-client
|
||||
docopt cached-property paramiko distro python-dotenv
|
||||
]
|
||||
++ lib.optional (pythonOlder "3.4") enum34
|
||||
++ lib.optional (pythonOlder "3.2") functools32;
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove upper bound on requires, see also
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, unzip
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
gitUpdater,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "alt-tab-macos";
|
||||
version = "6.68.0";
|
||||
version = "6.69.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
|
||||
hash = "sha256-NjDq5Uq771xRHeTipqwTrlz9vBCSsnV34A0482tcZuE=";
|
||||
hash = "sha256-v0HeucpDGdnK0p9zoYUbEBoHzRMlcJBEIIS1vQZ00A0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@@ -26,12 +28,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://github.com/lwouis/alt-tab-macos";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Windows alt-tab on macOS";
|
||||
homepage = "https://alt-tab-macos.netlify.app";
|
||||
license = licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
donteatoreo
|
||||
emilytrau
|
||||
Enzime
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ emilytrau Enzime ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -33,11 +33,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apt";
|
||||
version = "2.9.2";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-gKp0RmsTLlDtjQFZ8Q5kpEi2psZHI9YsQrg6UZnKA6c=";
|
||||
hash = "sha256-7R0BlcpujXjbulOJ7Eb8/gQiut77vce1GkbJCfa6LXE=";
|
||||
};
|
||||
|
||||
# cycle detection; lib can't be split
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "arc-browser";
|
||||
version = "1.42.1-49918";
|
||||
version = "1.43.0-50018";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-O0l2o0POyeZTqxJAahc/PfA4qS7US4AQYRnE6jSdqoE=";
|
||||
hash = "sha256-naYL4AHmo8L1kxlkuCxqEBFWZZ14Nj+wUxzHGB1vNfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
@@ -1,4 +1,23 @@
|
||||
{ copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenv, udev, xorg }:
|
||||
{ copyDesktopItems
|
||||
, fetchurl
|
||||
, jre
|
||||
, lib
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
|
||||
, gamemodeSupport ? stdenv.isLinux
|
||||
, textToSpeechSupport ? stdenv.isLinux
|
||||
, additionalLibs ? [ ]
|
||||
|
||||
, # dependencies
|
||||
flite
|
||||
, gamemode
|
||||
, libglvnd
|
||||
, libpulseaudio
|
||||
, udev
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "atlauncher";
|
||||
@@ -18,23 +37,35 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
installPhase =
|
||||
let
|
||||
runtimeLibraries = [
|
||||
libglvnd
|
||||
libpulseaudio
|
||||
udev
|
||||
xorg.libXxf86vm
|
||||
]
|
||||
++ lib.optional gamemodeSupport gamemode.lib
|
||||
++ lib.optional textToSpeechSupport flite
|
||||
++ additionalLibs;
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/java
|
||||
cp $src $out/share/java/ATLauncher.jar
|
||||
mkdir -p $out/bin $out/share/java
|
||||
cp $src $out/share/java/ATLauncher.jar
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/atlauncher \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm udev ]}" \
|
||||
--add-flags "-jar $out/share/java/ATLauncher.jar" \
|
||||
--add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \
|
||||
--add-flags "--no-launcher-update"
|
||||
makeWrapper ${jre}/bin/java $out/bin/atlauncher \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibraries}" \
|
||||
--add-flags "-jar $out/share/java/ATLauncher.jar" \
|
||||
--add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \
|
||||
--add-flags "--no-launcher-update"
|
||||
|
||||
mkdir -p $out/share/icons/hicolor/scalable/apps
|
||||
cp $ICON $out/share/icons/hicolor/scalable/apps/atlauncher.svg
|
||||
mkdir -p $out/share/icons/hicolor/scalable/apps
|
||||
cp $ICON $out/share/icons/hicolor/scalable/apps/atlauncher.svg
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, rustfmt, rustPlatform, fetchFromGitHub }:
|
||||
{ lib, rustfmt, rustPlatform, fetchFromGitHub, gitUpdater }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-typify";
|
||||
@@ -22,11 +22,14 @@ rustPlatform.buildRustPackage rec {
|
||||
export RUSTFMT="${lib.getExe rustfmt}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "JSON Schema to Rust type converter";
|
||||
mainProgram = "cargo-typify";
|
||||
homepage = "https://github.com/oxidecomputer/typify";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ david-r-cox ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
+1596
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "catppuccinifier-cli";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lighttigerXIV";
|
||||
repo = "catppuccinifier";
|
||||
rev = version;
|
||||
hash = "sha256-CEjdCr7QgyQw+1VmeEyt95R0HKE0lAKZHrwahaxgJoU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src/catppuccinifier-cli";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"catppuccinifier-rs-0.1.0" = "sha256-/lwc5cqLuCvGwcCiEHlYkbQZlS13z40OFVl26tpjsTQ=";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Apply catppuccin flavors to your wallpapers";
|
||||
homepage = "https://github.com/lighttigerXIV/catppuccinifier";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "catppuccinifier-cli";
|
||||
maintainers = with lib.maintainers; [ aleksana isabelroses ];
|
||||
platforms = with lib.platforms; linux ++ windows;
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cimg";
|
||||
version = "3.3.5";
|
||||
version = "3.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreycLab";
|
||||
repo = "CImg";
|
||||
rev = "v.${finalAttrs.version}";
|
||||
hash = "sha256-QdQhMEY6Zl3qdvRIeDv/12TL4HMrNJSAQ66vQymOrBU=";
|
||||
hash = "sha256-yNIHCEiLvoNNsYisAKo/jj6Q2mLrLMttZyj2XzrWFU4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
@@ -1,20 +1,24 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, lua
|
||||
, luaPackages
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromSourcehut,
|
||||
lua,
|
||||
luaPackages,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fennel-ls";
|
||||
version = "0.1.0";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~xerool";
|
||||
repo = "fennel-ls";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RW3WFJGwascD4YnnrAm/2LFnVigzgtfzVubLMDW9J5s=";
|
||||
hash = "sha256-8TDJ03x9dkfievbovzMN3JRfIKba3CfzbcRAZOuPbKs=";
|
||||
};
|
||||
buildInputs = [ lua luaPackages.fennel ];
|
||||
buildInputs = [
|
||||
lua
|
||||
luaPackages.fennel
|
||||
];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@@ -22,8 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "A language server for intelligent editing of the Fennel Programming Language";
|
||||
homepage = "https://git.sr.ht/~xerool/fennel-ls/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yisraeldov ];
|
||||
platforms = lua.meta.platforms;
|
||||
changelog = "https://git.sr.ht/~xerool/fennel-ls/refs/${version}";
|
||||
maintainers = with maintainers; [
|
||||
luftmensch-luftmensch
|
||||
yisraeldov
|
||||
];
|
||||
inherit (lua.meta) platforms;
|
||||
mainProgram = "fennel-ls";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -53,11 +53,11 @@ assert lib.assertMsg
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.3.5";
|
||||
version = "3.3.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-71i8vk9XR6Q8SSEWvGXMcAOIE6DoIVJkylS4SiZLUBY=";
|
||||
hash = "sha256-LZwAMLvQ+X6xkvnL+7LA/UmwDBGgapUtFHNJuV04F+Y=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/gmic-qt";
|
||||
|
||||
@@ -0,0 +1,151 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
dpkg,
|
||||
makeBinaryWrapper,
|
||||
wrapGAppsHook3,
|
||||
alsa-lib,
|
||||
at-spi2-atk,
|
||||
at-spi2-core,
|
||||
atk,
|
||||
cairo,
|
||||
cups,
|
||||
dbus,
|
||||
expat,
|
||||
ffmpeg,
|
||||
fontconfig,
|
||||
freetype,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
gtk3,
|
||||
libappindicator-gtk3,
|
||||
libdrm,
|
||||
libnotify,
|
||||
libpulseaudio,
|
||||
libsecret,
|
||||
libuuid,
|
||||
libxkbcommon,
|
||||
mesa,
|
||||
nss,
|
||||
pango,
|
||||
systemd,
|
||||
xdg-utils,
|
||||
xorg,
|
||||
wayland,
|
||||
pipewire,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "goofcord";
|
||||
version = "1.4.2";
|
||||
|
||||
src =
|
||||
let
|
||||
base = "https://github.com/Milkshiift/GoofCord/releases/download";
|
||||
in
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-amd64.deb";
|
||||
hash = "sha256-fUP/se3hOhs+aAoew25YhRyxnodYPrgqN68RIg1A1Kw=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-arm64.deb";
|
||||
hash = "sha256-hVpXmBSIgoON683f/sRtmpHwqxcO6IrFCCRPZjsUqjw=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeBinaryWrapper
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
ffmpeg
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
pango
|
||||
systemd
|
||||
mesa # for libgbm
|
||||
nss
|
||||
libuuid
|
||||
libdrm
|
||||
libnotify
|
||||
libsecret
|
||||
libpulseaudio
|
||||
libxkbcommon
|
||||
libappindicator-gtk3
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXScrnSaver
|
||||
xorg.libxshmfence
|
||||
xorg.libXtst
|
||||
wayland
|
||||
pipewire
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
unpackCmd = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
cp -R "opt" "$out"
|
||||
cp -R "usr/share" "$out/share"
|
||||
chmod -R g-w "$out"
|
||||
|
||||
# Wrap the startup command
|
||||
makeBinaryWrapper $out/opt/GoofCord/goofcord $out/bin/goofcord \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
||||
|
||||
# Fix desktop link
|
||||
substituteInPlace $out/share/applications/goofcord.desktop \
|
||||
--replace /opt/GoofCord/ ""
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Highly configurable and privacy-focused Discord client";
|
||||
homepage = "https://github.com/Milkshiift/GoofCord";
|
||||
downloadPage = "https://github.com/Milkshiift/GoofCord";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.osl3;
|
||||
maintainers = with maintainers; [ nyanbinary ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
mainProgram = "goofcord";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gungnir";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g0ldencybersec";
|
||||
repo = "gungnir";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k6fxAvUBAAcTHzdeGhekYhPpnS05jHq/7EqxafQfMio=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r2aU59L0fnSdc/lpR04K/GQ1eZ7ihV+tKlyuS6sPX2o=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line tool that continuously monitors certificate transparency (CT) logs for newly issued SSL/TLS certificates";
|
||||
homepage = "https://github.com/g0ldencybersec/gungnir";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cherrykitten ];
|
||||
mainProgram = "gungnir";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
diff --git a/src/haredo.ha b/src/haredo.ha
|
||||
index c2e56e6..304c9ad 100644
|
||||
--- a/src/haredo.ha
|
||||
+++ b/src/haredo.ha
|
||||
@@ -280,12 +280,12 @@ fn try_do(
|
||||
const tmpfilepath = strings::concat(ctx.tmpdir, "/", tmpfilename);
|
||||
|
||||
const cmd = if (ctx.verbose) {
|
||||
- fmt::errorln("* sh -ev", dopaths.do, dopaths.target,
|
||||
+ fmt::errorln("* @bash@/bin/sh -ev", dopaths.do, dopaths.target,
|
||||
dopaths.basename, tmpfilepath)?;
|
||||
- yield exec::cmd("sh", "-ev", dopaths.do, dopaths.target,
|
||||
+ yield exec::cmd("@bash@/bin/sh", "-ev", dopaths.do, dopaths.target,
|
||||
dopaths.basename, tmpfilepath)?;
|
||||
} else {
|
||||
- yield exec::cmd("sh", "-e", dopaths.do, dopaths.target,
|
||||
+ yield exec::cmd("@bash@/bin/sh", "-e", dopaths.do, dopaths.target,
|
||||
dopaths.basename, tmpfilepath)?;
|
||||
};
|
||||
|
||||
@@ -1,17 +1,22 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromSourcehut
|
||||
, hare
|
||||
, scdoc
|
||||
, nix-update-script
|
||||
, makeWrapper
|
||||
, bash
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromSourcehut,
|
||||
hare,
|
||||
scdoc,
|
||||
nix-update-script,
|
||||
makeWrapper,
|
||||
bash,
|
||||
substituteAll,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haredo";
|
||||
version = "1.0.5";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~autumnull";
|
||||
@@ -20,6 +25,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-gpui5FVRw3NKyx0AB/4kqdolrl5vkDudPOgjHc/IE4U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use nix store's bash instead of sh. `@bash@/bin/sh` is used, since haredo expects a posix shell.
|
||||
(substituteAll {
|
||||
src = ./001-use-nix-store-sh.patch;
|
||||
inherit bash;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
hare
|
||||
makeWrapper
|
||||
@@ -62,11 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/haredo \
|
||||
--prefix PATH : "${lib.makeBinPath [bash]}"
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "izrss";
|
||||
@@ -15,7 +15,7 @@ buildGoModule {
|
||||
owner = "isabelroses";
|
||||
repo = "izrss";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6ayTxAjVqMjgDbk4oJjxzSUkWA6kU3Rnvvma+ryy4bw=";
|
||||
hash = "sha256-tO/m39FMtvxZzNgnVY84k4J2v8vQVdzR3IKofJWCf9U=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -24,13 +24,14 @@ buildGoModule {
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-gH5AFroreBD0tQmT99Bmo2pAdPkiPWUNGsmKX4p3/JA=";
|
||||
vendorHash = "sha256-/gD82wT4jWNMQsGPb2nYQiFQsUdKICyO6eiRPHrLsy8=";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "An RSS feed reader for the terminal written in Go";
|
||||
changelog = "https://github.com/isabelroses/izrss/releases/v${version}";
|
||||
homepage = "https://github.com/isabelroses/izrss";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
isabelroses
|
||||
luftmensch-luftmensch
|
||||
];
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-meta";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -16,12 +16,12 @@ buildGoModule rec {
|
||||
owner = "mautrix";
|
||||
repo = "meta";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QyVcy9rqj1n1Nn/+gBufd57LyEaXPyu0KQhAUTgNmBA=";
|
||||
hash = "sha256-zU8c/ZAKTKd4dbG056gOCiPzvPNS5/KEkJ2fw48oV00=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorHash = "sha256-oQSjP1WY0LuxrMtIrvyKhize91wXJxTzWeH0Y3MsEL4=";
|
||||
vendorHash = "sha256-uwprj4G7HI87ZGr+6Bqkp77nzW6kgV3S5j4NGjbtOwQ=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -4,27 +4,35 @@
|
||||
fetchFromGitHub,
|
||||
gnuplot,
|
||||
makeWrapper,
|
||||
testers,
|
||||
mini-calc,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mini-calc";
|
||||
version = "2.13.0";
|
||||
version = "2.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coco33920";
|
||||
repo = "calc";
|
||||
rev = version;
|
||||
hash = "sha256-rvQXn0VuOjB7CSf+bDTGxjeMKpbJGhVmyDLNYSy/Mlw=";
|
||||
hash = "sha256-qLPIo+Ht34YApWwl16Xscq2+vlAdlbCK5AeKy5q9cO0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QFzrJBnGKAgDhjbbik0WP3Y1fNoHMAiWpEHfidFQGPk=";
|
||||
cargoHash = "sha256-oWN9JLPswNKRKDG3dh3z7aleAaqQ7AlMP+Zp2BpBueE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/mini-calc \
|
||||
--prefix PATH : "${lib.makeBinPath [ gnuplot ]}"
|
||||
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = mini-calc;
|
||||
# `mini-calc -v` does not output in the test env, fallback to pipe
|
||||
command = "echo -v | mini-calc";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A fully-featured minimalistic configurable calculator written in Rust";
|
||||
changelog = "https://github.com/coco33920/calc/blob/${version}/CHANGELOG.md";
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{ stdenvNoCC, lib, fetchurl }:
|
||||
|
||||
let
|
||||
version = "1.0";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "miracode";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/IdreesInc/Miracode/releases/download/v${version}/Miracode.ttf";
|
||||
hash = "sha256-Q+/D/TPlqOt779qYS/dF7ahEd3Mm4a4G+wdHB+Gutmo=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 $src $out/share/fonts/truetype/Miracode.ttf
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A sharp, readable, vector-y version of Monocraft";
|
||||
homepage = "https://github.com/IdreesInc/Miracode";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ coca ];
|
||||
};
|
||||
}
|
||||
+6712
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,192 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
buildGoModule,
|
||||
nix-update-script,
|
||||
modrinth-app-unwrapped,
|
||||
cacert,
|
||||
cargo-tauri,
|
||||
desktop-file-utils,
|
||||
esbuild,
|
||||
darwin,
|
||||
jq,
|
||||
libsoup,
|
||||
moreutils,
|
||||
nodePackages,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk,
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "modrinth-app-unwrapped";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modrinth";
|
||||
repo = "theseus";
|
||||
rev = "v${modrinth-app-unwrapped.version}";
|
||||
sha256 = "sha256-JWR0e2vOBvOLosr22Oo2mAlR0KAhL+261RRybhNctlM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tauri-plugin-single-instance-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
|
||||
};
|
||||
};
|
||||
|
||||
pnpm-deps = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "${modrinth-app-unwrapped.pname}-pnpm-deps";
|
||||
inherit (modrinth-app-unwrapped) version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/theseus_gui";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cacert
|
||||
jq
|
||||
moreutils
|
||||
nodePackages.pnpm
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56
|
||||
installPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
pnpm config set store-dir "$out"
|
||||
pnpm install --frozen-lockfile --ignore-script --force
|
||||
|
||||
# remove timestamp and sort json files
|
||||
rm -rf "$out"/v3/tmp
|
||||
for f in $(find "$out" -name "*.json"); do
|
||||
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
|
||||
jq --sort-keys . "$f" | sponge "$f"
|
||||
done
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-g/uUGfC9TQh0LE8ed51oFY17FySoeTvfaeEpzpNeMao=";
|
||||
});
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri
|
||||
desktop-file-utils
|
||||
nodePackages.pnpm
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
libsoup
|
||||
webkitgtk
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
AppKit
|
||||
CoreServices
|
||||
Security
|
||||
WebKit
|
||||
]
|
||||
);
|
||||
|
||||
env = {
|
||||
tauriBundle =
|
||||
{
|
||||
Linux = "deb";
|
||||
Darwin = "app";
|
||||
}
|
||||
.${stdenv.hostPlatform.uname.system}
|
||||
or (builtins.throw "No tauri bundle available for ${stdenv.hostPlatform.uname.system}!");
|
||||
|
||||
ESBUILD_BINARY_PATH = lib.getExe (
|
||||
esbuild.override {
|
||||
buildGoModule = args: buildGoModule (args // rec {
|
||||
version = "0.20.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
|
||||
};
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
});
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export STORE_PATH=$(mktemp -d)
|
||||
|
||||
pushd theseus_gui
|
||||
cp -rT ${modrinth-app-unwrapped.pnpm-deps} "$STORE_PATH"
|
||||
chmod -R +w "$STORE_PATH"
|
||||
|
||||
pnpm config set store-dir "$STORE_PATH"
|
||||
pnpm install --offline --frozen-lockfile --ignore-script
|
||||
popd
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cargo tauri build --bundles "$tauriBundle"
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
''
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p "$out"/bin
|
||||
cp -r target/release/bundle/macos "$out"/Applications
|
||||
mv "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/modrinth-app
|
||||
ln -s "$out"/bin/modrinth-app "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App
|
||||
''
|
||||
+ lib.optionalString stdenv.isLinux ''
|
||||
cp -r target/release/bundle/"$tauriBundle"/*/data/usr "$out"
|
||||
desktop-file-edit \
|
||||
--set-comment "Modrinth's game launcher" \
|
||||
--set-key="StartupNotify" --set-value="true" \
|
||||
--set-key="Categories" --set-value="Game;ActionGame;AdventureGame;Simulation;" \
|
||||
--set-key="Keywords" --set-value="game;minecraft;mc;" \
|
||||
--set-key="StartupWMClass" --set-value="ModrinthApp" \
|
||||
$out/share/applications/modrinth-app.desktop
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Modrinth's game launcher";
|
||||
longDescription = ''
|
||||
A unique, open source launcher that allows you to play your favorite mods,
|
||||
and keep them up to date, all in one neat little package
|
||||
'';
|
||||
mainProgram = "modrinth-app";
|
||||
homepage = "https://modrinth.com";
|
||||
changelog = "https://github.com/modrinth/theseus/releases/tag/v${modrinth-app-unwrapped.version}";
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus
|
||||
unfreeRedistributable
|
||||
];
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
platforms = with lib; platforms.linux ++ platforms.darwin;
|
||||
# this builds on architectures like aarch64, but the launcher itself does not support them yet
|
||||
broken = !stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
symlinkJoin,
|
||||
modrinth-app-unwrapped,
|
||||
wrapGAppsHook3,
|
||||
addOpenGLRunpath,
|
||||
flite,
|
||||
glib,
|
||||
glib-networking,
|
||||
jdk8,
|
||||
jdk17,
|
||||
jdk21,
|
||||
jdks ? [
|
||||
jdk8
|
||||
jdk17
|
||||
jdk21
|
||||
],
|
||||
libGL,
|
||||
libpulseaudio,
|
||||
udev,
|
||||
xorg,
|
||||
}:
|
||||
symlinkJoin rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "modrinth-app";
|
||||
inherit (modrinth-app-unwrapped) version;
|
||||
|
||||
paths = [ modrinth-app-unwrapped ];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
glib-networking
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
runtimeDependencies = lib.optionalString stdenv.isLinux (lib.makeLibraryPath [
|
||||
addOpenGLRunpath.driverLink
|
||||
flite # narrator support
|
||||
|
||||
udev # oshi
|
||||
|
||||
# lwjgl
|
||||
libGL
|
||||
libpulseaudio
|
||||
stdenv.cc.cc.lib
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXext
|
||||
xorg.libXxf86vm
|
||||
xorg.libXrandr
|
||||
]);
|
||||
|
||||
postBuild = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeSearchPath "bin/java" jdks}
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
|
||||
--set LD_LIBRARY_PATH $runtimeDependencies
|
||||
''}
|
||||
)
|
||||
|
||||
wrapGAppsHook
|
||||
'';
|
||||
|
||||
inherit (modrinth-app-unwrapped) meta;
|
||||
}
|
||||
@@ -53,7 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "An easy to use and full-featured personal finance app that doesn't compromise your privacy";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = jdk.meta.platforms;
|
||||
# Darwin refers to Zulu Java, which breaks the evaluation of this derivation
|
||||
# for some reason
|
||||
#
|
||||
# https://github.com/NixOS/nixpkgs/pull/306372#issuecomment-2111688236
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.lucasbergman ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -86,7 +86,11 @@ in {
|
||||
|
||||
dontFixCmake = true;
|
||||
|
||||
inherit lua treesitter-parsers;
|
||||
inherit lua;
|
||||
treesitter-parsers = treesitter-parsers //
|
||||
{ markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } //
|
||||
{ markdown-inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }
|
||||
;
|
||||
|
||||
buildInputs = [
|
||||
gperf
|
||||
@@ -169,11 +173,13 @@ in {
|
||||
'' + ''
|
||||
mkdir -p $out/lib/nvim/parser
|
||||
'' + lib.concatStrings (lib.mapAttrsToList
|
||||
(language: src: ''
|
||||
(language: grammar: ''
|
||||
ln -s \
|
||||
${tree-sitter.buildGrammar {
|
||||
inherit language src;
|
||||
inherit (grammar) src;
|
||||
version = "neovim-${finalAttrs.version}";
|
||||
language = grammar.language or language;
|
||||
location = grammar.location or null;
|
||||
}}/parser \
|
||||
$out/lib/nvim/parser/${language}.so
|
||||
'')
|
||||
|
||||
@@ -1,24 +1,36 @@
|
||||
{ fetchurl }:
|
||||
|
||||
{
|
||||
c = fetchurl {
|
||||
url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz";
|
||||
hash = "sha256:af66fde03feb0df4faf03750102a0d265b007e5d957057b6b293c13116a70af2";
|
||||
c.src = fetchurl {
|
||||
url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.21.0.tar.gz";
|
||||
hash = "sha256:6f0f5d1b71cf8ffd8a37fb638c6022fa1245bd630150b538547d52128ce0ea7e";
|
||||
};
|
||||
lua = fetchurl {
|
||||
url = "https://github.com/MunifTanjim/tree-sitter-lua/archive/v0.0.14.tar.gz";
|
||||
hash = "sha256:930d0370dc15b66389869355c8e14305b9ba7aafd36edbfdb468c8023395016d";
|
||||
lua.src = fetchurl {
|
||||
url = "https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v0.1.0.tar.gz";
|
||||
hash = "sha256:230cfcbfa74ed1f7b8149e9a1f34c2efc4c589a71fe0f5dc8560622f8020d722";
|
||||
};
|
||||
vim = fetchurl {
|
||||
url = "https://github.com/neovim/tree-sitter-vim/archive/v0.3.0.tar.gz";
|
||||
hash = "sha256:403acec3efb7cdb18ff3d68640fc823502a4ffcdfbb71cec3f98aa786c21cbe2";
|
||||
vim.src = fetchurl {
|
||||
url = "https://github.com/neovim/tree-sitter-vim/archive/v0.4.0.tar.gz";
|
||||
hash = "sha256:9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5";
|
||||
};
|
||||
vimdoc = fetchurl {
|
||||
url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.0.0.tar.gz";
|
||||
hash = "sha256:1ff8f4afd3a9599dd4c3ce87c155660b078c1229704d1a254433e33794b8f274";
|
||||
vimdoc.src = fetchurl {
|
||||
url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.5.1.tar.gz";
|
||||
hash = "sha256:063645096504b21603585507c41c6d8718ff3c11b2150c5bfc31e8f3ee9afea3";
|
||||
};
|
||||
query = fetchurl {
|
||||
url = "https://github.com/nvim-treesitter/tree-sitter-query/archive/v0.1.0.tar.gz";
|
||||
hash = "sha256:e2b806f80e8bf1c4f4e5a96248393fe6622fc1fc6189d6896d269658f67f914c";
|
||||
query.src = fetchurl {
|
||||
url = "https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0.tar.gz";
|
||||
hash = "sha256:f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0";
|
||||
};
|
||||
python.src = fetchurl {
|
||||
url = "https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0.tar.gz";
|
||||
hash = "sha256:720304a603271fa89e4430a14d6a81a023d6d7d1171b1533e49c0ab44f1e1c13";
|
||||
};
|
||||
bash.src = fetchurl {
|
||||
url = "https://github.com/tree-sitter/tree-sitter-bash/archive/v0.21.0.tar.gz";
|
||||
hash = "sha256:f0515efda839cfede851adb24ac154227fbc0dfb60c6c11595ecfa9087d43ceb";
|
||||
};
|
||||
markdown.src = fetchurl {
|
||||
url = "https://github.com/MDeiml/tree-sitter-markdown/archive/v0.2.3.tar.gz";
|
||||
hash = "sha256:4909d6023643f1afc3ab219585d4035b7403f3a17849782ab803c5f73c8a31d5";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ from pathlib import Path
|
||||
|
||||
parsers = {}
|
||||
dir = Path(__file__).parent
|
||||
regex = re.compile(r"^set\(TREESITTER_([A-Z_]+)_(URL|SHA256)\s+([^ \)]+)\s*\)\s*$")
|
||||
regex = re.compile(r"^TREESITTER_([A-Z_]+)_(URL|SHA256)\s+(.+)$")
|
||||
|
||||
src = subprocess.check_output(
|
||||
[
|
||||
@@ -20,8 +20,8 @@ src = subprocess.check_output(
|
||||
text=True,
|
||||
).strip()
|
||||
|
||||
for line in open(f"{src}/cmake.deps/CMakeLists.txt"):
|
||||
m = regex.fullmatch(line)
|
||||
for line in open(f"{src}/cmake.deps/deps.txt"):
|
||||
m = regex.fullmatch(line.strip())
|
||||
if m is None:
|
||||
continue
|
||||
|
||||
@@ -37,7 +37,7 @@ with open(dir / "treesitter-parsers.nix", "w") as f:
|
||||
f.write("{ fetchurl }:\n\n{\n")
|
||||
for lang, src in parsers.items():
|
||||
f.write(
|
||||
f""" {lang} = fetchurl {{
|
||||
f""" {lang}.src = fetchurl {{
|
||||
url = "{src["URL"]}";
|
||||
hash = "sha256:{src["SHA256"]}";
|
||||
}};
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ index aaabb35..69676d3 100644
|
||||
@@ -72,16 +72,8 @@ def startAria():
|
||||
|
||||
# in macintosh
|
||||
elif os_type == 'Darwin':
|
||||
elif os_type == OS.OSX:
|
||||
- if aria2_path == "" or aria2_path == None or os.path.isfile(str(aria2_path)) == False:
|
||||
-
|
||||
- cwd = sys.argv[0]
|
||||
@@ -0,0 +1,84 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, qt5
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, aria2
|
||||
, ffmpeg
|
||||
, libnotify
|
||||
, pulseaudio
|
||||
, sound-theme-freedesktop
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "persepolis";
|
||||
version = "4.0.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "persepolisdm";
|
||||
repo = "persepolis";
|
||||
rev = "57dc9d438bb3f126070a17c7a3677c45ea4dd332";
|
||||
hash = "sha256-7OXAITFQJ2/aY0QmqlAo7if7cY7+T3j6PUjfJJV8Z2Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream does currently not allow building from source on macOS. These patches can likely
|
||||
# be removed if https://github.com/persepolisdm/persepolis/issues/943 is fixed upstream
|
||||
./0003-Search-PATH-for-aria2c-on-darwin.patch
|
||||
./0004-Search-PATH-for-ffmpeg-on-darwin.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Ensure dependencies with hard-coded FHS dependencies are properly detected
|
||||
substituteInPlace check_dependencies.py --replace-fail "isdir(notifications_path)" "isdir('${sound-theme-freedesktop}/share/sounds/freedesktop')"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
cp $src/xdg/com.github.persepolisdm.persepolis.desktop $out/share/applications
|
||||
'';
|
||||
|
||||
# prevent double wrapping
|
||||
dontWrapQtApps = true;
|
||||
nativeBuildInputs = [ meson ninja pkg-config qt5.wrapQtAppsHook ];
|
||||
|
||||
# feed args to wrapPythonApp
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ aria2 ffmpeg libnotify ]}"
|
||||
"\${qtWrapperArgs[@]}"
|
||||
];
|
||||
|
||||
# The presence of these dependencies is checked during setuptoolsCheckPhase,
|
||||
# but apart from that, they're not required during build, only runtime
|
||||
nativeCheckInputs = [
|
||||
aria2
|
||||
libnotify
|
||||
pulseaudio
|
||||
sound-theme-freedesktop
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pulseaudio
|
||||
sound-theme-freedesktop
|
||||
] ++ (with python3.pkgs; [
|
||||
psutil
|
||||
pyqt5
|
||||
requests
|
||||
setproctitle
|
||||
setuptools
|
||||
yt-dlp
|
||||
]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GUI for aria2";
|
||||
mainProgram = "persepolis";
|
||||
homepage = "https://persepolisdm.github.io/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ iFreilicht ];
|
||||
};
|
||||
}
|
||||
@@ -1,42 +1,63 @@
|
||||
{ common-updater-scripts, curl, fetchFromGitHub, jq, lib, php, writeShellScript }:
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchurl,
|
||||
testers,
|
||||
platformsh
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "platformsh";
|
||||
version = "4.17.0";
|
||||
version = "5.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "platformsh";
|
||||
repo = "legacy-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8x7Fl1bYZIND4PuxVmPFNO2QOjeLMiIXh409DXG/WMU=";
|
||||
src =
|
||||
{
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/platform_${finalAttrs.version}_darwin_all.tar.gz";
|
||||
hash = "sha256-dCo5+de+9hXxrv+uPn0UoAh4UfSv+PyR2z/ytpfby0g=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/platform_${finalAttrs.version}_darwin_all.tar.gz";
|
||||
hash = "sha256-dCo5+de+9hXxrv+uPn0UoAh4UfSv+PyR2z/ytpfby0g=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/platform_${finalAttrs.version}_linux_amd64.tar.gz";
|
||||
hash = "sha256-JP0RCqNQ8V4sFP3645MW+Pd9QfPFRAuTbVPIK6WD6PQ=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/platform_${finalAttrs.version}_linux_arm64.tar.gz";
|
||||
hash = "sha256-vpk093kpGAmMevd4SVr3KSIjUXUqt3yWDZFHOVxu9rw=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.system}
|
||||
or (throw "${finalAttrs.pname}-${finalAttrs.version}: ${stdenvNoCC.system} is unsupported.");
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
sourceRoot = ".";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 platformsh $out/bin/platformsh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
inherit (finalAttrs) version;
|
||||
package = platformsh;
|
||||
};
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nXPfFlKYi2qP1bTeurRsopncKWg4zIZnZsSX/i0SF/s=";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace config-defaults.yaml \
|
||||
--replace "@version-placeholder@" "${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeShellScript "update-${finalAttrs.pname}" ''
|
||||
set -o errexit
|
||||
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
|
||||
NEW_VERSION=$(curl -s https://api.github.com/repos/platformsh/legacy-cli/releases/latest | jq .tag_name --raw-output)
|
||||
|
||||
if [[ "v${finalAttrs.version}" = "$NEW_VERSION" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version "platformsh" "$NEW_VERSION"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "The unified tool for managing your Platform.sh services from the command line.";
|
||||
homepage = "https://github.com/platformsh/legacy-cli";
|
||||
description = "The unified tool for managing your Platform.sh services from the command line";
|
||||
homepage = "https://github.com/platformsh/cli";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "platform";
|
||||
maintainers = with lib.maintainers; [ shyim spk ];
|
||||
platforms = lib.platforms.all;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "plymouth-matrix-theme";
|
||||
version = "0.1.0-unstable-19-02-2017";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storax";
|
||||
repo = "plymouth-matrix-theme";
|
||||
rev = "b2268f25dea7537ed5709b00d5a83b3600265c54";
|
||||
hash = "sha256-JmMmpw1By5U6OTaSPnJOZZxrieSnXivMmdt/JPazjpI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Remove not needed files
|
||||
rm README.rst LICENSE Makefile
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/plymouth/themes/matrix
|
||||
cp * $out/share/plymouth/themes/matrix
|
||||
find $out/share/plymouth/themes/ -name \*.plymouth -exec sed -i "s@\/usr\/@$out\/@" {} \;
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater;
|
||||
|
||||
meta = {
|
||||
description = "Plymouth boot theme inspired by Matrix";
|
||||
longDescription = ''
|
||||
A very simple boot animation that emulates
|
||||
Trinity hacking Neo's computer at the
|
||||
beginning of The Matrix (1999).
|
||||
'';
|
||||
homepage = "https://github.com/storax/plymouth-matrix-theme";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ johnrtitor ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
powerpipe,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "powerpipe";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbot";
|
||||
repo = "powerpipe";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lG2MYLb/8bv8SOLPZvZNtf5WM1qOJWEBTpLU2MzPbLs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K8SfPWn4IGQNPdax0Qe4KD+XttvDe2xj361zz55u6tA=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
# test fails in the original github.com/turbot/powerpipe project as well
|
||||
"TestGetAsSnapshotPropertyMap/card"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/powerpipe \
|
||||
--set-default POWERPIPE_UPDATE_CHECK false \
|
||||
--set-default POWERPIPE_TELEMETRY none
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
command = "${lib.getExe powerpipe} --version";
|
||||
package = powerpipe;
|
||||
version = "v${version}";
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/turbot/powerpipe/blob/v${version}/CHANGELOG.md";
|
||||
description = "Dynamically query your cloud, code, logs & more with SQL";
|
||||
homepage = "https://powerpipe.io/";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "powerpipe";
|
||||
maintainers = with lib.maintainers; [ weitzj ];
|
||||
};
|
||||
}
|
||||
@@ -10,15 +10,15 @@
|
||||
, darwin
|
||||
}: rustPlatform.buildRustPackage rec {
|
||||
pname = "radicle-node";
|
||||
version = "1.0.0-rc.8";
|
||||
version = "1.0.0-rc.9";
|
||||
env.RADICLE_VERSION = version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
|
||||
rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}";
|
||||
hash = "sha256-F2n7ui0EgXK8fT76M14RVhXXGeRYub+VpH+puDUJ1pQ=";
|
||||
hash = "sha256-GFltwKc6madTJWPTeAeslmFffHtixR0Dxd+3hAnHvz0=";
|
||||
};
|
||||
cargoHash = "sha256-+QthR5M3qAxC42TPnR5iylfpuWnsSmg68SuCbhmkCvw=";
|
||||
cargoHash = "sha256-UM9eDWyeewWPq3+z0JWqdAsCxx6EqytuYMwLXDHOC64=";
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles ];
|
||||
nativeCheckInputs = [ git ];
|
||||
@@ -26,15 +26,16 @@
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
doCheck = with stdenv.hostPlatform; isx86_64 && isLinux;
|
||||
doCheck = stdenv.hostPlatform.isLinux;
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release
|
||||
# Tests want to open many files.
|
||||
ulimit -n 4096
|
||||
'';
|
||||
checkFlags = [
|
||||
"--skip=service::message::tests::test_node_announcement_validate"
|
||||
"--skip=tests::test_announcement_relay"
|
||||
"--skip=tests::e2e"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
renode.overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.15.0+20240509git8750f2500";
|
||||
version = "1.15.0+20240515gita6b1d773d";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
|
||||
hash = "sha256-bvPY+VPKCHG0/QHBsM7frU0+9sSMHV0ImISChHfWiAE=";
|
||||
hash = "sha256-N0pdjbEsXZiPh/xr76akmwSmkEt/fsBXZl4Cjncz3hU=";
|
||||
};
|
||||
|
||||
passthru.updateScript =
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
shellcheck-sarif,
|
||||
testers,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shellcheck-sarif";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psastras";
|
||||
repo = "sarif-rs";
|
||||
rev = "${pname}-v${version}";
|
||||
hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JuE/Z0qrS/3BRlb0jTGDfV0TYk74Q75X1wv/IERxqeQ=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
pname
|
||||
];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = shellcheck-sarif; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A CLI tool to convert shellcheck diagnostics into SARIF";
|
||||
homepage = "https://psastras.github.io/sarif-rs";
|
||||
mainProgram = "shellcheck-sarif";
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -47,6 +47,9 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-DYie6ufgZNqg7ohlIed3Bo+sqLKHOxWXTwAkea2guLk=";
|
||||
};
|
||||
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gfortran
|
||||
@@ -60,6 +63,7 @@ stdenv.mkDerivation rec {
|
||||
libxc
|
||||
hdf5
|
||||
umpire
|
||||
mpi
|
||||
spglib
|
||||
spfft
|
||||
spla
|
||||
@@ -80,7 +84,7 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optional stdenv.isDarwin llvmPackages.openmp
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [ mpi ];
|
||||
propagatedBuildInputs = [ (lib.getBin mpi) ];
|
||||
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'uintptr_t' in namespace 'std' does not name a type
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "slumber";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LucasPickering";
|
||||
repo = "slumber";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-afceWAmVpY0x3eXXhQ5unXWNvatiEfqGUwf2lRHTYf8=";
|
||||
hash = "sha256-Qg2Tn0f/5a1tzD7mdPm+d6di1k+o1PKLUjpV7Hv8wpY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8wleYN0sAgwm0aFsmbwfFw6JEtSYgvKbwkv92LZR5rg=";
|
||||
cargoHash = "sha256-mWKMnE47fl04TvkgB5h3U/Y8TKUcdxDQdIwFiK7kGf4=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
fftw
|
||||
mpi
|
||||
] ++ lib.optionals (gpuBackend == "cuda") [
|
||||
cudaPackages.libcufft
|
||||
cudaPackages.cuda_cudart
|
||||
@@ -48,8 +49,6 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optional stdenv.isDarwin llvmPackages.openmp
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [ mpi ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSPFFT_OMP=ON"
|
||||
"-DSPFFT_MPI=ON"
|
||||
|
||||
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-71QpwTsRogH+6Bik9DKwezl9SqwoLxQt4SZ7zw5X6DE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/gpu_util/gpu_blas_api.hpp \
|
||||
--replace '#include <rocblas.h>' '#include <rocblas/rocblas.h>'
|
||||
@@ -43,6 +45,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
blas
|
||||
mpi
|
||||
]
|
||||
++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit
|
||||
++ lib.optionals (gpuBackend == "rocm") [
|
||||
@@ -51,8 +54,6 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optional stdenv.isDarwin llvmPackages.openmp
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [ mpi ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSPLA_OMP=ON"
|
||||
"-DSPLA_FORTRAN=ON"
|
||||
@@ -65,10 +66,15 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (gpuBackend == "rocm") [ "-DSPLA_GPU_BACKEND=ROCM" ]
|
||||
;
|
||||
|
||||
preFixup = ''
|
||||
substituteInPlace $out/lib/cmake/SPLA/SPLASharedTargets-release.cmake \
|
||||
--replace-fail "\''${_IMPORT_PREFIX}" "$out"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Specialized Parallel Linear Algebra, providing distributed GEMM functionality for specific matrix distributions with optional GPU acceleration";
|
||||
homepage = "https://github.com/eth-cscs/spla";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.sheepforce ];#
|
||||
maintainers = [ maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
autoreconfHook,
|
||||
libgcrypt,
|
||||
pkg-config,
|
||||
curlWithGnuTls,
|
||||
gnunet,
|
||||
jansson,
|
||||
libmicrohttpd,
|
||||
libsodium,
|
||||
libtool,
|
||||
postgresql,
|
||||
taler-exchange,
|
||||
taler-merchant,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sync";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/sync.git";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7EBm4Zp1sjZw7pXxQySY+1It3C/KLG2SHhqUPhDATbg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
libgcrypt
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curlWithGnuTls
|
||||
gnunet
|
||||
jansson
|
||||
libgcrypt
|
||||
libmicrohttpd
|
||||
libsodium
|
||||
libtool
|
||||
postgresql
|
||||
taler-exchange
|
||||
taler-merchant
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
substituteInPlace "$out/bin/sync-dbconfig" \
|
||||
--replace-fail "/bin/bash" "${runtimeShell}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Backup and synchronization service";
|
||||
homepage = "https://git.taler.net/sync.git";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [ wegank ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.66.0";
|
||||
version = "1.66.3";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "tailscale-nginx-auth";
|
||||
@@ -11,7 +11,7 @@ buildGoModule {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZI9/YlVHbdvEwD0YHWfUhciU2x4wp4GzTanwDvuIpz4=";
|
||||
hash = "sha256-dFyXOoN4YZfN3G1XfHK1/8M1ROwW9Q9eCl/NjTdfD4Q=";
|
||||
};
|
||||
vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw=";
|
||||
|
||||
|
||||
@@ -4,16 +4,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tenki";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ckaznable";
|
||||
repo = "tenki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+04rQt+hQQan85k1AxnVaQN2xfWWrJII+GdLMSn+cck=";
|
||||
hash = "sha256-jd7D0iC3+s3w6uG0WqlvL9F4xQL+cQzsUvAIOc7ORgw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/ygw6bCJEeTmrG8XXMhoMl25NHK4E6mmML/V+E8e6UE=";
|
||||
cargoHash = "sha256-3SdOUSSerTnA9VHZEmFt1LiatLwC7Dq4k/MKstE8x80=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "tty-clock with weather effect";
|
||||
|
||||
+10
-10
@@ -45,13 +45,13 @@
|
||||
, e2fsprogs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tracker-miners";
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-608rKIoMvp5hSHHLAEgnRGHP4cuEZ6yBexAtOHPby6U=";
|
||||
url = "mirror://gnome/sources/tracker-miners/${lib.versions.majorMinor finalAttrs.version}/tracker-miners-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-50OIFUtcGXtLfuQvDc6MX7vd1NNhCT74jU+zA+M9pf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -130,15 +130,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
packageName = "tracker-miners";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://gitlab.gnome.org/GNOME/tracker-miners";
|
||||
description = "Desktop-neutral user information store, search tool and indexer";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = lib.teams.gnome.members;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
Generated
+31
-21
@@ -288,9 +288,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "citationberg"
|
||||
version = "0.3.0"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "82108f2b676c954076d2e5044f19a6a03887b24bd42804f322e0650d13035899"
|
||||
checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b"
|
||||
dependencies = [
|
||||
"quick-xml",
|
||||
"serde",
|
||||
@@ -827,9 +827,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
||||
|
||||
[[package]]
|
||||
name = "hayagriva"
|
||||
version = "0.5.2"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc2e670de5191df083ddd112cd253049f8213277ccf0c15e18a8bf10e6c666cc"
|
||||
checksum = "1d0d20c98b77b86ce737876b2a1653e2e6abbeee84afbb39d72111091191c97a"
|
||||
dependencies = [
|
||||
"biblatex",
|
||||
"ciborium",
|
||||
@@ -2131,6 +2131,12 @@ dependencies = [
|
||||
"unsafe-libyaml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shell-escape"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
|
||||
|
||||
[[package]]
|
||||
name = "simd-adler32"
|
||||
version = "0.3.7"
|
||||
@@ -2510,7 +2516,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
|
||||
|
||||
[[package]]
|
||||
name = "typst"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"az",
|
||||
"bitflags 2.4.2",
|
||||
@@ -2571,13 +2577,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-assets"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f13f85360328da54847dd7fefaf272dfa5b6d1fdeb53f32938924c39bf5b2c6c"
|
||||
checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c"
|
||||
|
||||
[[package]]
|
||||
name = "typst-cli"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"clap",
|
||||
@@ -2605,6 +2611,7 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_yaml 0.9.32",
|
||||
"shell-escape",
|
||||
"tar",
|
||||
"tempfile",
|
||||
"toml",
|
||||
@@ -2622,12 +2629,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-dev-assets"
|
||||
version = "0.11.0"
|
||||
source = "git+https://github.com/typst/typst-dev-assets?tag=v0.11.0#e0ef7ad46f28a440c41bc8e78563ace86cc02678"
|
||||
version = "0.11.1"
|
||||
source = "git+https://github.com/typst/typst-dev-assets?tag=v0.11.1#35caed3a870d46e827cffaa9dc450e38bede2a37"
|
||||
|
||||
[[package]]
|
||||
name = "typst-docs"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"comemo",
|
||||
@@ -2650,7 +2657,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-fuzz"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"comemo",
|
||||
"libfuzzer-sys",
|
||||
@@ -2662,20 +2669,23 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-ide"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"comemo",
|
||||
"ecow",
|
||||
"if_chain",
|
||||
"log",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"typst",
|
||||
"typst-assets",
|
||||
"typst-dev-assets",
|
||||
"unscanny",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typst-macros"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@@ -2685,7 +2695,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-pdf"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"base64 0.22.0",
|
||||
"bytemuck",
|
||||
@@ -2709,7 +2719,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-render"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"comemo",
|
||||
@@ -2728,7 +2738,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-svg"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"base64 0.22.0",
|
||||
"comemo",
|
||||
@@ -2744,7 +2754,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-syntax"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"comemo",
|
||||
"ecow",
|
||||
@@ -2759,20 +2769,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-tests"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"comemo",
|
||||
"ecow",
|
||||
"once_cell",
|
||||
"oxipng",
|
||||
"parking_lot",
|
||||
"rayon",
|
||||
"tiny-skia",
|
||||
"ttf-parser",
|
||||
"typst",
|
||||
"typst-assets",
|
||||
"typst-dev-assets",
|
||||
"typst-ide",
|
||||
"typst-pdf",
|
||||
"typst-render",
|
||||
"typst-svg",
|
||||
@@ -2782,7 +2792,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-timing"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
dependencies = [
|
||||
"parking_lot",
|
||||
"serde",
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typst";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "typst";
|
||||
repo = "typst";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RbkirnVrhYT/OuZSdJWMOvQXAeBmsFICsCrezyT6ukA=";
|
||||
hash = "sha256-FagjVU8BJZStE/geexZERuV2P28iF/pPn2mTi1Gu9iU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"typst-dev-assets-0.11.0" = "sha256-wTmux3GsUIU+PX6SO9rrQHr3korPFBeP/Z8byC97KUI=";
|
||||
"typst-dev-assets-0.11.1" = "sha256-SMRtitDHFpdMEoOuPBnC3RBTyZ96hb4KmMSCXpAyKfU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "workshop-runner";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mainmatter";
|
||||
repo = "rust-workshop-runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2lt4RloIRnFvWZ+HeZx7M2cg/wHb1/j0qDmhUhOoF+M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VoIAwPrkhrRl48czXtKWmLTktsZ/U4TVV924wx0DL+A=";
|
||||
|
||||
meta = {
|
||||
description = "A CLI tool to drive test-driven Rust workshops";
|
||||
homepage = "https://github.com/mainmatter/rust-workshop-runner";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ RaghavSood ];
|
||||
mainProgram = "wr";
|
||||
};
|
||||
}
|
||||
@@ -41,7 +41,7 @@ let
|
||||
++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zxtune";
|
||||
version = "5060";
|
||||
version = "5061";
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "zxtune";
|
||||
repo = "zxtune";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-mfObtcpBk9sltPckwjY/e5NwEILaxiPy/mbvmyQHeCo=";
|
||||
hash = "sha256-KhGxVq0dDvsAMdnr/MRiVbw6mhl/3Vv7D+NSb+fDhgk=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
|
||||
let
|
||||
pname = "elixir-ls";
|
||||
version = "0.20.0";
|
||||
version = "0.21.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-lsp";
|
||||
repo = "elixir-ls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LVMwDoGR516rwNhhvibu7g4EsaG2O8WOb+Ja+nCQA+k=";
|
||||
hash = "sha256-OBLSj1nqv/p1FYg7DapCnr4EU2EW51MQM+YnZqDkcB4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
in
|
||||
@@ -21,7 +21,7 @@ mixRelease {
|
||||
mixFodDeps = fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version elixir;
|
||||
hash = "sha256-yq2shufOZsTyg8iBGsRrAs6bC3iAa9vtUeS96c5xJl0=";
|
||||
hash = "sha256-3PVMembw3CpYUQ/ynoPKmu0N5iZwoFu9uNjRS+kS4BY=";
|
||||
};
|
||||
|
||||
# elixir-ls is an umbrella app
|
||||
|
||||
@@ -13,13 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ chez chez-srfi ];
|
||||
|
||||
buildPhase = ''
|
||||
make PREFIX=$out CHEZ=${chez}/bin/scheme
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make install PREFIX=$out CHEZ=${chez}/bin/scheme
|
||||
'';
|
||||
makeFlags = [ "CHEZ=${lib.getExe chez}" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -28,6 +22,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/fedeinthemix/chez-mit/";
|
||||
maintainers = [ maintainers.jitwit ];
|
||||
license = licenses.gpl3Plus;
|
||||
broken = true;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://unisonweb.org/";
|
||||
license = with licenses; [ mit bsd3 ];
|
||||
mainProgram = "ucm";
|
||||
maintainers = [ maintainers.virusdave ];
|
||||
maintainers = with maintainers; [ ceedubs sellout virusdave ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -3,15 +3,12 @@
|
||||
, fetchPypi
|
||||
, pyserial
|
||||
, pyudev
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rshell";
|
||||
version = "0.0.32";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8=";
|
||||
|
||||
@@ -433,22 +433,22 @@ self: super: {
|
||||
|
||||
# Manually maintained
|
||||
cachix-api = overrideCabal (drv: {
|
||||
version = "1.7";
|
||||
version = "1.7.3";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "cachix";
|
||||
rev = "v1.7";
|
||||
sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s=";
|
||||
rev = "v1.7.3";
|
||||
sha256 = "sha256-BBhOFK4OuCD7ilNrdfeAILBR2snxl29gBk58szZ4460=";
|
||||
};
|
||||
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
|
||||
}) super.cachix-api;
|
||||
cachix = (overrideCabal (drv: {
|
||||
version = "1.7";
|
||||
version = "1.7.3";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "cachix";
|
||||
rev = "v1.7";
|
||||
sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s=";
|
||||
rev = "v1.7.3";
|
||||
sha256 = "sha256-BBhOFK4OuCD7ilNrdfeAILBR2snxl29gBk58szZ4460=";
|
||||
};
|
||||
postUnpack = "sourceRoot=$sourceRoot/cachix";
|
||||
}) (lib.pipe
|
||||
|
||||
@@ -24,13 +24,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctranslate2";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenNMT";
|
||||
repo = "CTranslate2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Bg25HL7BDM+SHtM0m7mJ3mAdpFe4kefdiDx5Ek1pQBs=";
|
||||
hash = "sha256-p9zpmfs1V92a+3Mxgi5eLKuCUN+26FAL4SjySZzPOW8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctre";
|
||||
version = "3.8.1";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hanickadot";
|
||||
repo = "compile-time-regular-expressions";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EzAPIqdfktrZ+FTEzz52nRNnH7CG59ZE9Ww7qMkAAbY=";
|
||||
hash = "sha256-Fmx8eKo4UHSYQa5RL70VmaogQj+ILVA1gfpaVE8+MlQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, callPackage
|
||||
, fetchurl
|
||||
, testers
|
||||
, ngspice
|
||||
|
||||
, cmake
|
||||
}:
|
||||
|
||||
@@ -17,7 +17,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ ngspice ];
|
||||
|
||||
# https://github.com/libgeos/geos/issues/930
|
||||
cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
|
||||
@@ -7,13 +7,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mimalloc";
|
||||
version = "2.1.4";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h+JlrIYc3i9RjbmiGLgWVvkP4LyQkTrnUxkCU7SR35k=";
|
||||
sha256 = "sha256-Ff3+RP+lAXCOeHJ87oG3c02rPP4WQIbg5L/CVe6gA3M=";
|
||||
};
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isStatic;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qxlsx";
|
||||
version = "1.4.7";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QtExcel";
|
||||
repo = "QXlsx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E3x2IUPMRmPSTRN01sXJ0PZaN7iBzatr2vwan2sZxf0=";
|
||||
hash = "sha256-mMhe4yztU9I/zJFbj/0GNiIoSy7U4rQ1Y3mDvvHNKXk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qxmpp";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qxmpp-project";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5NPqNQuVuRz9GfrJULSmTiYHUMe6VxoaQZDHhYCguWQ=";
|
||||
sha256 = "sha256-y27rTJc2taFGOjDmy0KKQQxSdXOwteLunHwICh5pSEc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gfortran ];
|
||||
|
||||
propagatedBuildInputs = [ mpi fftwMpi ];
|
||||
buildInputs = [ mpi fftwMpi ];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir build && cd build
|
||||
|
||||
@@ -2,14 +2,15 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "menhirLib";
|
||||
version = "20230608";
|
||||
version = "20231231";
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "fpottier";
|
||||
repo = "menhir";
|
||||
rev = version;
|
||||
sha256 = "sha256-dUPoIUVr3gqvE5bniyQh/b37tNfRsZN8X3e99GFkyLY=";
|
||||
hash = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -6,18 +6,9 @@
|
||||
, ppx_deriving
|
||||
, ppx_sexp_conv
|
||||
, ppxlib
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.11" then "1.10.0" else "1.9.1"
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.11" then "1.11.0" else "1.9.1"
|
||||
}:
|
||||
|
||||
let param = {
|
||||
"1.9.1" = {
|
||||
sha256 = "sha256-0bSY4u44Ds84XPIbcT5Vt4AG/4PkzFKMl9CDGFZyIdI=";
|
||||
};
|
||||
"1.10.0" = {
|
||||
sha256 = "sha256-MA8sf0F7Ch1wJDL8E8470ukKx7KieWyjWJnJQsqBVW8=";
|
||||
};
|
||||
}."${version}"; in
|
||||
|
||||
lib.throwIfNot (lib.versionAtLeast ppxlib.version "0.24.0")
|
||||
"ppx_import is not available with ppxlib-${ppxlib.version}"
|
||||
|
||||
@@ -26,11 +17,15 @@ buildDunePackage rec {
|
||||
inherit version;
|
||||
|
||||
minimalOCamlVersion = "4.05";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-ppx/ppx_import/releases/download/${version}/ppx_import-${version}.tbz";
|
||||
inherit (param) sha256;
|
||||
url = let dir = if lib.versionAtLeast version "1.11" then "v${version}" else "${version}"; in
|
||||
"https://github.com/ocaml-ppx/ppx_import/releases/download/${dir}/ppx_import-${version}.tbz";
|
||||
|
||||
hash = {
|
||||
"1.9.1" = "sha256-0bSY4u44Ds84XPIbcT5Vt4AG/4PkzFKMl9CDGFZyIdI=";
|
||||
"1.11.0" = "sha256-Jmfv1IkQoaTkyxoxp9FI0ChNESqCaoDsA7D4ZUbOrBo=";
|
||||
}."${version}";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
{ buildPythonPackage
|
||||
, lib
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, six
|
||||
, enum34
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -23,8 +21,6 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
] ++ lib.optionals (pythonOlder "3.4") [
|
||||
enum34
|
||||
];
|
||||
|
||||
# checks use bazel; should be revisited
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
|
||||
, pythonOlder
|
||||
|
||||
, pytestCheckHook
|
||||
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
@@ -14,8 +10,6 @@ buildPythonPackage rec {
|
||||
version = "0.0.95";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0gEPXqw99UTsSOwRYQLgaFkaNFsaWA8ylz24pQX8p0Q=";
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, attrs
|
||||
, pluggy
|
||||
, six
|
||||
@@ -15,8 +14,6 @@ buildPythonPackage rec {
|
||||
version = "2.13.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pWkLVfBrLEhdhuTE95K3aqrhEY2wEyo5uRzuJC3ngjE=";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user