Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-06-04 00:15:50 +00:00 committed by GitHub
commit 0e5a0abb85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
153 changed files with 9815 additions and 3690 deletions

View file

@ -1514,10 +1514,6 @@ Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is in
Packages inside nixpkgs are written by hand. However many tools exist in
community to help save time. No tool is preferred at the moment.
- [pypi2nix](https://github.com/nix-community/pypi2nix): Generate Nix
expressions for your Python project. Note that [sharing derivations from
pypi2nix with nixpkgs is possible but not
encouraged](https://github.com/nix-community/pypi2nix/issues/222#issuecomment-443497376).
- [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools)
- [poetry2nix](https://github.com/nix-community/poetry2nix)

View file

@ -5422,6 +5422,12 @@
githubId = 7551358;
name = "Frede Emil";
};
Freed-Wu = {
email = "wuzhenyu@ustc.edu";
github = "Freed-Wu";
githubId = 32936898;
name = "Wu Zhenyu";
};
freezeboy = {
github = "freezeboy";
githubId = 13279982;
@ -11807,6 +11813,12 @@
githubId = 30825096;
name = "Ning Zhang";
};
oaksoaj = {
email = "oaksoaj@riseup.net";
name = "Oaksoaj";
github = "oaksoaj";
githubId = 103952141;
};
obadz = {
email = "obadz-nixos@obadz.com";
github = "obadz";

View file

@ -192,8 +192,6 @@ In addition to numerous new and updated packages, this release has the following
};
```
- Many `services.syncthing` options have been moved to `services.syncthing.settings`, as part of [RFC 42](https://github.com/NixOS/rfcs/pull/42)'s implementation, see [#226088](https://github.com/NixOS/nixpkgs/pull/226088).
- `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems.
- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.

View file

@ -14,6 +14,8 @@
- [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable).
- [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable).
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
- The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`.

View file

@ -1010,6 +1010,7 @@
./services/networking/shorewall.nix
./services/networking/shorewall6.nix
./services/networking/shout.nix
./services/networking/sitespeed-io.nix
./services/networking/skydns.nix
./services/networking/smartdns.nix
./services/networking/smokeping.nix

View file

@ -498,7 +498,8 @@ in
systemd.services.gitea = {
description = "gitea";
after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
after = [ "network.target" ] ++ optional usePostgresql "postgresql.service" ++ optional useMysql "mysql.service";
requires = optional usePostgresql "postgresql.service" ++ optional useMysql "mysql.service";
wantedBy = [ "multi-user.target" ];
path = [ cfg.package pkgs.git pkgs.gnupg ];

View file

@ -35,6 +35,7 @@ let
"dovecot"
"fastly"
"fritzbox"
"graphite"
"influxdb"
"ipmi"
"json"

View file

@ -0,0 +1,41 @@
{ config, lib, pkgs, options }:
let
cfg = config.services.prometheus.exporters.graphite;
format = pkgs.formats.yaml { };
in
{
port = 9108;
extraOpts = {
graphitePort = lib.mkOption {
type = lib.types.port;
default = 9109;
description = lib.mdDoc ''
Port to use for the graphite server.
'';
};
mappingSettings = lib.mkOption {
type = lib.types.submodule {
freeformType = format.type;
options = { };
};
default = { };
description = lib.mdDoc ''
Mapping configuration for the exporter, see
<https://github.com/prometheus/graphite_exporter#yaml-config> for
available options.
'';
};
};
serviceOpts = {
serviceConfig = {
ExecStart = ''
${pkgs.prometheus-graphite-exporter}/bin/graphite_exporter \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--graphite.listen-address ${cfg.listenAddress}:${toString cfg.graphitePort} \
--graphite.mapping-config ${format.generate "mapping.yml" cfg.mappingSettings} \
${lib.concatStringsSep " \\\n " cfg.extraFlags}
'';
};
};
}

View file

@ -0,0 +1,122 @@
{ lib, config, pkgs, ... }:
let
cfg = config.services.sitespeed-io;
format = pkgs.formats.json { };
in
{
options.services.sitespeed-io = {
enable = lib.mkEnableOption (lib.mdDoc "Sitespeed.io");
user = lib.mkOption {
type = lib.types.str;
default = "sitespeed-io";
description = lib.mdDoc "User account under which sitespeed-io runs.";
};
package = lib.mkOption {
type = lib.types.package;
default = pkgs.sitespeed-io;
defaultText = "pkgs.sitespeed-io";
description = lib.mdDoc "Sitespeed.io package to use.";
};
dataDir = lib.mkOption {
default = "/var/lib/sitespeed-io";
type = lib.types.str;
description = lib.mdDoc "The base sitespeed-io data directory.";
};
period = lib.mkOption {
type = lib.types.str;
default = "hourly";
description = lib.mdDoc ''
Systemd calendar expression when to run. See {manpage}`systemd.time(7)`.
'';
};
runs = lib.mkOption {
default = [ ];
description = lib.mdDoc ''
A list of run configurations. The service will call sitespeed-io once
for every run listed here. This lets you examine different websites
with different sitespeed-io settings.
'';
type = lib.types.listOf (lib.types.submodule {
options = {
urls = lib.mkOption {
type = with lib.types; listOf str;
default = [];
description = lib.mdDoc ''
URLs the service should monitor.
'';
};
settings = lib.mkOption {
type = lib.types.submodule {
freeformType = format.type;
options = { };
};
default = { };
description = lib.mdDoc ''
Configuration for sitespeed-io, see
<https://www.sitespeed.io/documentation/sitespeed.io/configuration/>
for available options. The value here will be directly transformed to
JSON and passed as `--config` to the program.
'';
};
extraArgs = lib.mkOption {
type = with lib.types; listOf str;
default = [];
description = lib.mdDoc ''
Extra command line arguments to pass to the program.
'';
};
};
});
};
};
config = lib.mkIf cfg.enable {
assertions = [
{
assertion = cfg.runs != [];
message = "At least one run must be configured.";
}
{
assertion = lib.all (run: run.urls != []) cfg.runs;
message = "All runs must have at least one url configured.";
}
];
systemd.services.sitespeed-io = {
description = "Check website status";
startAt = cfg.period;
serviceConfig = {
WorkingDirectory = cfg.dataDir;
User = cfg.user;
};
preStart = "chmod u+w -R ${cfg.dataDir}"; # Make sure things are writable
script = (lib.concatMapStrings (run: ''
${lib.getExe cfg.package} \
--config ${format.generate "sitespeed.json" run.settings} \
${lib.escapeShellArgs run.extraArgs} \
${builtins.toFile "urls.txt" (lib.concatLines run.urls)} &
'') cfg.runs) +
''
wait
'';
};
users = {
extraUsers.${cfg.user} = {
isSystemUser = true;
group = cfg.user;
home = cfg.dataDir;
createHome = true;
homeMode = "755";
};
extraGroups.${cfg.user} = { };
};
};
}

View file

@ -2,7 +2,7 @@
, glib
, gobject-introspection
, python3
, wrapGAppsHook
, wrapGAppsNoGuiHook
, lib
}:
@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication {
strictDeps = false;
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsNoGuiHook
gobject-introspection
];

View file

@ -284,6 +284,29 @@ let
'';
};
graphite = {
exporterConfig = {
enable = true;
port = 9108;
graphitePort = 9109;
mappingSettings.mappings = [{
match = "test.*.*";
name = "testing";
labels = {
protocol = "$1";
author = "$2";
};
}];
};
exporterTest = ''
wait_for_unit("prometheus-graphite-exporter.service")
wait_for_open_port(9108)
wait_for_open_port(9109)
succeed("echo test.tcp.foo-bar 1234 $(date +%s) | nc -w1 localhost 9109")
succeed("curl -sSf http://localhost:9108/metrics | grep 'testing{author=\"foo-bar\",protocol=\"tcp\"} 1234'")
'';
};
influxdb = {
exporterConfig = {
enable = true;

View file

@ -7,20 +7,21 @@
, alsa-lib
, dbus
, fontconfig
, libsixel
}:
rustPlatform.buildRustPackage rec {
pname = "spotify-player";
version = "0.13.1";
version = "0.14.1";
src = fetchFromGitHub {
owner = "aome510";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-c+CbIDg4WlzRStiA+yBkjfSmMJ183tLBGiK340bZgnA=";
hash = "sha256-+YPtu3hsKvk2KskVSpqcFufnWL5PxN8+xbkcz/JXW6g=";
};
cargoHash = "sha256-nhRXFxSrzkq3SdJ4ZmWlKl7SwxwOz6ZYboIsBmgdFJ8=";
cargoHash = "sha256-WgQ+v9dJyriqq7+WpXpPhjdwm2Sr0jozA1oW2inSPik=";
nativeBuildInputs = [
pkg-config
@ -32,6 +33,7 @@ rustPlatform.buildRustPackage rec {
alsa-lib
dbus
fontconfig
libsixel
];
buildNoDefaultFeatures = true;
@ -41,6 +43,10 @@ rustPlatform.buildRustPackage rec {
"media-control"
"image"
"lyric-finder"
"daemon"
"notify"
"streaming"
"sixel"
];
meta = with lib; {

View file

@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
pname = "exodus";
version = "23.5.8";
version = "23.5.22";
src = fetchzip {
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
sha256 = "sha256-3mABHkxEMS985NqQBZ7HijtTiun1iSXFJmi0qOh3m7g=";
sha256 = "sha256-CZuT0nlKyF7LRGqNezm98MHcQa2Uhd8y+NiKE5mi0jk=";
};
installPhase = ''

View file

@ -8,17 +8,17 @@
}:
let
rev = "321e05fc0398a6159925b858f46608ea07ef269e";
rev = "0dbbd7f401da1bedd1a9146df6127233d601435b";
in
melpaBuild {
pname = "acm-terminal";
version = "20230215.414"; # 4:14 UTC
version = "20230601.1326"; # 13:26 UTC
src = fetchFromGitHub {
owner = "twlz0ne";
repo = "acm-terminal";
inherit rev;
sha256 = "sha256-Flw07EwH9z0E3tqXs4mStICJmoHfp60ALrP1GmUmeuU=";
sha256 = "sha256-Opouy9A6z0YUT1zxZq1yHx+r/hwNE93JDwfa1fMWNgc=";
};
commit = rev;

View file

@ -16,7 +16,7 @@
}:
let
rev = "7e1e6a4c349e720d75c892cd7230b29c35148342";
rev = "8de85f9967fec6a8e447e5b5f3021e5e1f95b445";
python = python3.withPackages (ps: with ps; [
epc
orjson
@ -26,13 +26,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "20230424.1642"; # 16:42 UTC
version = "20230603.345"; # 3:45 UTC
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
inherit rev;
sha256 = "sha256-e0XVQpsyjy8HeZN6kLRjnoTpyEefTqstsgydEKlEQ1c=";
sha256 = "sha256-08DFgZaYdlz9f9eqZuG760vpmO3D4QN9V66YqVyVsV4=";
};
commit = rev;

View file

@ -4,13 +4,13 @@
buildGoModule rec {
pname = "orbiton";
version = "2.62.0";
version = "2.62.1";
src = fetchFromGitHub {
owner = "xyproto";
repo = "orbiton";
rev = "v${version}";
hash = "sha256-DmS0rn1v9zksSzO7FVl5YsIIXvhQ3zhSBC/i7tosdag=";
hash = "sha256-viJlbBzV6zA/RbdF6kTNbER3ECayqS9hIns60kOa47c=";
};
vendorHash = null;

View file

@ -173,12 +173,12 @@ final: prev:
LazyVim = buildVimPluginFrom2Nix {
pname = "LazyVim";
version = "2023-05-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
rev = "01fbeb139b9fceb775fefc91f27835408a4f04a9";
sha256 = "18isr6l1cb7hjwglv1ybm93z9yqkc9z2g86jj862swq29kdhclg7";
rev = "1efe3a96b2a82a68d20c8fd78fe01bdb4ec677c9";
sha256 = "05m6skc6mfj5837cwmkyv8dqag883hrpqy4q7k945fdzw4lva0i0";
};
meta.homepage = "https://github.com/LazyVim/LazyVim/";
};
@ -486,12 +486,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
rev = "2abd49152215395cee5e7aa2c49451c459a2dbb3";
sha256 = "1f6fwv7w443r3yy7fjfciikgnxy6icx9xq91vc1jr7iqfrd3vb3q";
rev = "aff1bb8fecff83d3e3a2d544c4d4e6d65718bd19";
sha256 = "0xdnalqqf5cqmwkwss8lhiwr4zb925al80wwlpjyln18hayjpii4";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -1135,12 +1135,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
version = "2023-05-21";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
rev = "32d74d5d044f7cc89892d4781a83d55ee4ed552a";
sha256 = "00bw1br0p9gvwrirrp3byazmr51klzbl512aqcp2j4x2g9s3zksq";
rev = "02d795081e6a24ec1fd506c513491543793d0780";
sha256 = "1zq4vnqq5sq679nw8zvwvkkrw0gnpina2nf4iq66s8qgqiqsm43d";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@ -1963,12 +1963,12 @@ final: prev:
codeium-vim = buildVimPluginFrom2Nix {
pname = "codeium.vim";
version = "2023-05-19";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "Exafunction";
repo = "codeium.vim";
rev = "581ba9718f4416b4107273ffbce9c0a821835832";
sha256 = "1fnlfz3m644zbdsr7iwdlkgcnyp0p07fpcxpwrd47bl5c00sf343";
rev = "48eaf767680e7e35b89110e0193f99520e76f666";
sha256 = "0v99z5amg6pjh2gbvrgdrm62zgb9x0dr5v594l7sa4wziczh3kl1";
};
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
};
@ -2035,12 +2035,12 @@ final: prev:
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
version = "2023-05-03";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
rev = "e1fe53117aab24c378d5e6deaad786789c360123";
sha256 = "13ypypkb63j8spg9av9i7n0yp0g4d1hwrym0f9659r0kxmzy9h88";
rev = "c8043290f2d77f61025494d839d88e414608c460";
sha256 = "126bbdlbsl0byxihwzj5j1lbkk1dcqrki4qh5wqa8i71d0dy7vva";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@ -2299,12 +2299,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2023-05-30";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "2d1f1e5192c9484320802b61e465d10c9199fbb2";
sha256 = "0axn19ly5xcmg773mm1an90ph29ja711jn3jhpzbxvlngfy1zlm0";
rev = "7d7cebb459d1157c8fac2e8b64686f216008337a";
sha256 = "1bm5rc6kg42281nndd2flhgrwv482zpqvrs9myafjsfcwz8asvjr";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2853,12 +2853,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2023-05-26";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "bff58a6ea3e081ca50049700f9848b2f84ea57be";
sha256 = "0il9i8jdvvf29k6c7vsms37k6cdx5w19lw7614rxy3qb1328nvcx";
rev = "86bf6182e2ea767c21711de8a3c396d9b635d970";
sha256 = "1gbmpd3sbf8zw2fc386cygy3d5mwy4zbnsrasg45bxr86vzc4gx4";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2901,12 +2901,12 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "9128f2893767cf0fa5f57e6041770ee6cf1c4fdb";
sha256 = "0lwrb65p62wq0mialc9igxghrq8lhckw4q0qy4ha124scx05gz4j";
rev = "52f6d1c48589479d519c1aaea93dba1dd550a7a4";
sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
@ -3516,12 +3516,12 @@ final: prev:
git-blame-nvim = buildVimPluginFrom2Nix {
pname = "git-blame.nvim";
version = "2023-05-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "f-person";
repo = "git-blame.nvim";
rev = "c2c0504451a5a2d8141befea7e4a90d21cc4c5c7";
sha256 = "1pyywcycwc4am1142vkqxyh6f7yppn28hphr0415d3jsm2r8ygi6";
rev = "a1a41cf25e985b7bf0b2e6b41b3cd4d1012a63c6";
sha256 = "08qy16j4psxa7x14wi9wnb1wsxqjp74z9kn0c2y18alnpk0pa9kv";
};
meta.homepage = "https://github.com/f-person/git-blame.nvim/";
};
@ -3648,12 +3648,12 @@ final: prev:
godbolt-nvim = buildVimPluginFrom2Nix {
pname = "godbolt.nvim";
version = "2023-03-24";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "p00f";
repo = "godbolt.nvim";
rev = "7e526ff6d04107161a732a6cba674d69bdc7e198";
sha256 = "03l60x3mz3apma2hp7ls2vila19lfgdds9h3c4q35j4rb839mnfg";
rev = "4a7e88041c9350ca7252585c7720eac0933af384";
sha256 = "0nj5v1nqqgriz5420sqlrqqjrgki6xqgkj8s0ak70qnpx2rc0l2r";
};
meta.homepage = "https://github.com/p00f/godbolt.nvim/";
};
@ -4499,24 +4499,24 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-05-26";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "be918a8e6aa00a6cfa7270d4bfcc11b2f80d6902";
sha256 = "17iknjihcp6f6gw4qsylj7nh9y0zi1bsyxwbwrif7d6qmdvvz585";
rev = "14b5a65190fe69388a8f59c695ed3394a10d6af8";
sha256 = "1p3bz2zs4s2kg1q1gyaf2pffp1fwd0hmh5cds8s8a1r3cab9mnap";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
version = "2023-05-10";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
rev = "ba2bb47ca6b183c59047565967f649be52b3ddf6";
sha256 = "1b1n2g6wpkw9x2ak88k3m9qpyl716jq83538dzdwc5w7pb6218yq";
rev = "6a3b2411146432f83ef44c7980d7a2b20f7a39ce";
sha256 = "0hl6ax2j9k0vfjxra6lvh01v1bid9y4yzdhj56h27iafhd321i14";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@ -5171,12 +5171,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2023-05-30";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "afa6f0a3dc27b910501651f5fc26ef3b551fd99b";
sha256 = "0khp6ij0p8jjdh3nqcll6czyg85027v7f6a5is923vym8lq82v42";
rev = "81de16f854396094b4118d5d6eb660bd9a188cf5";
sha256 = "094pigwidzaak4gc6p2blkb7hlsmiv71y0wd0kb7jvy6k6xr0yyr";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -5235,8 +5235,8 @@ final: prev:
src = fetchFromGitHub {
owner = "loctvl842";
repo = "monokai-pro.nvim";
rev = "25b7c5ea92f2a5d6417acb6cbf1a4885ec39a0de";
sha256 = "19q5b2axmhqv53aqfcszrfpj95da8a1fzx4wk5d8198xmmgrxnhl";
rev = "2095bb6604485d97574c9933c114dc577e7b8e98";
sha256 = "17vij0f1p05jz6c2gmpldg6g8vankcfzrggn2h1021a1c9hw8war";
};
meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
};
@ -5531,12 +5531,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "27714f819bb1030f00d437c0341d420b649e0021";
sha256 = "138pl6a9q3cj3ld5wc6z0jj5zszi40xvfh1gfnn51g7jgd2sfamk";
rev = "33a1f1899629117374b3ef62d43fd85311fc5442";
sha256 = "0cvj2v6f6h4qb5v3jic9625fy0ifwmppy01r3sik7kg9aa8fkdcy";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@ -5591,12 +5591,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-05-29";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "80be328067b370744c39323674a2ebaf515dea14";
sha256 = "1ryss8k6bixj2ky6nj45lyqmhizq58vykwl2wsz93g5x2f60cix3";
rev = "4cebc271b13cb7af6b5a3e8ad76a356660c0c00c";
sha256 = "0m6bvxymqb32x4h77diq6d7rxy7vbp2sx12d1pa3i8vp8vqwcm9b";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -5651,12 +5651,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2023-05-31";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "e0fcf254fbdb95fa0918692aee1c93b938e883f8";
sha256 = "08db5lj5ikj3pl63gdksarjv133gjlsvsgmfmsv1hj6yakl8sdza";
rev = "44ee0cb8db3d655d45d5ca5cedc2b0745b232659";
sha256 = "0ir7c38k73r2q6vvd0hh16bgi8j2wrss6d1p6lb8p0k5qhi57ll4";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -6083,12 +6083,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
version = "2023-05-30";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "5c63b4c0c5efcf67df10ed7dda14e52ad6f3a0cb";
sha256 = "12k4f8dfz4r0vimfvf4gm90i3k2y4zx7lydcbjsmq8sa4pm779ca";
rev = "5be7583cca09b8cca53a1a23711287375f48f22e";
sha256 = "0hf09z75zlv9hvb4is5s0aq4wlpplyirq8jpykjg9sj2q4k3cajm";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@ -6215,12 +6215,12 @@ final: prev:
nvchad = buildVimPluginFrom2Nix {
pname = "nvchad";
version = "2023-05-29";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "nvchad";
repo = "nvchad";
rev = "9c10201ef383f4c4c9caacd2050f76e8fbb76b1c";
sha256 = "0rby0rd8yjd8lj4lwqfmjghvhigh6fisjkk6m91ngyhlcj1lggvc";
rev = "f8a489ea1a670569eead0fe5651c0c48add743e8";
sha256 = "0xq9rmhgqy3jbzdyw5x8lnynhs22dw8vsy0nzkinbhc58b0jlr2l";
};
meta.homepage = "https://github.com/nvchad/nvchad/";
};
@ -6443,12 +6443,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2023-05-17";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "56118cee6af15cb9ddba9d080880949d8eeb0c9f";
sha256 = "12byna7q3c72gij51lnyvgmibmxbw0xdswk6zny6p58b9hk4b3w9";
rev = "7c1d47cf7188fc31acdf951f9eee22da9d479152";
sha256 = "0mgv11jkyq5zkr6a0bk7wbfb5z7r5q070yh7s8nqijnc0i1n55f1";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -6575,12 +6575,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2023-05-31";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "eea19a837c770f177377b4d2e7eaaebce0ec528d";
sha256 = "0i5phqicji2pkk0dbw3bnmx5a98q7anfrj7rb1nhpx83rx29swvf";
rev = "2646e30f686b321638f82510162e4dc8104a57ff";
sha256 = "1nrjwfh2iv1nqg2miqdl7f277kwcgzc9n08dliiga8r01fsz1h4a";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -6611,12 +6611,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2023-05-23";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "365811ecf97a08d0e2055fba210d65017344fd15";
sha256 = "06axkic8h0a3k0i2x9s989hkyxalndgqih0bmpviqyd73xwncg8m";
rev = "8597d57fb40d4ad503cf3acb2fdcfe1b0d8a193d";
sha256 = "1s7xnl8rsav4237mzh37q4qflhbfb2sq7vasdfgzx4mgad2x6kx5";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -6755,12 +6755,12 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
version = "2023-05-21";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
rev = "51cd9fabe8ba7ff9abafd0c1ec4292f3a2eb1a31";
sha256 = "001zjqgiqf61c7x3r1np8za7naxph4qizilngckxahxa8myams44";
rev = "1b9053139342ed9ab47b29e5a1076fcbd971a565";
sha256 = "1fqc4bl5c9r1sgigfc1kmnzgnmgjpcb0sw32a2g2syz0fg9n7h6k";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
@ -6887,12 +6887,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "e64fb82b4e1c2b314d1d5d4511f7a9e73b9dc59d";
sha256 = "00kh7jzh719ag22ym0vll3a3nnzbvdrany6vz4018iiccx8mggr2";
rev = "331637ddeeba29bfa1e95878f0202f17f6000de1";
sha256 = "16jvaj37zbpyv8qrvn37qhd71npwxpqf1lm9zjpjzjl5c163azws";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -6995,24 +6995,24 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "a6063b22c9e6d8660b82255d251c19d150725d9f";
sha256 = "1jhzypbsps5ckgbykgii8x2zcawfnp6v0ibz6kgckjngi9pxc97z";
rev = "2cbe8a4296612b2cd603548a31b020f013be512c";
sha256 = "1gp5h2w35j1q0s67gmjxmlk05lbmyvn360j4m637gxyw2x0n49hf";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
version = "2023-05-31";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
rev = "2182556aab4524b4fa8d00031bf1228ea2e4a023";
sha256 = "0xybwafqdq540nlvcdax48xa04d85blm19gndlg1zyrkhs7hbd7i";
rev = "e2ea37627c0681421ccf4a3cf19d68bb958e1817";
sha256 = "01y9h86zvf4rj6zy0hlw59y9ynijj1ljpxhaz5kg689fyhq277cc";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@ -7055,12 +7055,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2023-05-23";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "95b76b95eff25e1e64f363938cd853852355d70a";
sha256 = "0j1mrq2djx5f7xvxdjj441skkh4dmjz8frd06951pnxdar3ljqbn";
rev = "23e883b99228f8d438254e5ef8c897e5e60e75d1";
sha256 = "1xjwah0g96mjv01lhd7yfml2gd15syhj2axbvid9xk4yn4m6hks8";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@ -7222,12 +7222,12 @@ final: prev:
octo-nvim = buildVimPluginFrom2Nix {
pname = "octo.nvim";
version = "2023-05-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
rev = "95a7f271eff4397e593c90246891c18058bdffc2";
sha256 = "1yw8kch7jn04y89jdr8zxrpkcfalmk8mq4kl4m41ylsdk93865mh";
rev = "2d2769ff80a82a0da24dcf636ae146f3ed5d7ae5";
sha256 = "1dj2dzrd9p34k5f3m6l1qhxf74zmrq07rk94s18q2vzfhkqznbv8";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
@ -7367,24 +7367,24 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
version = "2023-05-31";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
rev = "c5249aabbbe5a67acb24675672cdd7d07ec42611";
sha256 = "00ifdmaxlrn3wk1lq729nv70w89w60mpk988ixa61rja0wgcbm1l";
rev = "7d4a3ffe9f766db7eab4c98610078f62f83965df";
sha256 = "123vpmj4mw8avkiw4xwfzip4sa3sfpg6wpcb1xdk0lw5k0jjnhc8";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
other-nvim = buildVimPluginFrom2Nix {
pname = "other.nvim";
version = "2023-05-29";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "rgroli";
repo = "other.nvim";
rev = "b87013f5d54920d6db36d605a6433495ea47d6c0";
sha256 = "0fr7p0y443x4g7025id4g4gbphaqnc5j9ksaprin2nwrm9dyvgc9";
rev = "f297d32bbfc388e94fbd70ec769c8ee78c0f9982";
sha256 = "05zr71d9skja9p5nfajdlzmavibgx5vxxzbc0604psfm05nvsj89";
};
meta.homepage = "https://github.com/rgroli/other.nvim/";
};
@ -9572,12 +9572,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
version = "2023-05-31";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "53270a472badda2d96b3fb4305f3cca244d3bd1f";
sha256 = "0jn3683vc80b76mdfmj45sd2ml2h5f7333dqy0lygkdhszbc1b96";
rev = "f754a9742fb58e292390eec53f2eb4ee67c157dc";
sha256 = "068bgabncpqx32nj716940977hjyfbzmkw4ml9kf19n5qrij59dm";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@ -10484,12 +10484,12 @@ final: prev:
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
version = "2023-05-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
rev = "09ee74ce6afb9604a430d7425d7f0d67a35f30d7";
sha256 = "19bb68rr3f9yxk02gx19kpvqw71xppal0slmfdd3pcdjhi7wcb76";
rev = "6ee1e7e22a6ff793331da96c0884f0b906e7dc96";
sha256 = "116r2hrbf87silgzp5py7chp8wcb64rhxcg5vhscq2gp7080yv7h";
};
meta.homepage = "https://github.com/google/vim-codefmt/";
};
@ -11312,12 +11312,12 @@ final: prev:
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
version = "2023-04-27";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
rev = "2ee95686c5944f99b42dd04fec005b30497006de";
sha256 = "1lg74l6rw6m1fy39c039vynpb97gq0j066k9gn9wll7zjxqjwfss";
rev = "538fba90fb85b712a3a52a33a736bb29afde1ec2";
sha256 = "0hj06nfimi98bsnb5bwz179gjdwkpjd6gjyr70cvvk1h3k2hrd20";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@ -11408,12 +11408,12 @@ final: prev:
vim-gruvbox8 = buildVimPluginFrom2Nix {
pname = "vim-gruvbox8";
version = "2022-03-20";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-gruvbox8";
rev = "f94afba273ec544e1e73e82c78674eed4ccb1c8c";
sha256 = "1gjnp05a10bad1f12xc5pb1m54jzkq3hh8a83l8aq6377a1z9bky";
rev = "566a182367207d2835546946aed714a6c354d253";
sha256 = "0b7g6dmq35iyj3l50jl23hna5fn1chz8pz75gdw7n7fh1qadg2q2";
};
meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
};
@ -11936,6 +11936,18 @@ final: prev:
meta.homepage = "https://github.com/mroavi/vim-julia-cell/";
};
vim-just = buildVimPluginFrom2Nix {
pname = "vim-just";
version = "2023-04-21";
src = fetchFromGitHub {
owner = "NoahTheDuke";
repo = "vim-just";
rev = "9fc9a1afaa9e3567b25f4141a01f6172a1992a0b";
sha256 = "0wjrqjb0vwp5pk4q2xyrachx9974lxnync1lj40778v5wlsc4w9v";
};
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
};
vim-kitty-navigator = buildVimPluginFrom2Nix {
pname = "vim-kitty-navigator";
version = "2023-05-25";
@ -12287,12 +12299,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2023-05-29";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "02b906cf772811a6845f2d5caaa81152beb65d6b";
sha256 = "1cvi5as7wawzlmsjkjycy6s40460isfz90q4h2pzqzhhijr2ys0n";
rev = "3625e099b09bff2db5f04082cb09ba679525980c";
sha256 = "0nb7xnypv046lh73wfqhch54jx5h3xaxjin0qv9b3g0k5zd0mdi6";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -13571,12 +13583,12 @@ final: prev:
vim-solarized8 = buildVimPluginFrom2Nix {
pname = "vim-solarized8";
version = "2023-04-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-solarized8";
rev = "b0b5d4dd1e582cd5f681bb438346ce5848d845fd";
sha256 = "0dp3vj80dgkm5zv0hjmmx1810z1ajl77sbwb1v2sbhk2c3mgr0cv";
rev = "4004d6a10e7e0a7838fa32d0146b8cf16cdf7e12";
sha256 = "0pqhw2ca5w1vm118ijv9hpk2aq6q2pld2xp97vamwv1acra3yzn1";
};
meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
};
@ -13643,12 +13655,12 @@ final: prev:
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
version = "2023-05-25";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
rev = "8eed46917c5c4882b295729ce053265c2a74ac4d";
sha256 = "1f893npcny3zgms031nwk872i0f4kgdwk6r2znjm4pb1mqjqa92b";
rev = "b5c144367fad9846bd288be6c3933f6c7ddd69ef";
sha256 = "06fsq0i9i1kbswvbm25f4h4089aisgrhnjyb45nn78s8x1377yz5";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@ -15026,12 +15038,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2023-05-30";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "52adf33cc1e8e6f92f4670561c19ad702180c129";
sha256 = "053gim0j9z59i053w8p9cvspnyqny81zc96f4bhhg0ga8nhxargi";
rev = "1b0120993633a0e4f25fa9c720ce3894ebf36cb4";
sha256 = "0swwn8l30l5h8lqvcn5c158b0r4i8zx6sh8shyz1d4gzqnr5fx6i";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -15074,12 +15086,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
version = "2023-05-29";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "lspsaga.nvim";
rev = "c4e6259dda346babc71970bd00e03e211b44614d";
sha256 = "1dfmdcbrslksnaa6416ccdbrbkbzg16f49bsc6w552cwndj7fx6d";
rev = "c475ace5b8882631b351ef7c3e8078ca9ebbb751";
sha256 = "1dg96sg0262nm2rzq6h80f51grc4www7ljcx6c7j3l8p0c003gha";
};
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
};

View file

@ -280,12 +280,12 @@
};
cue = buildGrammar {
language = "cue";
version = "0.0.0+rev=971130a";
version = "0.0.0+rev=0deecf4";
src = fetchFromGitHub {
owner = "eonpatapon";
repo = "tree-sitter-cue";
rev = "971130aa1d2da22098d75062c024bb1250ff9d62";
hash = "sha256-s1Y4lGB8DAcZ4ugUs088DXHMDrT46zNeIvZLqZK493s=";
rev = "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4";
hash = "sha256-myHuYl3JfJ/JvVKM9toprsZ+RJ7L2G0LpzcNTmPTfHE=";
};
meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
};
@ -634,12 +634,12 @@
};
glsl = buildGrammar {
language = "glsl";
version = "0.0.0+rev=29dcda3";
version = "0.0.0+rev=53ca269";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
rev = "29dcda3e8299b91df24cafd24bba43cdd3ca2456";
hash = "sha256-oBb+Mkyoz74+VrMSCK0z8UtP6O/Cfwo0V/IlF9b9Gk4=";
rev = "53ca269cae2a47b1b75791e2bfe843baeb02e903";
hash = "sha256-qDysihoyGlzAFvhnu6qOjNTIRT9ii/A1B1wNiZNlJs8=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
};
@ -777,12 +777,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=e7e2670";
version = "0.0.0+rev=eeb138a";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "e7e2670872c2f1a6556eeedd0b80778b5653e187";
hash = "sha256-i7tloMXu/0PU5eozP1zyZr4lB+jRWTJ/udgENmq+cmY=";
rev = "eeb138aba44de8379dae474624fef65d4288476a";
hash = "sha256-FIf8rKxM0jTfisjHhNUm/5IXj7njCVhPOXFR8Fhr3Ek=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@ -997,12 +997,12 @@
};
latex = buildGrammar {
language = "latex";
version = "0.0.0+rev=b0686a8";
version = "0.0.0+rev=dfe8919";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "tree-sitter-latex";
rev = "b0686a83c2429cc04e6d01f067f5a0a8efc0d17b";
hash = "sha256-/80/7HRLMt0p+SqO4d2wcRjHxZZCLH0ooJs4tNrw+oY=";
rev = "dfe891922ccd2e7cef52eccb2775e1b576727165";
hash = "sha256-xZUrAikgYoSCwFB6vWvV4K5S3sk0RAEUdDhOqLV9PVw=";
};
meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
};
@ -1608,12 +1608,12 @@
};
scala = buildGrammar {
language = "scala";
version = "0.0.0+rev=e7f7d01";
version = "0.0.0+rev=236c7b2";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "e7f7d016308e47bfb387581206b77c8c48947fdc";
hash = "sha256-oC8txJr5efT48jzRErPTfK9k10jNibogeoiHjT4RDm0=";
rev = "236c7b20dbddedb031ce40517fafc027434f6860";
hash = "sha256-M6HOkS/E5OKDUpzG5hgXdD7ZkWIVIdbFUXW4TC+Spkg=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@ -1785,13 +1785,13 @@
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=b4dca35";
version = "0.0.0+rev=4e581fc";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "xasc";
repo = "tree-sitter-t32";
rev = "b4dca3527463274de1f3263c0e1c329bc3b4f514";
hash = "sha256-qWtlk7r6UmEEsbz6k7eGTv4WdWbcaUn2rUQsQ4SxqJA=";
rev = "4e581fcd17d76651aa92759a68f9a8186b9fe8dc";
hash = "sha256-SUft3MpM8fSLyojgRs6uaZxWDfoxNvL5Orb7XcrztYo=";
};
meta.homepage = "https://codeberg.org/xasc/tree-sitter-t32";
};

View file

@ -1006,6 +1006,7 @@ https://github.com/mogelbrod/vim-jsonpath/,HEAD,
https://github.com/MaxMEllon/vim-jsx-pretty/,,
https://github.com/peitalin/vim-jsx-typescript/,,
https://github.com/mroavi/vim-julia-cell/,HEAD,
https://github.com/NoahTheDuke/vim-just/,,
https://github.com/knubie/vim-kitty-navigator/,,
https://github.com/farmergreg/vim-lastplace/,,
https://github.com/xuhdev/vim-latex-live-preview/,,

View file

@ -15,7 +15,6 @@
, libjpeg
, libpcap
, libpulseaudio
, lua5_3
, makeDesktopItem
, makeWrapper
, papirus-icon-theme
@ -39,14 +38,14 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
version = "0.252";
version = "0.255";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${srcVersion}";
hash = "sha256-snef00pTbukiLQp8eAMfuIqNV3l0wP1+KlpFnS3iKFg=";
hash = "sha256-pdPKxEHxynBIB2lUG6yjKNcY8MlOlk4pfr7WwqaA9Dk=";
};
outputs = [ "out" "tools" ];
@ -61,7 +60,8 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_LIB_FLAC=1"
"USE_SYSTEM_LIB_GLM=1"
"USE_SYSTEM_LIB_JPEG=1"
"USE_SYSTEM_LIB_LUA=1"
# https://www.mamedev.org/?p=523
# "USE_SYSTEM_LIB_LUA=1"
"USE_SYSTEM_LIB_PORTAUDIO=1"
"USE_SYSTEM_LIB_PORTMIDI=1"
"USE_SYSTEM_LIB_PUGIXML=1"
@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
expat
zlib
flac
lua5_3
portmidi
portaudio
utf8proc
@ -117,10 +116,6 @@ stdenv.mkDerivation rec {
--subst-var-by mamePath "$out/opt/mame"
'';
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=use-after-free"
];
desktopItems = [
(makeDesktopItem {
name = "MAME";

View file

@ -0,0 +1,29 @@
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation (finalAttrs: rec {
pname = "has";
version = "1.4.0";
src = fetchFromGitHub {
owner = "kdabir";
repo = "has";
rev = "v${finalAttrs.version}";
hash = "sha256-3XsNSl4lQfJjEPNGoFj6ABXGkwOUsg9AFDAz8euZApE=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
install -Dm0555 ${pname} -t $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/kdabir/has";
description = "Checks presence of various command line tools and their versions on the path";
license = licenses.mit;
maintainers = with maintainers; [ Freed-Wu ];
platforms = platforms.unix;
};
})

View file

@ -0,0 +1,44 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, nodejs
}:
buildNpmPackage rec {
pname = "pairdrop";
version = "1.7.6";
src = fetchFromGitHub {
owner = "schlagmichdoch";
repo = "PairDrop";
rev = "v${version}";
hash = "sha256-AOFATOCLf2KigeqoUzIfNngyeDesNrThRzxFvqtsXBs=";
};
npmDepsHash = "sha256-3nKjmC5eizoV/mrKDBhsSlVQxEHyIsWR6KHFwZhBugI=";
dontNpmBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/lib
cp -r * $out/lib
makeWrapper ${nodejs}/bin/node "$out/bin/pairdrop" --add-flags "index.js public --rate-limit --auto-restart"
wrapProgram $out/bin/pairdrop --chdir "$out/lib"
runHook postInstall
'';
meta = with lib; {
description = "Local file sharing in your browser";
longDescription = ''
PairDrop is a sublime alternative to AirDrop that works on all platforms.
Send images, documents or text via peer to peer connection to devices in the same local network/Wi-Fi or to paired devices.
'';
homepage = "https://github.com/schlagmichdoch/PairDrop";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dit7ya ];
};
}

View file

@ -10,18 +10,18 @@
buildGoModule rec {
pname = "usql";
version = "0.14.6";
version = "0.14.7";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
hash = "sha256-RxnxF+KzRNPQ5w5zsk9g1tr557vGe7bi32pSiGL2rK8=";
hash = "sha256-iR+gRWSSxAudDewGBVlEQunFfodYFAuShVq2Z1rZ2k4=";
};
buildInputs = [ unixODBC icu ];
vendorHash = "sha256-66HQNh8GNPGYsA4PXIij2PMUnj/SxLSQ/+5junR22UE=";
vendorHash = "sha256-teVsEVCaSn0/t79LIig3gTw5J8j2YTRx7CoWVDGwQNI=";
proxyVendor = true;
# Exclude broken impala & hive driver

View file

@ -2,7 +2,7 @@
, stdenv
, fetchurl
, dpkg
, electron_16
, electron_24
, makeWrapper
, nixosTests
, nodePackages
@ -12,13 +12,13 @@
let
inherit (stdenv.hostPlatform) system;
version = "3.1.0";
version = "3.3.0";
systemArgs = rec {
x86_64-linux = rec {
src = fetchurl {
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-linux.deb";
sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w=";
sha256 = "sha256-12mbdxklje9msnRtNk1RAtIg3OCybev/vUersDZj2i4=";
};
nativeBuildInputs = [
@ -49,7 +49,7 @@ let
}
EOF
makeWrapper ${electron_16}/bin/electron $out/bin/breitbandmessung \
makeWrapper ${electron_24}/bin/electron $out/bin/breitbandmessung \
--add-flags $out/share/breitbandmessung/resources/build/electron.js
# Fix the desktop link
@ -61,7 +61,7 @@ let
x86_64-darwin = {
src = fetchurl {
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-mac.dmg";
sha256 = "sha256-2c8mDKJuHDSw7p52EKnJO5vr2kNTLU6r9pmGPANjE20=";
sha256 = "sha256-a27R/N13i4qU2znTKz+LGxSdgSzJ0MzIHeiPHyRd65k=";
};
nativeBuildInputs = [ undmg ];

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
version = "1.16.1";
version = "1.16.2";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${finalAttrs.version}";
hash = "sha256-vVCKQDcL/NWeNE3tbmEUgDOBw6zxXy7IcT7IB6/paSo=";
hash = "sha256-jjjDu/vyAoytHQss43lUILEdT2kV8dXHyVNT0uaSmwM=";
};
nativeBuildInputs = [ cmake pkg-config zip ];

View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kubedog";
version = "0.9.11";
version = "0.9.12";
src = fetchFromGitHub {
owner = "werf";
repo = "kubedog";
rev = "v${version}";
hash = "sha256-yHyCmUjxvMzeHpG5OqC3nAjWaiHErTXrbmS+/0Y4A7E=";
hash = "sha256-B667EnlOD0kXqkW73XXcyQwROWh5SmsM8565sjcGinI=";
};
vendorHash = "sha256-OgfgCsysNtY7mZQXdmHFyJ0FqmBD3SeQdTLd5Lw3F7k=";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "odo";
version = "3.10.0";
version = "3.11.0";
src = fetchFromGitHub {
owner = "redhat-developer";
repo = "odo";
rev = "v${version}";
sha256 = "sha256-J8Oiw7/jPwIoPh8erL7auSiQCRzvY7i4COPmtI3qPXY=";
sha256 = "sha256-+5oX6/J/WpJZr/o9l8TZhMJoxonnT0DeIEWffAjZYww=";
};
vendorHash = null;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "talosctl";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
hash = "sha256-BjNJIHPFAytiZIrHPcEuxYCXlp35kMR3OA3KXOdBj8w=";
hash = "sha256-pgWNmjIyRWsshuP+GGc/Kxd32DIoHphwYvBIx2hBWZg=";
};
vendorHash = "sha256-btZHQ0sqgbMm0WWswY9ChNNtXX/xedv/d0BrO03MBns=";
vendorHash = "sha256-Fr4yfwRdhwH1UHAb4rQ74rzAGjIyEX4+0lFujUs8Tos=";
ldflags = [ "-s" "-w" ];

View file

@ -46,11 +46,11 @@
"vendorHash": "sha256-Z7HlUJ5VuQ7rBhoprmvS6HwNZ53iUoBnfXzKTV43bzE="
},
"alicloud": {
"hash": "sha256-mwYwZObU2WadA1X3EiCVh5T1iHYfPzluEHSUZtrMz98=",
"hash": "sha256-fmVu1YYHKy6cW5/CTyYcdvk7Srhpbnz0CGk6GAMRKCU=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.205.0",
"rev": "v1.206.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -638,11 +638,11 @@
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
},
"kubernetes": {
"hash": "sha256-B13jQTZqFb5o/GRTf4iQWUbOPhbb4uYKUy35nQrKGLI=",
"hash": "sha256-dbt54fHUGjZRDKoh5JPO13jyxtHgzzvSFHZwOG4mbDY=",
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
"owner": "hashicorp",
"repo": "terraform-provider-kubernetes",
"rev": "v2.20.0",
"rev": "v2.21.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -810,11 +810,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-RMWKzIsZg9h5COgt1IlpmQQGDpFHwH4ugPZmMULcxgg=",
"hash": "sha256-0blgsLVhzM2Nlh1fSFLoLLI+0cT/pmrxdFDkRos8Ss4=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.122.0",
"rev": "v4.123.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1026,11 +1026,11 @@
"vendorHash": null
},
"snowflake": {
"hash": "sha256-uHcmAcH2LSypfUFPhB6WmDJL00Oq6andSYSI37s/gJM=",
"hash": "sha256-1a2zGEZgMdmH6/dBJ+19VHDMfOs7Xwd4wJ/CA/mVI3g=",
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
"owner": "Snowflake-Labs",
"repo": "terraform-provider-snowflake",
"rev": "v0.65.0",
"rev": "v0.66.1",
"spdx": "MIT",
"vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM="
},
@ -1098,11 +1098,11 @@
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
"hash": "sha256-67ImHgmkKbUOfaPNViQXdItOvtAyHtUVbE4kLVKqmvs=",
"hash": "sha256-oi4QYCH2it6ic8/5UuIz3kh4hQEINeSyQjT2YOncjQo=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.4",
"rev": "v1.81.5",
"spdx": "MPL-2.0",
"vendorHash": null
},

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.45.16";
version = "0.45.18";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-q12MXqYf4yXC1ifXCuHE75Eb553TWbohDB2GusRpNIM=";
hash = "sha256-J4edaMLvL9Bs1bwF+m0LMGiGmEKa7Xcb3SgOiDldTyY=";
};
vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.238";
version = "1.2.239";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-cMjekqIZnZMcDEEdeBs/jkPh/mqgox4gV+LkqP3IR5g=";
hash = "sha256-1yLa5AYrKz1utArvw/225b2J/79L3Tnj2LcHUpaIhrs=";
};
vendorHash = "sha256-67J7AaS0kUu42BqFWMsC+ZXL2DnrBWwhz/oGmyMvpyo=";
vendorHash = "sha256-GFWQterwrZonVMLNHtEKapr4QrU6NXK4xjvmNJ3VeA0=";
proxyVendor = true;

View file

@ -3,10 +3,10 @@
mkFranzDerivation rec {
pname = "ferdium";
name = "Ferdium";
version = "6.2.6";
version = "6.3.0";
src = fetchurl {
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
sha256 = "sha256-jG3NdolWqQzj/62jYwnqJHz5uT6QIuOkrpL/FcLl56k=";
sha256 = "sha256-3i3cEGwUXNITABJRXV+xQ2knYjuG1F818EvhLBrVep8=";
};
extraBuildInputs = [ xorg.libxshmfence ];

View file

@ -6,6 +6,7 @@
, cmake
, ninja
, python3
, gobject-introspection
, wrapGAppsHook
, wrapQtAppsHook
, extra-cmake-modules
@ -13,8 +14,9 @@
, qtwayland
, qtsvg
, qtimageformats
, qt5compat
, gtk3
, boost
, fmt
, libdbusmenu
, lz4
, xxHash
@ -55,6 +57,7 @@
, microsoft-gsl
, rlottie
, stdenv
, nix-update-script
}:
# Main reference:
@ -73,15 +76,14 @@ let
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
version = "4.8.1";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
version = "4.8.3";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0mxxfh70dffkrq76nky3pwrk10s1q4ahxx2ddb58dz8igq6pl4zi";
hash = "sha256-fvg9SFHRHeJVogYQ+vyVqGyLGnOjM5Osi3H0SNGe9fY=";
};
patches = [
@ -103,6 +105,8 @@ stdenv.mkDerivation rec {
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \
--replace '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
substituteInPlace cmake/external/glib/CMakeLists.txt \
--replace 'add_subdirectory(cppgir)' 'add_subdirectory(cppgir EXCLUDE_FROM_ALL)'
'';
# We want to run wrapProgram manually (with additional parameters)
@ -114,6 +118,7 @@ stdenv.mkDerivation rec {
cmake
ninja
python3
gobject-introspection
wrapGAppsHook
wrapQtAppsHook
extra-cmake-modules
@ -124,8 +129,9 @@ stdenv.mkDerivation rec {
qtwayland
qtsvg
qtimageformats
qt5compat
gtk3
boost
fmt
libdbusmenu
lz4
xxHash
@ -174,6 +180,11 @@ stdenv.mkDerivation rec {
"-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
];
preBuild = ''
# for cppgir to locate gir files
export GI_GIR_PATH="$XDG_DATA_DIRS"
'';
postFixup = ''
# This is necessary to run Telegram in a pure environment.
# We also use gappsWrapperArgs from wrapGAppsHook.
@ -186,7 +197,7 @@ stdenv.mkDerivation rec {
passthru = {
inherit tg_owt;
updateScript = ./update.py;
updateScript = nix-update-script { };
};
meta = with lib; {

View file

@ -4,7 +4,7 @@
, openh264, usrsctp, libevent, libvpx
, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
, mesa, valgrind, libepoxy, libglvnd
, mesa, libepoxy, libglvnd, unstableGitUpdater
}:
stdenv.mkDerivation {
@ -54,6 +54,8 @@ stdenv.mkDerivation {
abseil-cpp openh264 usrsctp libevent libvpx openssl
];
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
license = licenses.bsd3;
maintainers = with maintainers; [ oxalica ];

View file

@ -1,73 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -i python3 -p python3 nix nix-prefetch-git
import fileinput
import json
import os
import re
import subprocess
from datetime import datetime
from urllib.request import urlopen, Request
DIR = os.path.dirname(os.path.abspath(__file__))
HEADERS = {'Accept': 'application/vnd.github.v3+json'}
def github_api_request(endpoint):
base_url = 'https://api.github.com/'
request = Request(base_url + endpoint, headers=HEADERS)
with urlopen(request) as http_response:
return json.loads(http_response.read().decode('utf-8'))
def get_commit_date(repo, sha):
url = f'https://api.github.com/repos/{repo}/commits/{sha}'
request = Request(url, headers=HEADERS)
with urlopen(request) as http_response:
commit = json.loads(http_response.read().decode())
date = commit['commit']['committer']['date'].rstrip('Z')
date = datetime.fromisoformat(date).date().isoformat()
return 'unstable-' + date
def nix_prefetch_git(url, rev):
"""Prefetches the requested Git revision (incl. submodules) of the given repository URL."""
print(f'nix-prefetch-git {url} {rev}')
out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev, '--fetch-submodules'])
return json.loads(out)['sha256']
def nix_prefetch_url(url, unpack=False):
"""Prefetches the content of the given URL."""
print(f'nix-prefetch-url {url}')
options = ['--type', 'sha256']
if unpack:
options += ['--unpack']
out = subprocess.check_output(['nix-prefetch-url'] + options + [url])
return out.decode('utf-8').rstrip()
def update_file(relpath, version, sha256, rev=None):
file_path = os.path.join(DIR, relpath)
with fileinput.FileInput(file_path, inplace=True) as f:
for line in f:
result = line
result = re.sub(r'^ version = ".+";', f' version = "{version}";', result)
result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{sha256}";', result)
if rev:
result = re.sub(r'^ rev = ".*";', f' rev = "{rev}";', result)
print(result, end='')
if __name__ == "__main__":
tdesktop_tag = github_api_request('repos/telegramdesktop/tdesktop/releases/latest')['tag_name']
tdesktop_version = tdesktop_tag.lstrip('v')
tdesktop_hash = nix_prefetch_git('https://github.com/telegramdesktop/tdesktop.git', tdesktop_tag)
update_file('default.nix', tdesktop_version, tdesktop_hash)
tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha']
tg_owt_version = get_commit_date('desktop-app/tg_owt', tg_owt_ref)
tg_owt_hash = nix_prefetch_git('https://github.com/desktop-app/tg_owt.git', tg_owt_ref)
update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref)
tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha']

View file

@ -1,4 +1,18 @@
{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, yarn, fixup_yarn_lock, nodejs, npmHooks, nixosTests }:
{ lib
, stdenv
, fetchFromGitHub
, fetchYarnDeps
, nodejs
, yarn
, fixup_yarn_lock
, python3
, npmHooks
, darwin
, sqlite
, srcOnly
, buildPackages
, nixosTests
}:
stdenv.mkDerivation (finalAttrs: {
pname = "thelounge";
@ -24,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-OKLsNGl94EDyLgP2X2tiwihgRQFXGvf5XgXwgX+JEpk=";
};
nativeBuildInputs = [ nodejs yarn fixup_yarn_lock npmHooks.npmInstallHook ];
nativeBuildInputs = [ nodejs yarn fixup_yarn_lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools;
buildInputs = [ sqlite ];
configurePhase = ''
runHook preConfigure
@ -49,8 +64,14 @@ stdenv.mkDerivation (finalAttrs: {
# `npm prune` doesn't work and/or hangs for whatever reason.
preInstall = ''
rm -rf node_modules
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive --production
patchShebangs node_modules
# Build the sqlite3 package.
npm_config_nodedir="${srcOnly nodejs}" npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev}
# These files seemingly aren't needed, and also might not exist when the Darwin sandbox is disabled?
rm -rf node_modules/sqlite3/build-tmp-napi-v6/{Release/obj.target,node_sqlite3.target.mk}
'';
dontNpmPrune = true;

View file

@ -44,11 +44,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
version = "3.48.2";
version = "3.48.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "rigYzxC6jyLsGgwN/4gkVSRkMMMikN1VJvTh/i5i6rc=";
sha256 = "ZhJexH/XcBcRdNDAhYZu/7aoNEQBW34sdkEpUtbLDiM=";
};
nativeBuildInputs = [

View file

@ -10,14 +10,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calc";
version = "2.14.1.5";
version = "2.14.1.6";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/v${finalAttrs.version}/calc-${finalAttrs.version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/calc-${finalAttrs.version}.tar.bz2"
];
hash = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A=";
hash = "sha256-zlmzCCltGB3ipgWBF9vu2szmAZguPDiR2K3xdTnWf0A=";
};
postPatch = ''

View file

@ -74,7 +74,8 @@ stdenv.mkDerivation rec {
+ lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
(":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);
phases = "unpackPhase installPhase fixupPhase";
dontConfigure = true;
dontBuild = true;
unpackPhase = ''
echo "=== Extracting makeself archive ==="

View file

@ -75,7 +75,8 @@ stdenv.mkDerivation rec {
+ lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
(":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);
phases = "unpackPhase installPhase fixupPhase";
dontConfigure = true;
dontBuild = true;
unpackPhase = ''
echo "=== Extracting makeself archive ==="

View file

@ -64,7 +64,8 @@ stdenv.mkDerivation rec {
+ lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
(":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);
phases = "unpackPhase installPhase fixupPhase";
dontConfigure = true;
dontBuild = true;
unpackPhase = ''
echo "=== Extracting makeself archive ==="

View file

@ -1,38 +1,47 @@
{ stdenv
, lib
, fetchFromGitHub
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, DiskArbitration
, Foundation
, libiconv
, Security
, pkg-config
, oniguruma
, stdenv
, darwin
, git
}:
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.15.1";
version = "0.16.5";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "sha256-rPtLvO6raBY6BfrP0erBaXD86W1JL8g4XC4VbkR4Pww=";
hash = "sha256-W6XtfXfOP8QfQ0t5hquFdYvCO9muE50N1fQsNtnOzfM=";
};
cargoSha256 = "sha256-raT8a8K05ZpiGuZdM1hNikGxqY6w0g8G1DohfybXD9s=";
cargoHash = "sha256-SNKbgEyelJCHKCaBRfCGc3RECGABtZzMC2rCbhzqZtU=";
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ];
buildInputs = [
oniguruma
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Foundation
];
nativeCheckInputs = [ git ];
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
};
postInstall = ''
installShellCompletion --bash --name delta.bash etc/completion/completion.bash
installShellCompletion --zsh --name _delta etc/completion/completion.zsh
installShellCompletion --fish --name delta.fish etc/completion/completion.fish
installShellCompletion --cmd delta \
etc/completion/completion.{bash,fish,zsh}
'';
checkFlags = lib.optionals stdenv.isDarwin [
@ -44,6 +53,6 @@ rustPlatform.buildRustPackage rec {
description = "A syntax-highlighting pager for git";
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ];
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ];
};
}

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, rustPlatform
, libgit2
, openssl
@ -12,16 +13,26 @@
rustPlatform.buildRustPackage rec {
pname = "josh";
version = "22.06.22";
version = "23.02.14";
JOSH_VERSION = "r${version}";
src = fetchFromGitHub {
owner = "esrlabs";
repo = "josh";
rev = "r" + version;
sha256 = "0511qv9zyjvv4zfz6zyi69ssbkrwa24n0ah5w9mb4gzd547as8pq";
rev = JOSH_VERSION;
sha256 = "1sqa8xi5d55zshky7gicac02f67vp944hclkdsmwy0bczk9hgssr";
};
cargoSha256 = "0zfjjyyz4pxar1mfkkj9aij4dnwqy3asdrmay1iy6ijjn1qd97n4";
patches = [
# Unreleased patch allowing compilation from the GitHub tarball download
(fetchpatch {
name = "josh-version-without-git.patch";
url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch";
sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns";
})
];
cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl";
nativeBuildInputs = [
pkg-config

View file

@ -14,21 +14,21 @@
}:
let
version = "1.17.3";
version = "1.17.4";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
sha256 = "1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0";
sha256 = "68ebc6f9baba7be4429014b73bdf6da33516a399f011e9e535eb383aff97748b";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
sha256 = "16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb";
sha256 = "70e3599dd0a120ababa00d44c93ec8d2d001aea93e902355786ed90a7360cc99";
};
in mkDerivation {

View file

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "lima";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uZE827dc79i7JPxHDI3kmAANN9XUIuhR0c9BUe92DyQ=";
sha256 = "sha256-6BNUuYAy3rUpPeUsbLRpz0+LdgVeHjlVjmQRcuFSXEg=";
};
vendorHash = "sha256-CysPzlup8TVVR4rCm3cWTjnxwJznMv0wbaeCC0ofWSU=";
vendorHash = "sha256-KuMEAlXvW5FhTC7HQa3CoqRlhtwSBzjk+dgAnzScfno=";
nativeBuildInputs = [ makeWrapper installShellFiles ]
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];

View file

@ -2,13 +2,13 @@
sway-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "swayfx";
version = "0.3";
version = "0.3.1";
src = fetchFromGitHub {
owner = "WillPower3309";
repo = "swayfx";
rev = version;
sha256 = "sha256-3Odyeb10AGbNf6TI1W79sLiwB4PrszC5VzjCr7FuPz4=";
sha256 = "sha256-Ox+ror8sCc4mFOqZ1H9782hWbkTSUs5IVYEubHuyoJQ=";
};
# This patch was backported into SwayFX

View file

@ -11,13 +11,13 @@
stdenvNoCC.mkDerivation rec {
pname = "whatsapp-emoji-linux";
version = "2.22.8.79-1";
version = "2.23.2.72-1";
src = fetchFromGitHub {
rev = "refs/tags/${version}";
owner = "dmlls";
repo = "whatsapp-emoji-linux";
hash = "sha256-AYdyNZYskBNT3v2wl+M0BAYi5piwmrVIDfucSZ3nfTE=";
hash = "sha256-dwX+y8jCpR+SyiH13Os9VeXLDwmAYB7ARW2lAMl/7RE=";
};
makeFlags = [

View file

@ -0,0 +1,36 @@
{ lib
, stdenvNoCC
, fetchurl
, dbip-country-lite
}:
stdenvNoCC.mkDerivation rec {
pname = "dbip-country-lite";
version = "2023-06";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz";
hash = "sha256-H+f7OhI03qhgpldF05Nc5ohPIPNhyVRCwiVqeWkvIbc=";
};
dontUnpack = true;
installPhase = ''
runHook preBuild
gzip -c -d "$src" > dbip-country-lite.mmdb
install -Dm444 dbip-country-lite.mmdb "$out/share/dbip/dbip-country-lite.mmdb"
runHook postBuild
'';
passthru.mmdb = "${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb";
meta = with lib; {
description = "The free IP to Country Lite database by DB-IP";
homepage = "https://db-ip.com/db/download/ip-to-country-lite";
license = licenses.cc-by-40;
maintainers = with maintainers; [ nickcao ];
platforms = platforms.all;
};
}

View file

@ -2,7 +2,7 @@
, stdenvNoCC
, buildGoModule
, fetchFromGitHub
, clash-geoip
, dbip-country-lite
}:
let
@ -34,7 +34,7 @@ let
in
stdenvNoCC.mkDerivation rec {
inherit (generator) pname;
inherit (clash-geoip) version;
inherit (dbip-country-lite) version;
dontUnpack = true;
@ -43,8 +43,8 @@ stdenvNoCC.mkDerivation rec {
buildPhase = ''
runHook preBuild
${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip.db
${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip-cn.db cn
${pname} ${dbip-country-lite.mmdb} geoip.db
${pname} ${dbip-country-lite.mmdb} geoip-cn.db cn
runHook postBuild
'';
@ -61,6 +61,6 @@ stdenvNoCC.mkDerivation rec {
passthru = { inherit generator; };
meta = generator.meta // {
inherit (clash-geoip.meta) license;
inherit (dbip-country-lite.meta) license;
};
}

View file

@ -50,13 +50,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.48.2";
version = "3.48.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "HzJD3xK08dMpjJl31iIaZWX9J578mE4czyVSRdBM/9U=";
sha256 = "tx5BLlL1Z8gzlLWSbfkrT09tLN3rrThKUXxyBnH62ZY=";
};
patches = [

View file

@ -141,6 +141,11 @@ let
"$out/bin/python"
else pythonForBuild.interpreter;
src = fetchurl {
url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz";
inherit hash;
};
# The CPython interpreter contains a _sysconfigdata_<platform specific suffix>
# module that is imported by the sysconfig and distutils.sysconfig modules.
# The sysconfigdata module is generated at build time and contains settings
@ -216,15 +221,11 @@ let
in with passthru; stdenv.mkDerivation {
pname = "python3";
inherit version;
inherit src version;
inherit nativeBuildInputs;
buildInputs = [ bash ] ++ buildInputs; # bash is only for patchShebangs
src = fetchurl {
url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz";
inherit hash;
};
prePatch = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
@ -523,7 +524,24 @@ in with passthru; stdenv.mkDerivation {
separateDebugInfo = true;
inherit passthru;
passthru = passthru // {
doc = stdenv.mkDerivation {
inherit src;
name = "python${pythonVersion}-${version}-doc";
dontConfigure = true;
dontBuild = true;
sphinxRoot = "Doc";
postInstallSphinx = ''
mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version}
'';
nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ];
};
};
enableParallelBuilding = true;

View file

@ -16,6 +16,7 @@
"@angular/cli" = "ng";
"@antora/cli" = "antora";
"@astrojs/language-server" = "astro-ls";
"@babel/cli" = "babel";
"@bitwarden/cli" = "bw";
"@commitlint/cli" = "commitlint";
"@forge/cli" = "forge";

View file

@ -2,6 +2,7 @@
"@angular/cli"
, "@antfu/ni"
, "@astrojs/language-server"
, "@babel/cli"
, "@bitwarden/cli"
, "@commitlint/cli"
, "@commitlint/config-conventional"

File diff suppressed because it is too large Load diff

View file

@ -28,10 +28,9 @@ buildPerlPackage rec {
buildInputs = [
ArchiveZip
ArchiveCpio
SubOverride
];
nativeCheckInputs = [ SubOverride ];
postPatch = ''
substituteInPlace lib/File/StripNondeterminism.pm \
--replace "exec('file'" "exec('${lib.getExe file}'"

View file

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "composer";
version = "2.5.5";
version = "2.5.7";
src = fetchurl {
url = "https://github.com/composer/composer/releases/download/${version}/composer.phar";
sha256 = "sha256-VmptHPS+HMOsiC0qKhOBf/rlTmD1qnyRN0NIEKWAn/w=";
sha256 = "sha256-klbEwcgDudDLemahq2xzfkjEPMbfe47J7CSXpyS/RN4=";
};
dontUnpack = true;

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "aio-pika";
version = "9.0.7";
version = "9.1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "mosquito";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-4RZxpLQ8YcPRXrF0mJcteUwejlIQx0CIy0cFpfMW/RU=";
hash = "sha256-iyy6HaB3S/CPYuo62SThe3m96eg9rPTMaKg2KWt0Kf0=";
};
nativeBuildInputs = [

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "aiokafka";
version = "0.8.0";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "aio-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-g7xUB5RfjG4G7J9Upj3KXKSePa+VDit1Zf8pWHfui1o=";
hash = "sha256-O5cDP0PWFrxNSdwWqUUkErUKf1Tt9agKJqWIjd4jGqk=";
};
nativeBuildInputs = [

View file

@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "aiomisc";
version = "17.3.0";
version = "17.3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-HX3IfTQ/zgNnYRN1qnd3vVWvm84g2pjSOBjhzrZHEUI=";
hash = "sha256-tJ8d02KbG4z6cUflvjSF/Y7UHH8UqWT8UY7XFqNPP+o=";
};
nativeBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aiopvpc";
version = "4.1.0";
version = "4.2.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "azogue";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ixHLFVPlDZKQkPMrOt8PG5z+e84UlygQutkyS8wCZR4=";
hash = "sha256-gfF/SFfiZgkWH0cQZF3hxEp6xxRi46nfDBB23Gerv5g=";
};
postPatch = ''

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioslimproto";
version = "2.2.1";
version = "2.2.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ku96N3n71mrYuott6E6UwbloP6RzM9tiEATvYHzdYnM=";
hash = "sha256-ZvyAZ/VLkkZkDTBzuxt7hrCuYxNsMHm0C0wkabnE3Ek=";
};
propagatedBuildInputs = [

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "ansible-compat";
version = "4.0.5";
version = "4.1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-TX4zP41PNbED6rwCfZG1hdVd1hk6FLkRh/xmsa3Wxs0=";
hash = "sha256-aWFi28EiPAtHQTamFmKz/kQRXUkN6NpgaxSc7lcrAe0=";
};
nativeBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "apycula";
version = "0.8";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Apycula";
hash = "sha256-IUyhqOuftx06+dvN9afad10IpaefHoUeMwFyTzgBvOQ=";
hash = "sha256-IznOt69gzWO/+Snw9YfmDU2CE15IZ+jlPz+ZGfPzK+Q=";
};
nativeBuildInputs = [
@ -45,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Open Source tools for Gowin FPGAs";
homepage = "https://github.com/YosysHQ/apicula";
changelog = "https://github.com/YosysHQ/apicula/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ newam ];
};

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "asyncwhois";
version = "1.0.5";
version = "1.0.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pogzyb";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ILKnJlPT8BuZK06xk7fWYXcdn9SRL5zA3+B6CfJwvKM=";
hash = "sha256-SakO+s05P1Kj2NWlhMcdNa4bDs+DaVZ1W2ybs51U+BQ=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
version = "3.37.0";
version = "3.38.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "atlassian-api";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-+lhDivbw30Oa3aB0TprRhBzv/c72IzNltFZA87LY2nM=";
hash = "sha256-jk5q5ymnwyQ3t6fP8E1dPM4jkaUllvZqo9RiX8+SnvI=";
};
propagatedBuildInputs = [

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "bitarray";
version = "2.7.3";
version = "2.7.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9xJWoyYJsDatrZMuEii2amtOLK5r45fliN3Aur2aeLk=";
hash = "sha256-FD1PZeH0WlM+E1Ib4dxVengjF+z3ZSDqvVqQOybssYc=";
};
checkPhase = ''

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "coinmetrics-api-client";
version = "2023.5.2.20";
version = "2023.5.26.17";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "coinmetrics_api_client";
hash = "sha256-20+qoCaSNGw4DVlW3USrSkg3fckqF77TQ7wmSsuZ3ek=";
hash = "sha256-GCHXraeH6WWTlCnw9B1Xwtb6jwcxcvW1siy2T/8x14Q=";
};
nativeBuildInputs = [

View file

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "dvc-azure";
version = "2.21.1";
version = "2.21.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-0PB+2lPAV2yy2hivDDz0PXmi8WqoSlUZadyfKPp9o1g=";
hash = "sha256-ATxVIJ6qNNuz4p/DmcbBrc8KypfYquk4y/XQK7JmlPE=";
};
# Prevent circular dependency

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvclive";
version = "2.10.0";
version = "2.11.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-wnaw0jzaSIPsKaNNtYRUYYqQNpdcmtiunQnhpRQV66E=";
hash = "sha256-dV6ob+TXzQOuHU9bybAO8sVmrJ7yP8vwp0pXXFVNb34=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "edk2-pytool-library";
version = "0.15.1";
version = "0.15.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "tianocore";
repo = "edk2-pytool-library";
rev = "v${version}";
hash = "sha256-25P5EASn0nU58Vs9rlVLjXZ0ZovhR5pnClZfAwjMzBQ=";
hash = "sha256-gadFpFDHfiZ0vbUIEODu4SUL5SSsukdThxqP2ik5adI=";
};
nativeBuildInputs = [

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "fastavro";
version = "1.7.2";
version = "1.7.4";
format = "setuptools";
disabled = pythonOlder "3.6";

View file

@ -12,8 +12,10 @@
}:
buildPythonPackage rec {
pname = "hickle";
pname = "hickle";
version = "5.0.2";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
@ -28,11 +30,23 @@ buildPythonPackage rec {
propagatedBuildInputs = [ h5py numpy dill ];
nativeCheckInputs = [
pytestCheckHook scipy pandas astropy
pytestCheckHook
scipy
pandas
astropy
];
pythonImportsCheck = [ "hickle" ];
disabledTests = [
# broken in 5.0.2 with recent NumPy
# see https://github.com/telegraphic/hickle/issues/174
"test_scalar_compression"
# broken in 5.0.2 with python 3.11
# see https://github.com/telegraphic/hickle/issues/169
"test_H5NodeFilterProxy"
];
meta = {
description = "Serialize Python data to HDF5";
homepage = "https://github.com/telegraphic/hickle";

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "huggingface-hub";
version = "0.14.1";
version = "0.15.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "huggingface_hub";
rev = "refs/tags/v${version}";
hash = "sha256-+BtXi+O+Ef4p4b+8FJCrZFsxX22ZYOPXylexFtsldnA=";
hash = "sha256-q30/oNP1NjyxiJuSfxyjFgciydImMUgPdGJ/tqVtwZk=";
};
propagatedBuildInputs = [

View file

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "maestral";
version = "1.7.2";
version = "1.7.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "SamSchott";
repo = "maestral";
rev = "refs/tags/v${version}";
hash = "sha256-XyyEAeEQEc7MhGyXBBLZDqzBL7K+0dMMCKhr0iENvog=";
hash = "sha256-HOM7BlrKpqm16plTMLFpC6VScEoMlxCJFhZ0mcIFIcE=";
};
propagatedBuildInputs = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "minio";
version = "7.1.14";
version = "7.1.15";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "minio";
repo = "minio-py";
rev = "refs/tags/${version}";
hash = "sha256-GT9XMHzEOg04DZ/saacBfqAKc5A755m2zblJvwQjd1w=";
hash = "sha256-eqQPOMEJOTdvYHaQ+ty+bDJn4/S5KnUOtF42O1wc+mw=";
};
propagatedBuildInputs = [

View file

@ -38,6 +38,8 @@ buildPythonPackage rec {
pytestCheckHook
];
doCheck = false;
meta = with lib; {
changelog = "https://github.com/pbs/pycaption/blob/${version}/docs/changelog.rst";
description = "Closed caption converter";

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pytest-relaxed";
version = "2.0.0";
version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk=";
hash = "sha256-U6c3Lj/qpSdAm7QDU/gTxZt2Dl2L1H5vb88YfF2W3Qw=";
};
buildInputs = [

View file

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "python-benedict";
version = "0.30.1";
version = "0.30.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-7X8a9033r6MJT1KgPH7FiXL0EZqwi4wnKVw5AYAaVR8=";
hash = "sha256-MT1oZqzYFK37z6YpRZ9LBg0ynCaq2UrrQzlDDb3YIvo=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchFromGitHub, sphinx }:
buildPythonPackage rec {
pname = "python_docs_theme";
version = "2023.3.1";
format = "flit";
src = fetchFromGitHub {
owner = "python";
repo = "python-docs-theme";
rev = version;
sha256 = "sha256-WyO5Xc67k5ExB4eCFd17sZCBMaV5djle9BAM0tn5CPc=";
};
propagatedBuildInputs = [ sphinx ];
pythonImportsCheck = [ "python_docs_theme" ];
meta = with lib; {
homepage = "https://github.com/python/python-docs-theme";
description = "Sphinx theme for CPython project";
license = licenses.psfl;
maintainers = with maintainers; [ kaction ];
};
}

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rns";
version = "0.5.3";
version = "0.5.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
hash = "sha256-SZx0GBpYDC7p7yLVY5WZmBgpbpcl9GbsfdqH0YBrUgQ=";
hash = "sha256-OFU61RX6XtC/7x3SWbRCsODTrs3k3FCTCvEapkkeWQU=";
};
propagatedBuildInputs = [

View file

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "3.17.1";
version = "3.17.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "ietf-tools";
repo = "xml2rfc";
rev = "refs/tags/v${version}";
hash = "sha256-C5bc32XbAqJtzUbITj1U1ItaY2ZMEXM9z+B7dQadoIs=";
hash = "sha256-LwM0lfBJNSCMsa0AiGBRmuihc/kSLYQ4V6hgY5fM6/w=";
};
postPatch = ''

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.13.1";
version = "2.13.3";
dontConfigure = true;
dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-RJ4ditBvMBnzY/QEU5fWQhQ/bBTpkxjbe12PwP8c1cc=";
sha256 = "sha256-CYc/tFjDFXFlSY4/ykM7OR8HsUbYQUHL5IfGYw7to4k=";
};
nativeBuildInputs = [

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "bearer";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "bearer";
repo = "bearer";
rev = "refs/tags/v${version}";
hash = "sha256-5Vd6knHm9r2VicHuvPKE7jzRGcNog8THNwDQmW2MJ5Q=";
hash = "sha256-p+nQiIZfTScS6zNc8+qa+X5onfSecJzIrwMkWonJ3/w=";
};
vendorHash = "sha256-FRB01Tfz87MZp4V0HPeiEgYV8KEPcbzkeUM0uIBh6DU=";

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "checkmate";
version = "0.8.4";
version = "0.9.3";
src = fetchFromGitHub {
owner = "adedayo";
repo = pname;
rev = "v${version}";
hash = "sha256-tgiZDTPIAYirPX6nGPEAt6BoYEC8uUJwT6zuHJqPF1w=";
hash = "sha256-XzzN4oIG6E4NsMGl4HzFlgAGhkRieRn+jyA0bT8fcrg=";
};
vendorHash = "sha256-eL1fLJwzVpU9NqaAl5R/fbaqI3AnEkl6EuPkMTuY86w=";
vendorHash = "sha256-D87b/LhHnu8xE0wRdB/wLIuf5NlqrVnKt2WAF29bdZo=";
subPackages = [ "." ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "crd2pulumi";
version = "1.2.4";
version = "1.2.5";
src = fetchFromGitHub {
owner = "pulumi";
repo = "crd2pulumi";
rev = "v${version}";
sha256 = "sha256-2Lr6TMTZLxBisb8IZNIib4rQEvxj9KmljSQ5JGoeTEw=";
sha256 = "sha256-Km9zL9QQgQjmIaAILzJy8oSd9GyZn/MnmBYTRMFtXlE=";
};
vendorHash = "sha256-iWFZ20U4S2utIqhoXgLtT4pp5e9h8IpbveIKHPe0AAw=";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddosify";
version = "1.0.1";
version = "1.0.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-QinC03SdJ0V2t69LJYsoV+KV13D+OcTkLetFe8vLF3Y=";
sha256 = "sha256-SkKETcKlH6OF6+gLBq/6P7txcmMRxoXc1Mm005piCHc=";
};
vendorHash = "sha256-cGhMhX+SEv9fejViLZrEwXg584o204OQ5iR6AkxKnXo=";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grpc-gateway";
version = "2.15.2";
version = "2.16.0";
src = fetchFromGitHub {
owner = "grpc-ecosystem";
repo = "grpc-gateway";
rev = "v${version}";
sha256 = "sha256-0fpVSFo+o+M7vwwHIrYQZcAjdZjASdWz/cKXnPr6Je8=";
sha256 = "sha256-yoy3wESegXxlyaelex2gqr3GdzwwjxK7YTAzDCILr/c=";
};
vendorHash = "sha256-WHwZ0EAJIz7mZr27x+Z7PKLLAiw1z2rQvvNynpMJQDw=";
vendorHash = "sha256-dxzAiLEiZ+2+J9ZrkBemUt+slxz1zUa9Fx0VhUjFdN0=";
meta = with lib; {
description =

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lightningcss";
version = "1.19.0";
version = "1.20.0";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
rev = "refs/tags/v${version}";
sha256 = "sha256-ncZ1tof8InP+8KLTQ2YOwaD/liwU1LNZkllBm53VYNo=";
sha256 = "zy1kV53ZvgMbQL5skBCmqRezooyzvv90YAIAkLmuMKc=";
};
cargoHash = "sha256-xxR80iizEej1vAzItaoqQnJDZ62dxPOeEdaUpgqhG7I=";
cargoHash = "sha256-QL7O84Y6yaHL4UEbnfL8jLXH/Q6Ba4RC1NLq40Y3XDk=";
buildFeatures = [
"cli"

View file

@ -1,10 +1,9 @@
{ lib, stdenv, fetchFromGitHub, callPackage, jq, cmake, flex, bison, gecode, mpfr, cbc, zlib }:
stdenv.mkDerivation (finalAttrs: {
pname = "minizinc";
version = "2.7.4";
nativeBuildInputs = [ cmake flex bison gecode mpfr cbc zlib ];
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "libminizinc";
@ -12,9 +11,13 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-Zq5gAwe9IQmknSDilFyHhSk5ZCQ8EfBOiM6Oef2WxYg=";
};
nativeBuildInputs = [ bison cmake flex jq ];
buildInputs = [ gecode mpfr cbc zlib ];
postInstall = ''
mkdir -p $out/share/minizinc/solvers/
${jq}/bin/jq \
jq \
'.version = "${gecode.version}"
| .mznlib = "${gecode}/share/gecode/mznlib"
| .executable = "${gecode}/bin/fzn-gecode"' \
@ -29,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
homepage = "https://www.minizinc.org/";
description = "A medium-level constraint modelling language";
longDescription = ''
MiniZinc is a medium-level constraint modelling
language. It is high-level enough to express most
@ -37,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
that it can be mapped onto existing solvers easily and consistently.
It is a subset of the higher-level language Zinc.
'';
license = licenses.mpl20;
platforms = platforms.unix;
maintainers = [ maintainers.sheenobu ];

View file

@ -1,11 +1,9 @@
{ lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }:
mkDerivation rec {
pname = "minizinc-ide";
version = "2.5.5";
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine qtwebkit ];
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "MiniZincIDE";
@ -14,6 +12,9 @@ mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine qtwebkit ];
sourceRoot = "source/MiniZincIDE";
dontWrapQtApps = true;
@ -25,7 +26,6 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://www.minizinc.org/";
description = "IDE for MiniZinc, a medium-level constraint modelling language";
longDescription = ''
MiniZinc is a medium-level constraint modelling
language. It is high-level enough to express most
@ -33,7 +33,6 @@ mkDerivation rec {
that it can be mapped onto existing solvers easily and consistently.
It is a subset of the higher-level language Zinc.
'';
license = licenses.mpl20;
platforms = platforms.linux;
maintainers = [ maintainers.dtzWill ];

View file

@ -6,11 +6,16 @@
stdenv.mkDerivation {
name = "minizinc-simple-test";
meta.timeout = 10;
nativeBuildInputs = [ minizinc ];
dontInstall = true;
buildCommand = ''
${minizinc}/bin/minizinc --solver gecode ${./aust.mzn}
${minizinc}/bin/minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn}
minizinc --solver gecode ${./aust.mzn}
minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn}
touch $out
'';
meta.timeout = 10;
}

View file

@ -25,13 +25,13 @@ let makeArcWrapper = toolset: ''
in
stdenv.mkDerivation {
pname = "arcanist";
version = "20220517";
version = "20230530";
src = fetchFromGitHub {
owner = "phacility";
repo = "arcanist";
rev = "85c953ebe4a6fef332158fd757d97c5a58682d3a";
sha256 = "0x847fw74mzrbhzpgc4iqgvs6dsf4svwfa707dsbxi78fn2lxbl7";
rev = "e50d1bc4eabac9c37e3220e9f3fb8e37ae20b957";
hash = "sha256-u+HRsaCuAAyLrEihrZtLrdZ6NTVjPshieJATK3t5Fo4=";
};
patches = [
@ -80,7 +80,7 @@ stdenv.mkDerivation {
meta = {
description = "Command line interface to Phabricator";
homepage = "http://phabricator.org";
homepage = "https://www.phacility.com/";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.thoughtpolice ];

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "namaka";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "namaka";
rev = "v${version}";
hash = "sha256-ZTMqleCWmuNWhZE375gtF1j1JRkaKEUFN1AM43e7h4Y=";
hash = "sha256-CLGEW11Fo1v4vj0XSqiyW1EbhRZFO7dkgM43eKwItrk=";
};
cargoHash = "sha256-QnEiCWC0awE7CUSpfGJGV7ItXRnP1omodPfKAtXSihY=";
cargoHash = "sha256-exftXTO/NbTfd7gNPpZ886jXH1XveqX+Cl/gXpZlS4c=";
nativeBuildInputs = [
installShellFiles

View file

@ -1,17 +1,17 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }:
rustPlatform.buildRustPackage rec {
version = "0.5.1";
version = "0.5.2";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = "v${version}";
sha256 = "sha256-RcosHR+PD78hk7XMClUCWICrtWR/9OxIuyCFy2EK/Qs=";
sha256 = "sha256-CriVsjxbfe3iJ0FD9HAve3QunBt3rWkzWqQDuJcPR9A=";
};
cargoSha256 = "sha256-qDFBIU/IbQjLpTulI8tolFg54+2m2mV/JHuX4bsJYWw=";
cargoSha256 = "sha256-/pr+YT0ZejF0EpxZUlUBS21crtuhE/M222kvLAXaoyU=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.28.1";
version = "1.29.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-YzkPAKwkV8io0lz7JxIX4lciv85iqldkyitrLicbFJc=";
hash = "sha256-oHGs1Bx5k02k6mp9WAe8wIQ4FjMOREcUYv0DKZaXGdE=";
};
vendorHash = "sha256-ZWOIF3vmtoXzdGHHzjPy/351bHzMTTXcgSRBso+ixyM=";
vendorHash = "sha256-I2vL4uRmUbgaf3KGUHSQV2jWozStKHyjek3BQlxyY/c=";
nativeBuildInputs = [
makeWrapper

View file

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "pip-audit";
version = "2.5.5";
version = "2.5.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "trailofbits";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-tHNDJF4gmg5JnL+bt7kaLE+Xho721K5+gg1kpIjKY1k=";
hash = "sha256-hpzJtKtvhudT7OzZnuv6LbnMHnHIBYmQsAR1oRglvT0=";
};
nativeBuildInputs = [

View file

@ -1,26 +0,0 @@
{ python3
, fetchPypi
}:
with python3;
pkgs.buildPythonApplication rec {
pname = "pypi2nix";
version = "2.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "0y4zkkcijz5hchd8j6a106ysrg1dnad7dzdgnmz38rgm6zbrky0d";
};
propagatedBuildInputs = with pkgs; [
attrs
click
jinja2
nix-prefetch-github
packaging
parsley
setuptools
toml
jsonschema
];
# https://github.com/nix-community/pypi2nix/issues/460
meta.broken = true;
}

View file

@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-cov";
version = "0.5.19";
version = "0.5.20";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-5xHDjNFQDmi+SnhxfoCxoBdCqHpZEk/87r2sBKsT+W4=";
sha256 = "sha256-76FR1Irmqi/m6fJbhqN6+iBMfQNDkgO1SDBw/hzNCOY=";
};
cargoSha256 = "sha256-0fj5GJ/gjVBAdfYPHnT33kbnXBIE5+VRONcNBgBSoPc=";
cargoSha256 = "sha256-9QCXHVANvlmgEWNClgFkpCaduK/69vOLD9NTWv4H+Rw=";
# skip tests which require llvm-tools-preview
checkFlags = [

View file

@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
version = "0.30.0";
version = "0.31.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-bBMjHnDmgFRQ9R8BWVc6zTHDrbFxjBAelkgtHsGLC9w=";
hash = "sha256-TzdYmDLqFYHdp881SDc/QnRZv8QRgSHa00RGN0YPL2M=";
};
cargoHash = "sha256-c8jubHQexg7k0pxUREEGpa9F3SyMBdKLw87ZInEs/fI=";
cargoHash = "sha256-ndRpp9+dcywPKWZ7UB/NadmZKxmdiJjaiQJ/lJj8TKA=";
nativeBuildInputs = [ pkg-config ];

View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper }:
buildGoModule rec {
pname = "skaffold";
@ -22,7 +22,7 @@ buildGoModule rec {
"-X ${t}/version.buildDate=unknown"
];
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles makeWrapper ];
doInstallCheck = true;
installCheckPhase = ''
@ -30,6 +30,8 @@ buildGoModule rec {
'';
postInstall = ''
wrapProgram $out/bin/skaffold --set SKAFFOLD_UPDATE_CHECK false
installShellCompletion --cmd skaffold \
--bash <($out/bin/skaffold completion bash) \
--zsh <($out/bin/skaffold completion zsh)

Some files were not shown because too many files have changed in this diff Show more