Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2022-06-14 00:14:52 +00:00 committed by GitHub
commit 3975a7ac58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
154 changed files with 5711 additions and 4633 deletions

View File

@ -277,9 +277,6 @@ my-vim =
copy paste output2 here
];
# Pathogen would be
# vimrcConfig.pathogen.knownPlugins = plugins; # plugins
# vimrcConfig.pathogen.pluginNames = ["tlib"];
};
```

View File

@ -1,4 +1,8 @@
-- default of luarocks listed at src/luarocks/core/cfg.lua
-- keep this list synced with pkgs/build-support/fetchurl/mirrors.nix
rocks_servers = {
"https://luarocks.org"
"https://luarocks.org",
"https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
}
version_check_on_fail = false

View File

@ -31,7 +31,7 @@ from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment
PKG_LIST="maintainers/scripts/luarocks-packages.csv"
TMP_FILE="$(mktemp)"
GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix"
LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"
LUAROCKS_CONFIG="maintainers/scripts/luarocks-config.lua"
HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
Regenerate it with:
@ -158,14 +158,14 @@ def generate_pkg_nix(plug: LuaPlugin):
Our cache key associates "p.name-p.version" to its rockspec
'''
log.debug("Generating nix expression for %s", plug.name)
cmd = [ "luarocks", "nix"]
custom_env = os.environ.copy()
custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG
cmd = [ "luarocks", "nix"]
if plug.maintainers:
cmd.append(f"--maintainers={plug.maintainers}")
# updates plugin directly from its repository
print("server: [%s]" % plug.server)
# if plug.server == "src":
if plug.src != "":
if plug.src is None:
@ -194,7 +194,8 @@ def generate_pkg_nix(plug: LuaPlugin):
cmd.append(f"--lua-dir={lua_drv_path}/bin")
log.debug("running %s", ' '.join(cmd))
output = subprocess.check_output(cmd, text=True)
output = subprocess.check_output(cmd, env=custom_env, text=True)
output = "callPackage(" + output.strip() + ") {};\n\n"
return (plug, output)

View File

@ -121,6 +121,14 @@
this version for the entire lifecycle of the 22.11 release.
</para>
</listitem>
<listitem>
<para>
(Neo)Vim can not be configured with
<literal>configure.pathogen</literal> anymore to reduce
maintainance burden. Use <literal>configure.packages</literal>
instead.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.11-notable-changes">

View File

@ -50,6 +50,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- PHP 7.4 is no longer supported due to upstream not supporting this
version for the entire lifecycle of the 22.11 release.
- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
Use `configure.packages` instead.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Other Notable Changes {#sec-release-22.11-notable-changes}

View File

@ -215,6 +215,7 @@ in {
systemd.sockets.mpd = mkIf cfg.startWhenNeeded {
wantedBy = [ "sockets.target" ];
listenStreams = [
"" # Note: this is needed to override the upstream unit
(if pkgs.lib.hasPrefix "/" cfg.network.listenAddress
then cfg.network.listenAddress
else "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}")

View File

@ -312,6 +312,7 @@ in {
"-h" (lib.concatStringsSep " " cfg.urlList)
]);
Type = "notify";
NotifyAccess = "all";
PIDFile = cfg.settings.attrs.olcPidFile;
};
};

View File

@ -124,6 +124,11 @@ let
default = 1;
description = "Org id. will default to orgId 1 if not specified.";
};
uid = mkOption {
type = types.nullOr types.str;
default = null;
description = "Custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically.";
};
url = mkOption {
type = types.str;
description = "Url of the datasource.";

View File

@ -57,9 +57,9 @@ in {
${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \
-p ${toString cfg.port} \
-l ${cfg.listenAddress} \
${optionalString cfg.verbose "-v"} \
${optionalString cfg.singleSubnetPerField "-s"} \
${optionalString cfg.withRemoteIp "-r"} \
${optionalString cfg.verbose "-v true"} \
${optionalString cfg.singleSubnetPerField "-s true"} \
${optionalString cfg.withRemoteIp "-r true"} \
${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"}
'';
RestrictAddressFamilies = [

View File

@ -52,18 +52,18 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
machine.succeed(api_post("/Startup/Complete"))
with machine.nested("Can login"):
auth_result = machine.succeed(
auth_result_str = machine.succeed(
api_post(
"/Users/AuthenticateByName",
"${payloads.auth}",
)
)
auth_result = json.loads(auth_result)
auth_result = json.loads(auth_result_str)
auth_token = auth_result["AccessToken"]
auth_header += f", Token={auth_token}"
sessions_result = machine.succeed(api_get("/Sessions"))
sessions_result = json.loads(sessions_result)
sessions_result_str = machine.succeed(api_get("/Sessions"))
sessions_result = json.loads(sessions_result_str)
this_session = [
session for session in sessions_result if session["DeviceId"] == "1337"
@ -71,8 +71,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
if len(this_session) != 1:
raise Exception("Session not created")
me = machine.succeed(api_get("/Users/Me"))
me = json.loads(me)["Id"]
me_str = machine.succeed(api_get("/Users/Me"))
me = json.loads(me_str)["Id"]
with machine.nested("Can add library"):
tempdir = machine.succeed("mktemp -d -p /var/lib/jellyfin").strip()
@ -100,8 +100,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
def is_refreshed(_):
folders = machine.succeed(api_get("/Library/VirtualFolders"))
folders = json.loads(folders)
folders_str = machine.succeed(api_get("/Library/VirtualFolders"))
folders = json.loads(folders_str)
print(folders)
return all(folder["RefreshStatus"] == "Idle" for folder in folders)
@ -116,10 +116,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
def has_movie(_):
global items
items = machine.succeed(
items_str = machine.succeed(
api_get(f"/Users/{me}/Items?IncludeItemTypes=Movie&Recursive=true")
)
items = json.loads(items)["Items"]
items = json.loads(items_str)["Items"]
return len(items) == 1
@ -127,8 +127,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
video = items[0]["Id"]
item_info = machine.succeed(api_get(f"/Users/{me}/Items/{video}"))
item_info = json.loads(item_info)
item_info_str = machine.succeed(api_get(f"/Users/{me}/Items/{video}"))
item_info = json.loads(item_info_str)
if item_info["Name"] != "Big Buck Bunny":
raise Exception("Jellyfin failed to properly identify file")

View File

@ -197,6 +197,7 @@ in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}
with subtest("have the terminal display a colour"):
# We run this command in the background
assert machine.shell is not None
machine.shell.send(b"(run-in-this-term display-colour |& systemd-cat -t terminal) &\n")
with machine.nested("Waiting for the screen to have pink on it:"):

View File

@ -150,8 +150,8 @@ rec {
# and do `:call deoplete#enable()`. It will print an error if the remote
# plugin is not registered.
test_nvim_with_remote_plugin = neovim.override {
extraName = "-pathogen-remote";
configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ];
extraName = "-remote";
configure.packages.foo.start = with vimPlugins; [ deoplete-nvim ];
};
# only neovim makes use of `requiredPlugins`, test this here

File diff suppressed because it is too large Load Diff

View File

@ -20,8 +20,10 @@
, dasht
, direnv
, fzf
, gawk
, gnome
, himalaya
, jq
, khard
, languagetool
, llvmPackages
@ -300,6 +302,18 @@ self: super: {
'';
});
fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs (old: {
# add this to your lua config to prevent the plugin from trying to write in the
# nix store:
# vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json'
propagatedBuildInputs = [
jq
gawk
];
dependencies = with self; [ fzf-vim ];
});
fzf-lua = super.fzf-lua.overrideAttrs (old: {
propagatedBuildInputs = [ fzf ];
});
@ -845,7 +859,7 @@ self: super: {
let
maple-bin = rustPlatform.buildRustPackage {
name = "maple";
src = old.src;
inherit (old) src;
nativeBuildInputs = [
pkg-config
@ -860,7 +874,7 @@ self: super: {
libiconv
];
cargoSha256 = "0l1x7kprnxa95pbf8ml9ixmj0cmbnnv6nd0v6qry8j67rx8plpmp";
cargoSha256 = "sha256-XmQTRmOO/tyA0F6FQQRxZPcVXCYZkEAiNIzU/ismjc0=";
};
in
''

View File

@ -41,6 +41,7 @@ https://github.com/vim-scripts/a.vim/,,
https://github.com/mileszs/ack.vim/,,
https://github.com/eikenb/acp/,,
https://github.com/stevearc/aerial.nvim/,,
https://github.com/Numkil/ag.nvim/,,
https://github.com/derekelkins/agda-vim/,,
https://github.com/slashmili/alchemist.vim/,,
https://github.com/dense-analysis/ale/,,
@ -223,6 +224,7 @@ https://github.com/shumphrey/fugitive-gitlab.vim/,,
https://github.com/BeneCollyridam/futhark-vim/,,
https://github.com/rktjmp/fwatch.nvim/,,
https://github.com/stsewd/fzf-checkout.vim/,,
https://github.com/monkoose/fzf-hoogle.vim/,HEAD,
https://github.com/gfanto/fzf-lsp.nvim/,,
https://github.com/ibhagwan/fzf-lua/,HEAD,
https://github.com/junegunn/fzf.vim/,,
@ -321,6 +323,7 @@ https://github.com/nvim-lua/lsp-status.nvim/,,
https://github.com/nvim-lua/lsp_extensions.nvim/,,
https://git.sr.ht/~whynothugo/lsp_lines.nvim,,
https://github.com/ray-x/lsp_signature.nvim/,,
https://github.com/lspcontainers/lspcontainers.nvim/,,
https://github.com/onsails/lspkind-nvim/,,
https://github.com/tami5/lspsaga.nvim/,,
https://github.com/folke/lua-dev.nvim/,,
@ -428,12 +431,14 @@ https://github.com/kevinhwang91/nvim-hlslens/,,
https://github.com/neovimhaskell/nvim-hs.vim/,,
https://github.com/mfussenegger/nvim-jdtls/,,
https://github.com/gennaro-tedesco/nvim-jqx/,,
https://github.com/ethanholz/nvim-lastplace/,HEAD,
https://github.com/kosayoda/nvim-lightbulb/,,
https://github.com/josa42/nvim-lightline-lsp/,,
https://github.com/mfussenegger/nvim-lint/,,
https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
https://github.com/neovim/nvim-lspconfig/,,
https://github.com/RishabhRD/nvim-lsputils/,,
https://github.com/rafcamlet/nvim-luapad/,,
https://github.com/scalameta/nvim-metals/,,
https://github.com/AckslD/nvim-neoclip.lua/,,
https://github.com/yamatsum/nvim-nonicons/,,
@ -518,6 +523,7 @@ https://github.com/rust-lang/rust.vim/,,
https://github.com/hauleth/sad.vim/,,
https://github.com/vmware-archive/salt-vim/,,
https://github.com/Xuyuanp/scrollbar.nvim/,,
https://github.com/cakebaker/scss-syntax.vim/,,
https://github.com/RobertAudi/securemodelines/,,
https://github.com/megaannum/self/,,
https://github.com/jaxbot/semantic-highlight.vim/,,
@ -538,6 +544,7 @@ https://github.com/ctjhoa/spacevim/,,
https://github.com/chrisgeo/sparkup/,,
https://github.com/edluffy/specs.nvim/,,
https://github.com/lewis6991/spellsitter.nvim/,HEAD,
https://github.com/stsewd/sphinx.nvim/,,
https://github.com/sjl/splice.vim/,,
https://github.com/vimlab/split-term.vim/,,
https://github.com/AndrewRadev/splitjoin.vim/,,
@ -552,6 +559,7 @@ https://github.com/lambdalisue/suda.vim/,,
https://github.com/ervandew/supertab/,,
https://github.com/ur4ltz/surround.nvim/,,
https://github.com/peterbjorgensen/sved/,,
https://github.com/jamespeapen/swayconfig.vim/,,
https://github.com/keith/swift.vim/,,
https://github.com/AndrewRadev/switch.vim/,,
https://github.com/simrat39/symbols-outline.nvim/,,

View File

@ -51,9 +51,6 @@ vim-with-plugins in PATH:
# full documentation at github.com/MarcWeber/vim-addon-manager
];
# there is a pathogen implementation as well, but its startup is slower and [VAM] has more feature
# vimrcConfig.pathogen.knownPlugins = vimPlugins; # optional
# vimrcConfig.pathogen.pluginNames = ["vim-addon-nix"];
};
WHAT IS A VIM PLUGIN?
@ -103,7 +100,7 @@ It might happen than a plugin is not known by vim-pi yet. We encourage you to
contribute to vim-pi so that plugins can be updated automatically.
CREATING DERVITATIONS AUTOMATICALLY BY PLUGIN NAME
CREATING DERIVATIONS AUTOMATICALLY BY PLUGIN NAME
==================================================
Most convenient is to use a ~/.vim-scripts file putting a plugin name into each line
as documented by [VAM]'s README.md
@ -277,24 +274,18 @@ let
}:
let
/* pathogen mostly can set &rtp at startup time. Its used very commonly.
/* pathogen mostly can set &rtp at startup time. Deprecated.
*/
pathogenImpl = let
knownPlugins = pathogen.knownPlugins or vimPlugins;
plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames);
pluginsEnv = buildEnv {
name = "pathogen-plugin-env";
paths = map (x: "${x}/${rtpPath}") plugins;
pathogenPackages.pathogen = lib.warn "'pathogen' attribute is deprecated. Use 'packages' instead in your vim configuration" {
start = plugins;
};
in
''
let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.vim-pathogen.rtp}"
execute pathogen#infect('${pluginsEnv}/{}')
filetype indent plugin on | syn on
'';
nativeImpl pathogenPackages;
/* vim-plug is an extremely popular vim plugin manager.
*/

View File

@ -59,6 +59,7 @@ in
homepage = "https://github.com/VSCodium/vscodium";
downloadPage = "https://github.com/VSCodium/vscodium/releases";
license = licenses.mit;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ synthetica turion bobby285271 ];
mainProgram = "codium";
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ];

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "dynamips";
version = "0.2.21";
version = "0.2.22";
src = fetchFromGitHub {
owner = "GNS3";
repo = pname;
rev = "v${version}";
hash = "sha256-JQJa3NZ9mQqqvuTzU7XmAr1WRB4zuLIwBx18OY3GbV8=";
sha256 = "1fjjjdaxlw1k95kyq73fndn21qfhrm4cn79av0i4sn7anhg8m83f";
};
nativeBuildInputs = [ cmake ];

View File

@ -25,20 +25,20 @@
stdenv.mkDerivation rec {
pname = "authenticator";
version = "4.1.2";
version = "4.1.4";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Authenticator";
rev = version;
hash = "sha256-YxmVqL9dseImN3LfkRz+Au+IaKpTepHl3CNx2Ue7N24=";
hash = "sha256-606uMEbJd60ehoEEV0w2vz33poR1/18HcsvBMszMZrc=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-ub2PryALI7QXEG0djkPVQQCgZn5M5VoGo6ETSkvEjX0=";
hash = "sha256-D2kT4IBKxbrL17S+kPyofu1sLPHMuyez6jTiA6kVohs=";
};
nativeBuildInputs = [

View File

@ -87,6 +87,7 @@ stdenv.mkDerivation ({
description = "Broadband internet speed test app from the german Bundesnetzagentur";
homepage = "https://www.breitbandmessung.de";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ b4dm4n ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};

View File

@ -206,6 +206,7 @@ stdenv.mkDerivation {
description = "Mozilla Firefox, free web browser (binary package)";
homepage = "http://www.mozilla.org/firefox/";
license = licenses.mpl20;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = builtins.attrNames mozillaPlatforms;
hydraPlatforms = [];
maintainers = with maintainers; [ taku0 lovesegfault ];

View File

@ -162,6 +162,7 @@ in stdenv.mkDerivation {
description = "A freeware web browser developed by Google";
homepage = "https://www.google.com/chrome/browser/";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ primeos ];
# Note from primeos: By updating Chromium I also update Google Chrome and
# will try to merge PRs and respond to issues but I'm not actually using

View File

@ -185,6 +185,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.microsoft.com/en-us/edge";
description = "The web browser from Microsoft";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ zanculmarktum kuwii ];
};

View File

@ -127,5 +127,6 @@ in stdenv.mkDerivation rec {
description = "Web browser";
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View File

@ -51,9 +51,9 @@ stdenv.mkDerivation rec {
domain = "repo.palemoon.org";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
rev = "${version}_Release_build2"; # Remove _build2 when bumping past 31.1.0
fetchSubmodules = true;
sha256 = "sha256-82OvD4q89D0rxMdzPEabMGLXXtEt4A7P6p2gKi7o+oA=";
sha256 = "sha256-x3n4OeZbnJCPCVjsZJW1nBYlsEYn6fXt80voYWQSNq4=";
};
nativeBuildInputs = [

View File

@ -434,5 +434,6 @@ stdenv.mkDerivation rec {
# the compound is "libre" in a strict sense (some components place certain
# restrictions on redistribution), it's free enough for our purposes.
license = licenses.free;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View File

@ -101,6 +101,7 @@ in stdenv.mkDerivation rec {
description = "A Browser for our Friends, powerful and personal";
homepage = "https://vivaldi.com";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ otwieracz badmutex ];
platforms = [ "x86_64-linux" ];
};

View File

@ -130,6 +130,7 @@ stdenv.mkDerivation rec {
description = "Yandex Web Browser";
homepage = "https://browser.yandex.ru/";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ dan4ik605743 ];
platforms = [ "x86_64-linux" ];

View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.15";
version = "3.3.16";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-SNAhuiUO8f92LAdnV9q04xK4yT+AVAS+YAHPPtHdMYI=";
hash = "sha256-XN5KJ9GgFSDMYd6n9Mt3UARsa/ZAB61DBGMRvFz/NVA=";
};
postPatch = ''

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hydroxide";
version = "0.2.21";
version = "0.2.23";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fF+pQnqAWBktc4NdQFTHeB/sEg5bPTxXtdL1x5JuXU8=";
sha256 = "sha256-Hc348rlwICnPWq7qYzFE01QeeJuQpSP19NjXtGqI10o=";
};
vendorSha256 = "sha256-M5QlhF2Cj1jn5NNiKj1Roh9+sNCWxQEb4vbtsDfapWY=";

View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.10.13",
"version": "1.10.14",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {

View File

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.10.13",
"version": "1.10.14",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -58,8 +58,8 @@
"gfm.css": "^1.1.2",
"jsrsasign": "^10.2.0",
"katex": "^0.12.0",
"matrix-js-sdk": "18.0.0",
"matrix-react-sdk": "3.45.0",
"matrix-js-sdk": "18.1.0",
"matrix-react-sdk": "3.46.0",
"matrix-widget-api": "^0.1.0-beta.18",
"prop-types": "^15.7.2",
"react": "17.0.2",
@ -123,7 +123,7 @@
"jest-sonar-reporter": "^2.0.0",
"json-loader": "^0.5.7",
"loader-utils": "^1.4.0",
"matrix-mock-request": "^1.2.3",
"matrix-mock-request": "^2.0.0",
"matrix-react-test-utils": "^0.2.3",
"matrix-web-i18n": "^1.2.0",
"mini-css-extract-plugin": "^0.12.0",

View File

@ -1,7 +1,7 @@
{
"version": "1.10.13",
"desktopSrcHash": "tTvpjSIipvmJIfZF1RiRtlDjsKJYHoPQ6XSqI8TGH14=",
"desktopYarnHash": "105bphn4ga4f0n60cvrlppf8wim2c1qy09g8arraadcxymds98n6",
"webSrcHash": "+imju7ojpjttmOeDnA2L4QdBi1zzfRBoUdMMTA4Lba0=",
"webYarnHash": "19b1w2mrcn3mzw40d023wx1jxvr0jacn2ryzxlh7zsyj8w0v1dv7"
"version": "1.10.14",
"desktopSrcHash": "/y4pJSNQrN0Ksc+yjB3Xl6t8AZLNtZ/Rm0UoAhwlgp8=",
"desktopYarnHash": "1rnzaxy7l7912j6df8w2kw66pqwrs7kg7hd0680i38c1db5f4y6n",
"webSrcHash": "2CagKKFulLi8Gl/IPabzKfCFTBmw8SGa22hTM+7IewE=",
"webYarnHash": "15jjryjav3v58j4260ig548g1m6g6vhid4iigpv7k8pa4rhcwnyh"
}

View File

@ -149,5 +149,6 @@ in stdenv.mkDerivation rec {
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ mic92 equirosa ];
platforms = [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}

View File

@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
version = "1.8.19";
version = "1.8.20";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-NKHhmBF2h02+TuZu4NkQPJCYmqTc3Ehh5N4Fzn5EUms=";
sha256 = "sha256-2TriqvwPSK99ydCzlN8buABYi4tOjQltizzyJTROsRE=";
};
patches = [

View File

@ -21,15 +21,16 @@ index bdb4fb8..1363a67 100755
#[ -x "$MSMTP" ] || \
# log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit
##
@@ -70,9 +70,8 @@ MSMTP=msmtp
@@ -70,9 +70,9 @@ MSMTP=msmtp
## ( chmod 0700 msmtp.queue )
##
## the queue dir - modify this to reflect where you'd like it to be (no quotes !!)
-Q=~/.msmtp.queue
-[ -d "$Q" ] || \
- err '' "msmtpq : can't find msmtp queue directory [ $Q ]" '' # if not present - complain ; quit
-[ -d "$Q" ] || mkdir -m 0700 "$Q" || \
- err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit
+Q=${MSMTP_QUEUE:-~/.msmtp.queue}
+test -d "$Q" || mkdir -p "$Q"
+[ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \
+ err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit
##
## set the queue log file var to the location of the msmtp queue log file
## where it is or where you'd like it to be

View File

@ -15,6 +15,7 @@ let
inherit description;
homepage = "https://github.com/zadam/trilium";
license = licenses.agpl3Plus;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ fliegendewurst ];
};

View File

@ -47,6 +47,7 @@ callPackage real-drv {
description = "Wolfram Mathematica computational software system";
homepage = "http://www.wolfram.com/mathematica/";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ herberteuler ];
platforms = [ "x86_64-linux" ];
};

View File

@ -1,8 +1,8 @@
{ lib
, config
, stdenv
, fetchurl
, fetchpatch
, fetchFromGitHub
, autoreconfHook
, boost
, ffmpeg
, ffms
@ -16,7 +16,9 @@
, libX11
, libass
, libiconv
, libuchardet
, pkg-config
, which
, wxGTK
, zlib
@ -24,7 +26,7 @@
, hunspell ? null
, automationSupport ? true
, lua ? null
, luajit ? null
, openalSupport ? false
, openal ? null
@ -37,64 +39,39 @@
, portaudioSupport ? false
, portaudio ? null
}:
assert spellcheckSupport -> (hunspell != null);
assert automationSupport -> (lua != null);
assert automationSupport -> (luajit != null);
assert openalSupport -> (openal != null);
assert alsaSupport -> (alsa-lib != null);
assert pulseaudioSupport -> (libpulseaudio != null);
assert portaudioSupport -> (portaudio != null);
let
luajit52 = luajit.override { enable52Compat = true; };
inherit (lib) optional;
in
stdenv.mkDerivation rec {
pname = "aegisub";
version = "3.2.2";
version = "3.3.2";
src = fetchurl {
url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz";
hash = "sha256-xV4zlFuC2FE8AupueC8Ncscmrc03B+lbjAAi9hUeaIU=";
src = fetchFromGitHub {
owner = "wangqr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Er0g8fJyx7zjNVpKw7zUHE40hU10BdYlZohlqJq2LE0=";
};
patches = [
# Compatibility with ICU 59
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch";
sha256 = "sha256-R2rN7EiyA5cuBYIAMpa0eKZJ3QZahfnRp8R4HyejGB8=";
})
# Compatbility with Boost 1.69
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch";
sha256 = "sha256-7nlfojrb84A0DT82PqzxDaJfjIlg5BvWIBIgoqasHNk=";
})
# Compatbility with make 4.3
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch";
sha256 = "sha256-rG8RJokd4V4aSYOQw2utWnrWPVrkqSV3TAvnGXNhLOk=";
})
# Compatibility with ffms2
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/1aa9215e7fc360de05da9b7ec2cd68f1940af8b2.patch";
sha256 = "sha256-JsuI4hQTcT0TEqHHoSsGbuiTg4hMCH3Cxp061oLk8Go=";
})
./update-ffms2.patch
# Compatibility with X11
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/7a6da26be6a830f4e1255091952cc0a1326a4520.patch";
sha256 = "sha256-/aTcIjFlZY4N9+IyHL4nwR0hUR4HTJM7ibbdKmNxq0w=";
})
];
patches = [ ./no-git.patch ];
nativeBuildInputs = [
autoreconfHook
intltool
luajit52
pkg-config
which
];
buildInputs = [
boost
@ -109,17 +86,24 @@ stdenv.mkDerivation rec {
libX11
libass
libiconv
libuchardet
wxGTK
zlib
]
++ optional alsaSupport alsa-lib
++ optional automationSupport lua
++ optional automationSupport luajit52
++ optional openalSupport openal
++ optional portaudioSupport portaudio
++ optional pulseaudioSupport libpulseaudio
++ optional spellcheckSupport hunspell
;
configureFlags = [
"--with-boost-libdir=${boost.out}/lib"
"--with-system-luajit"
"FORCE_GIT_VERSION=${version}"
];
enableParallelBuilding = true;
hardeningDisable = [
@ -127,22 +111,10 @@ stdenv.mkDerivation rec {
"relro"
];
postPatch = ''
sed -i 's/-Wno-c++11-narrowing/-Wno-narrowing/' configure.ac src/Makefile
'';
# compat with icu61+
# https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
# this is fixed upstream though not yet in an officially released version,
# should be fine remove on next release (if one ever happens)
NIX_LDFLAGS = "-lpthread";
postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
meta = with lib; {
homepage = "https://github.com/Aegisub/Aegisub";
homepage = "https://github.com/wangqr/Aegisub";
description = "An advanced subtitle editor";
longDescription = ''
Aegisub is a free, cross-platform open source tool for creating and
@ -157,4 +129,3 @@ stdenv.mkDerivation rec {
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
# TODO [ AndersonTorres ]: update to fork release

View File

@ -0,0 +1,41 @@
Modified from <https://github.com/wangqr/Aegisub/commit/f8dca9f6386299ec2f90158e2d923a8fb30e3466>
to patch cleanly to v3.3.2. Necessary for building without git.
Upstream and will be in next release.
diff --git a/build/version.sh b/build/version.sh
index 8cea0a3f3..d505341e4 100755
--- a/build/version.sh
+++ b/build/version.sh
@@ -10,13 +10,13 @@ if ! test -d "${srcdir}/.git"; then
done < "${version_h_path}"
if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
export VERSION_SOURCE="from cached git_version.h"
- return 0
+ exit 0
else
echo "invalid git_version.h"
exit 2
fi
- else
- echo "git repo not found and no cached git_version.h"
+ elif [ -z "$FORCE_GIT_VERSION" ]; then
+ echo "git repo not found and no cached git_version.h - use FORCE_GIT_VERSION to override"
exit 2
fi
fi
@@ -25,13 +25,13 @@ last_svn_revision=6962
last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
-git_version_str=$(git describe --exact-match 2> /dev/null)
+git_version_str=${FORCE_GIT_VERSION:-$(git describe --exact-match 2> /dev/null)}
installer_version='0.0.0'
resource_version='0, 0, 0'
if test x$git_version_str != x; then
git_version_str="${git_version_str##v}"
tagged_release=1
- if [ $(echo $git_version_str | grep '\d\.\d\.\d') ]; then
+ if [ $(echo $git_version_str | grep '[0-9].[0-9].[0-9]') ]; then
installer_version=$git_version_str
resource_version=$(echo $git_version_str | sed 's/\./, /g')
fi

View File

@ -1,105 +0,0 @@
commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37
Author: Thomas Goyne <plorkyeran@aegisub.org>
Date: Wed Nov 21 16:41:05 2018 -0800
Update ffmpeg and ffms2
diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp
index 8bd68fbbf..f4ed6a2f2 100644
--- a/src/video_provider_ffmpegsource.cpp
+++ b/src/video_provider_ffmpegsource.cpp
@@ -44,6 +44,23 @@
#include <libaegisub/make_unique.h>
namespace {
+typedef enum AGI_ColorSpaces {
+ AGI_CS_RGB = 0,
+ AGI_CS_BT709 = 1,
+ AGI_CS_UNSPECIFIED = 2,
+ AGI_CS_FCC = 4,
+ AGI_CS_BT470BG = 5,
+ AGI_CS_SMPTE170M = 6,
+ AGI_CS_SMPTE240M = 7,
+ AGI_CS_YCOCG = 8,
+ AGI_CS_BT2020_NCL = 9,
+ AGI_CS_BT2020_CL = 10,
+ AGI_CS_SMPTE2085 = 11,
+ AGI_CS_CHROMATICITY_DERIVED_NCL = 12,
+ AGI_CS_CHROMATICITY_DERIVED_CL = 13,
+ AGI_CS_ICTCP = 14
+} AGI_ColorSpaces;
+
/// @class FFmpegSourceVideoProvider
/// @brief Implements video loading through the FFMS library.
class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider {
@@ -78,7 +95,7 @@ public:
if (matrix == RealColorSpace)
FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
else if (matrix == "TV.601")
- FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
+ FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
else
return;
ColorSpace = matrix;
@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) {
std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
switch (cs) {
- case FFMS_CS_RGB:
+ case AGI_CS_RGB:
return "None";
- case FFMS_CS_BT709:
+ case AGI_CS_BT709:
return str + ".709";
- case FFMS_CS_FCC:
+ case AGI_CS_FCC:
return str + ".FCC";
- case FFMS_CS_BT470BG:
- case FFMS_CS_SMPTE170M:
+ case AGI_CS_BT470BG:
+ case AGI_CS_SMPTE170M:
return str + ".601";
- case FFMS_CS_SMPTE240M:
+ case AGI_CS_SMPTE240M:
return str + ".240M";
default:
throw VideoOpenError("Unknown video color space");
@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
// set thread count
int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
+#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0)
if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
Threads = 1;
+#endif
// set seekmode
// TODO: give this its own option?
@@ -235,18 +254,22 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
else
DAR = double(Width) / Height;
- CS = TempFrame->ColorSpace;
+ int VideoCS = CS = TempFrame->ColorSpace;
CR = TempFrame->ColorRange;
- if (CS == FFMS_CS_UNSPECIFIED)
- CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
+ if (CS == AGI_CS_UNSPECIFIED)
+ CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG;
RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
#if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
- if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
- if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
+ if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
+ CS = AGI_CS_BT470BG;
+ ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR);
+ }
+
+ if (CS != VideoCS) {
+ if (FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), &ErrInfo))
throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
- ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
}
#endif

View File

@ -39,26 +39,27 @@ with py.pkgs;
buildPythonApplication rec {
pname = "catt";
version = "0.12.2";
disabled = python3.pythonOlder "3.4";
version = "0.12.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BOETKTkcbLOu5SubiejswU7D47qWS13QZ7rU9x3jf5Y=";
hash = "sha256-Q9ePWRLwuuTG+oPKFg7xn1gj4uAVlXUxegWdyH3Yd90=";
};
propagatedBuildInputs = [
click
ifaddr
PyChromecast
protobuf
requests
youtube-dl
yt-dlp
];
doCheck = false; # attempts to access various URLs
pythonImportsCheck = [ "catt" ];
pythonImportsCheck = [
"catt"
];
meta = with lib; {
description = "Tool to send media from online sources to Chromecast devices";

View File

@ -323,7 +323,6 @@
"https://luarocks.org/"
"https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
"https://luafr.org/moonrocks/"
"http://luarocks.logiceditor.com/rocks/"
];
# Python PyPI

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spdx-license-list-data";
version = "3.16";
version = "3.17";
src = fetchFromGitHub {
owner = "spdx";
repo = "license-list-data";
rev = "v${version}";
hash = "sha256-FPN9EIwXtz0b1tUZ/AOWK2zj2nfd5+POGmRC52mSzcA=";
hash = "sha256-wptjEdx1N2HMzeSVsztZ93Bu6OkMAgHGTUfMLYiePZY=";
};
# List of file formats to package.

View File

@ -112,6 +112,7 @@ let result = stdenv.mkDerivation rec {
meta = with lib; {
license = licenses.gpl2Classpath;
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ];

View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "fblanqui";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{case = range "8.12" "8.15"; out = "1.8.2"; }
{case = range "8.12" "8.16"; out = "1.8.2"; }
{case = range "8.10" "8.11"; out = "1.7.0"; }
{case = range "8.8" "8.9"; out = "1.6.0"; }
{case = range "8.6" "8.7"; out = "1.4.0"; }

View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
owner = "DeepSpec";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.15"; out = "4.0.0"; }
{ case = range "8.10" "8.16"; out = "4.0.0"; }
] null;
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
releaseRev = v: "${v}";

View File

@ -5,7 +5,7 @@ mkCoqDerivation {
pname = "LibHyps";
owner = "Matafou";
inherit version;
defaultVersion = if (versions.range "8.11" "8.15") coq.version then "2.0.4.1" else null;
defaultVersion = if (versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null;
release = {
"2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h";
};

View File

@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
owner = "QuickChick";
inherit version;
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
{ cases = [ (isGe "8.13") pred.true ]; out = "1.6.2"; }
{ cases = [ (range "8.13" "8.15") pred.true ]; out = "1.6.2"; }
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }

View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "uwplse";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.6" "8.15"; out = "20210328"; }
{ case = range "8.6" "8.16"; out = "20210328"; }
{ case = range "8.5" "8.13"; out = "20181102"; }
] null;
release."20210328".rev = "179bd5312e9d8b63fc3f4071c628cddfc496d741";

View File

@ -9,7 +9,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "1.7"; }
{ case = range "8.10" "8.15"; out = "1.7"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect ];

View File

@ -5,8 +5,8 @@ with lib; mkCoqDerivation {
repo = "bits";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "1.1.0"; }
{ case = isGe "8.7"; out = "1.0.0"; }
{ case = range "8.10" "8.15"; out = "1.1.0"; }
{ case = range "8.7" "8.15"; out = "1.0.0"; }
] null;
release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE=";

View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
owner = "coq-ext-lib";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.8" "8.15"; out = "0.11.6"; }
{ case = range "8.8" "8.16"; out = "0.11.6"; }
{ case = range "8.8" "8.14"; out = "0.11.4"; }
{ case = range "8.8" "8.13"; out = "0.11.3"; }
{ case = "8.7"; out = "0.9.7"; }

View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
owner = "tchajed";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.15"; out = "0.3.0"; }
{ case = range "8.10" "8.16"; out = "0.3.0"; }
] null;
release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z";
releaseRev = v: "v${v}";

View File

@ -6,7 +6,7 @@ with lib; mkCoqDerivation {
owner = "thery";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.12" "8.15"; out = "8.15"; }
{ case = range "8.12" "8.16"; out = "8.15"; }
{ case = range "8.10" "8.11"; out = "8.10"; }
{ case = range "8.8" "8.9"; out = "8.8"; }
{ case = "8.7"; out = "8.7.2"; }

View File

@ -7,7 +7,7 @@ with lib; mkCoqDerivation {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.8" ; out = "3.2.0"; }
{ case = range "8.8" "8.15"; out = "3.2.0"; }
{ case = range "8.8" "8.13"; out = "3.1.0"; }
{ case = range "8.5" "8.9"; out = "3.0.2"; }
] null;

View File

@ -10,7 +10,7 @@ with lib;
inherit version;
defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [
{ cases = [(isGe "8.11") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.15") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }
] null;

View File

@ -5,7 +5,7 @@ with lib; let hb = mkCoqDerivation {
owner = "math-comp";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.15"; out = "1.2.1"; }
{ case = isEq "8.15"; out = "1.2.1"; }
{ case = range "8.13" "8.14"; out = "1.2.0"; }
{ case = range "8.12" "8.13"; out = "1.1.0"; }
{ case = isEq "8.11"; out = "0.10.0"; }

View File

@ -7,7 +7,7 @@ mkCoqDerivation rec {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isGe "8.8"; out = "4.5.1"; }
{ case = range "8.8" "8.15"; out = "4.5.1"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; }

View File

@ -6,7 +6,7 @@ with lib; mkCoqDerivation rec {
owner = "iris";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.15"; out = "3.6.0"; }
{ case = range "8.13" "8.16"; out = "3.6.0"; }
{ case = range "8.12" "8.14"; out = "3.5.0"; }
{ case = range "8.11" "8.13"; out = "3.4.0"; }
{ case = range "8.9" "8.10"; out = "3.3.0"; }

View File

@ -4,7 +4,7 @@ with lib; mkCoqDerivation {
pname = "math-classes";
inherit version;
defaultVersion = if versions.range "8.6" "8.15" coq.coq-version then "8.15.0" else null;
defaultVersion = if versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null;
release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425";
release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby";
release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw";

View File

@ -19,7 +19,7 @@ let
owner = "math-comp";
withDoc = single && (args.withDoc or false);
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "1.14.0"; }
{ case = range "8.11" "8.15"; out = "1.14.0"; }
{ case = range "8.11" "8.15"; out = "1.13.0"; }
{ case = range "8.10" "8.13"; out = "1.12.0"; }
{ case = range "8.7" "8.12"; out = "1.11.0"; }

View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "plclub";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.14" "8.15"; out = "8.15"; }
{ case = range "8.14" "8.16"; out = "8.15"; }
{ case = range "8.10" "8.13"; out = "8.10"; }
] null;
releaseRev = v: "coq${v}";

View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "snu-sf";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.12" "8.15"; out = "4.1.2"; }
{ case = range "8.12" "8.16"; out = "4.1.2"; }
{ case = range "8.9" "8.13"; out = "4.1.1"; }
{ case = range "8.6" "8.13"; out = "4.0.2"; }
{ case = isEq "8.5"; out = "1.2.8"; }

View File

@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.version [
{ case = range "8.12" "8.15"; out = "0.1.1"; }
{ case = range "8.12" "8.16"; out = "0.1.1"; }
{ case = range "8.12" "8.13"; out = "0.1.0"; }
] null;
release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189";

View File

@ -16,7 +16,7 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.15"; out = "8.14.0"; }
{ case = range "8.10" "8.16"; out = "8.14.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }

View File

@ -6,7 +6,7 @@ with lib; mkCoqDerivation {
repo = "coq-simple-io";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.11" "8.15"; out = "1.7.0"; }
{ case = range "8.11" "8.16"; out = "1.7.0"; }
{ case = range "8.7" "8.13"; out = "1.3.0"; }
] null;
release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";

View File

@ -6,7 +6,7 @@ with lib; mkCoqDerivation rec {
domain = "gitlab.mpi-sws.org";
owner = "iris";
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.15"; out = "1.7.0"; }
{ case = range "8.13" "8.16"; out = "1.7.0"; }
{ case = range "8.12" "8.14"; out = "1.6.0"; }
{ case = range "8.11" "8.13"; out = "1.5.0"; }
{ case = range "8.8" "8.10"; out = "1.4.0"; }

View File

@ -6,7 +6,7 @@ with lib; (mkCoqDerivation {
inherit version;
displayVersion = { tlc = false; };
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.15"; out = "20211215"; }
{ case = range "8.13" "8.16"; out = "20211215"; }
{ case = range "8.12" "8.13"; out = "20210316"; }
{ case = range "8.10" "8.12"; out = "20200328"; }
{ case = range "8.6" "8.12"; out = "20181116"; }

View File

@ -10,7 +10,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch [ coq.version ] [
{ cases = [ (isGe "8.13") ]; out = "1.0"; }
{ cases = [ (range "8.13" "8.15") ]; out = "1.0"; }
] null;
propagatedBuildInputs = [ coq-elpi ];

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.1.1124";
version = "1.11.1.1129";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-QucUcLCzLPe/OpVyI8++Z+RFukNNRQ39imBaxZuH324=";
sha256 = "sha256-kib1gGN4krlvEuCGdAYV3ejaMXOIhJ7ZBaUO4ulc6SQ=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "kcolorpicker";
version = "0.1.6";
version = "0.2.0";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kColorPicker";
rev = "v${version}";
sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd";
sha256 = "sha256-ahmMj/yzQiRP9oJwDuhJGxe849kxNsoGFDZ2CGQNhKs=";
};
nativeBuildInputs = [ cmake ];

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "kimageannotator";
version = "0.5.3";
version = "0.6.0";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kImageAnnotator";
rev = "v${version}";
sha256 = "sha256-dkZa+OhU3w4dUy/Edd0R2UFNYuIdeYe3H1SOtW5ario=";
sha256 = "sha256-fWMaat5IguEZwoEJiEjGrWIbOqdJhs25qOebxpWVQQk=";
};
nativeBuildInputs = [ cmake qttools ];

View File

@ -1,4 +1,11 @@
{ lib, stdenv, fetchFromGitHub, libusb-compat-0_1, readline, cmake, pkg-config }:
{ lib
, stdenv
, fetchFromGitHub
, libusb-compat-0_1
, readline
, cmake
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "libnfc";
@ -11,16 +18,29 @@ stdenv.mkDerivation rec {
sha256 = "5gMv/HajPrUL/vkegEqHgN2d6Yzf01dTMrx4l34KMrQ=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libusb-compat-0_1 readline ];
nativeBuildInputs = [
cmake
pkg-config
];
configureFlags = [ "sysconfdir=/etc" ];
buildInputs = [
libusb-compat-0_1
readline
];
configureFlags = [
"sysconfdir=/etc"
];
cmakeFlags = lib.optionals stdenv.isDarwin [
"-DLIBNFC_DRIVER_PN532_I2C=OFF"
"-DLIBNFC_DRIVER_PN532_SPI=OFF"
];
meta = with lib; {
broken = stdenv.isDarwin;
description = "Open source library libnfc for Near Field Communication";
license = licenses.gpl3;
description = "Library for Near Field Communication (NFC)";
homepage = "https://github.com/nfc-tools/libnfc";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};

View File

@ -15,7 +15,7 @@ buildLuarocksPackage {
pname = "alt-getopt";
version = "0.8.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/alt-getopt-0.8.0-1.rockspec";
url = "mirror://luarocks/alt-getopt-0.8.0-1.rockspec";
sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -125,7 +125,7 @@ buildLuarocksPackage {
pname = "bit32";
version = "5.3.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/bit32-5.3.0-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/bit32-5.3.0-1.rockspec";
sha256 = "1d6xdihpksrj5a3yvsvnmf3vfk15hj6f8n1rrs65m7adh87hc0yd";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -159,7 +159,7 @@ buildLuarocksPackage {
pname = "busted";
version = "2.0.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/busted-2.0.0-1.rockspec";
url = "mirror://luarocks/busted-2.0.0-1.rockspec";
sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw";
}).outPath;
src = fetchurl {
@ -184,7 +184,7 @@ buildLuarocksPackage {
pname = "cassowary";
version = "2.3.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/cassowary-2.3.2-1.rockspec";
url = "mirror://luarocks/cassowary-2.3.2-1.rockspec";
sha256 = "0c6sflm8zpgbcdj47s3rd34h69h3nqcciaaqd1wdx5m0lwc3mii0";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -218,7 +218,7 @@ buildLuarocksPackage {
pname = "cldr";
version = "0.2.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/cldr-0.2.0-0.rockspec";
url = "mirror://luarocks/cldr-0.2.0-0.rockspec";
sha256 = "1vjwrlrdy10bacn0324fvs4sx85xryyg7npw2mp1k9kmasfr8r1s";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -252,7 +252,7 @@ buildLuarocksPackage {
pname = "compat53";
version = "0.7-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/compat53-0.7-1.rockspec";
url = "mirror://luarocks/compat53-0.7-1.rockspec";
sha256 = "1r7a3q1cjrcmdycrv2ikgl83irjhxs53sa88v2fdpr9aaamlb101";
}).outPath;
src = fetchurl {
@ -278,7 +278,7 @@ buildLuarocksPackage {
pname = "cosmo";
version = "16.06.04-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cosmo-16.06.04-1.rockspec";
url = "mirror://luarocks/cosmo-16.06.04-1.rockspec";
sha256 = "0ipv1hrlhvaz1myz6qxabq7b7kb3bz456cya3r292487a3g9h9pb";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -310,7 +310,7 @@ buildLuarocksPackage {
pname = "coxpcall";
version = "1.17.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/coxpcall-1.17.0-1.rockspec";
url = "mirror://luarocks/coxpcall-1.17.0-1.rockspec";
sha256 = "0mf0nggg4ajahy5y1q5zh2zx9rmgzw06572bxx6k8b736b8j7gca";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -341,7 +341,7 @@ buildLuarocksPackage {
pname = "cqueues";
version = "20200726.52-0";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cqueues-20200726.52-0.rockspec";
url = "mirror://luarocks/cqueues-20200726.52-0.rockspec";
sha256 = "0w2kq9w0wda56k02rjmvmzccz6bc3mn70s9v7npjadh85i5zlhhp";
}).outPath;
src = fetchurl {
@ -399,10 +399,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/astoff/digestif",
"rev": "505ca88a54012be5534654238baaa457f8446fed",
"date": "2021-10-06T21:27:45+02:00",
"path": "/nix/store/6wvpy0nsr5yf78by3dg8m2m0h0kf9xk4-digestif",
"sha256": "1prv5nqskvilyyx3z9b2jiz72lwpz2xcas57qjpbv6qq5l2si1xm",
"rev": "1fac471a153b99da7f858e63edfa19ec2afee791",
"date": "2022-03-13T17:25:22+01:00",
"path": "/nix/store/4fxlwjvv07gbdi094abl59h8j5ly4ghm-digestif",
"sha256": "1mlmn3v97il5jsl28hjjgvm0dix5r6rsrdzavq25pbv0c46b3zzf",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -425,14 +425,14 @@ dkjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "dkjson";
version = "2.5-3";
version = "2.6-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/dkjson-2.5-3.rockspec";
sha256 = "18xngdzl2q207cil64aj81qi6qvj1g269pf07j5x4pbvamd6a1l3";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/dkjson-2.6-1.rockspec";
sha256 = "1hhmgz2nixqg23shfnl0kq6wxdadx36z6hhsrz33g7idbm6rbwm1";
}).outPath;
src = fetchurl {
url = "http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5";
sha256 = "14wanday1l7wj2lnpabbxw8rcsa0zbvcdi1w88rdr5gbsq3xwasm";
url = "http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.6.tar.gz?uuid=release_2_6";
sha256 = "0wwpdz20fvg5j36902892mnb99craf22697r6v7xdblqnd7fw1xx";
};
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
@ -452,7 +452,7 @@ buildLuarocksPackage {
pname = "fifo";
version = "0.2-0";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/fifo-0.2-0.rockspec";
url = "mirror://luarocks/fifo-0.2-0.rockspec";
sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq";
}).outPath;
src = fetchurl {
@ -476,7 +476,7 @@ buildLuarocksPackage {
pname = "fluent";
version = "0.2.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/fluent-0.2.0-0.rockspec";
url = "mirror://luarocks/fluent-0.2.0-0.rockspec";
sha256 = "1x3nk8xdf923rvdijr0jx8v6w3wxxfch7ri3kxca0pw80b5bc2fa";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -504,7 +504,7 @@ buildLuarocksPackage {
}) {};
gitsigns-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua, plenary-nvim
, fetchgit, lua
}:
buildLuarocksPackage {
pname = "gitsigns.nvim";
@ -512,10 +512,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lewis6991/gitsigns.nvim",
"rev": "5eb87a0b05914d3763277ebe257bd5bafcdde8cd",
"date": "2021-12-06T18:02:22+00:00",
"path": "/nix/store/c5l5bz7m5f48l57p4yrpxfhqga0cxsny-gitsigns.nvim",
"sha256": "02cmgc3fgrwx6v6ylzqxdwgk9jsmd8j2q6fdnfbllg3zjwx3agcd",
"rev": "27aeb2e715c32cbb99aa0b326b31739464b61644",
"date": "2022-05-26T12:55:53+01:00",
"path": "/nix/store/bfz0bk523dk4dciiknrzvp87yvnbgcb2-gitsigns.nvim",
"sha256": "04m1767cndrx46xsa6frf77xv64hmr6w21dk2wh4s0sqjvqqm1r6",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -524,7 +524,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaversion != "5.1");
propagatedBuildInputs = [ lua plenary-nvim ];
propagatedBuildInputs = [ lua ];
meta = {
homepage = "http://github.com/lewis6991/gitsigns.nvim";
@ -540,7 +540,7 @@ buildLuarocksPackage {
pname = "http";
version = "0.3-0";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/http-0.3-0.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/http-0.3-0.rockspec";
sha256 = "0fn3irkf5nnmfc83alc40b316hs8l7zdq2xlaiaa65sjd8acfvia";
}).outPath;
src = fetchurl {
@ -564,14 +564,14 @@ inspect = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "inspect";
version = "3.1.2-0";
version = "3.1.3-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/inspect-3.1.2-0.rockspec";
sha256 = "13jbv3rhj4mv2farrxns88g7j34ljag7vz0kma0fm2pzdz3686vx";
url = "mirror://luarocks/inspect-3.1.3-0.rockspec";
sha256 = "1iivb2jmz0pacmac2msyqwvjjx8q6py4h959m8fkigia6srg5ins";
}).outPath;
src = fetchurl {
url = "https://github.com/kikito/inspect.lua/archive/v3.1.2.tar.gz";
sha256 = "08ln4p5bmvcs8wj8hzs4ny66m63abyxjkmcxhjji5ay99g85cn3b";
url = "https://github.com/kikito/inspect.lua/archive/v3.1.3.tar.gz";
sha256 = "1sqylz5hmj5sbv4gi9988j6av3cb5lwkd7wiyim1h5lr7xhnlf23";
};
disabled = with lua; (luaOlder "5.1");
@ -626,10 +626,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/stevedonovan/LDoc.git",
"rev": "bbd498ab39fa49318b36378430d3cdab571f8ba0",
"date": "2021-06-24T13:07:51+02:00",
"path": "/nix/store/pzk1qi4fdviz2pq5bg3q91jmrg8wziqx-LDoc",
"sha256": "05wd5m5v3gv777kgikj46216slxyf1zdbzl4idara9lcfw3mfyyw",
"rev": "e97398356b27473e5ba0626427daaec54f407e22",
"date": "2022-01-17T13:53:47+03:00",
"path": "/nix/store/6s0dmcz2jgjhjhakr5miq8ffgkchd0wh-LDoc",
"sha256": "13k4vi12s37izsjqcnfcliwlizr1ic0vwb0zlxcsghi31k031him",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -673,7 +673,7 @@ buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/pavouk/lgi";
homepage = "http://github.com/pavouk/lgi";
description = "Lua bindings to GObject libraries";
license.fullName = "MIT/X11";
};
@ -708,7 +708,7 @@ buildLuarocksPackage {
pname = "ljsyscall";
version = "0.12-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/ljsyscall-0.12-1.rockspec";
url = "mirror://luarocks/ljsyscall-0.12-1.rockspec";
sha256 = "0zna5s852vn7q414z56kkyqwpighaghyq7h7in3myap4d9vcgm01";
}).outPath;
src = fetchurl {
@ -734,7 +734,7 @@ buildLuarocksPackage {
pname = "lmathx";
version = "20150624-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lmathx-20150624-1.rockspec";
url = "mirror://luarocks/lmathx-20150624-1.rockspec";
sha256 = "181wzsj1mxjyia43y8zwaydxahnl7a70qzcgc8jhhgic7jyi9pgv";
}).outPath;
src = fetchurl {
@ -759,7 +759,7 @@ buildLuarocksPackage {
pname = "lmpfrlib";
version = "20170112-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lmpfrlib-20170112-2.rockspec";
url = "mirror://luarocks/lmpfrlib-20170112-2.rockspec";
sha256 = "1x7qiwmk5b9fi87fn7yvivdsis8h9fk9r3ipqiry5ahx72vzdm7d";
}).outPath;
src = fetchurl {
@ -785,7 +785,7 @@ buildLuarocksPackage {
pname = "loadkit";
version = "1.1.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/loadkit-1.1.0-1.rockspec";
url = "mirror://luarocks/loadkit-1.1.0-1.rockspec";
sha256 = "08fx0xh90r2zvjlfjkyrnw2p95xk1a0qgvlnq4siwdb2mm6fq12l";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -819,7 +819,7 @@ buildLuarocksPackage {
pname = "lpeg";
version = "1.0.2-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lpeg-1.0.2-1.rockspec";
url = "mirror://luarocks/lpeg-1.0.2-1.rockspec";
sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89";
}).outPath;
src = fetchurl {
@ -845,7 +845,7 @@ buildLuarocksPackage {
pname = "lpeg_patterns";
version = "0.5-0";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lpeg_patterns-0.5-0.rockspec";
url = "mirror://luarocks/lpeg_patterns-0.5-0.rockspec";
sha256 = "1vzl3ryryc624mchclzsfl3hsrprb9q214zbi1xsjcc4ckq5qfh7";
}).outPath;
src = fetchurl {
@ -869,7 +869,7 @@ buildLuarocksPackage {
pname = "lpeglabel";
version = "1.6.0-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lpeglabel-1.6.0-1.rockspec";
url = "mirror://luarocks/lpeglabel-1.6.0-1.rockspec";
sha256 = "13gc32pggng6f95xx5zw9n9ian518wlgb26mna9kh4q2xa1k42pm";
}).outPath;
src = fetchurl {
@ -894,7 +894,7 @@ buildLuarocksPackage {
pname = "lpty";
version = "1.2.2-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.rockspec";
url = "mirror://luarocks/lpty-1.2.2-1.rockspec";
sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg";
}).outPath;
src = fetchurl {
@ -919,7 +919,7 @@ buildLuarocksPackage {
pname = "lrexlib-gnu";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lrexlib-gnu-2.9.1-1.rockspec";
url = "mirror://luarocks/lrexlib-gnu-2.9.1-1.rockspec";
sha256 = "1jfjxh26iwsavipkwmscwv52l77qxzvibfmlvpskcpawyii7xcw8";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -952,7 +952,7 @@ buildLuarocksPackage {
pname = "lrexlib-pcre";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luafr.org/luarocks/lrexlib-pcre-2.9.1-1.rockspec";
url = "mirror://luarocks/lrexlib-pcre-2.9.1-1.rockspec";
sha256 = "036k27xaplxn128b3p67xiqm8k40s7bxvh87wc8v2cx1cc4b9ia4";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -986,7 +986,7 @@ buildLuarocksPackage {
pname = "lrexlib-posix";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lrexlib-posix-2.9.1-1.rockspec";
url = "mirror://luarocks/lrexlib-posix-2.9.1-1.rockspec";
sha256 = "1zxrx9yifm9ry4wbjgv86rlvq3ff6qivldvib3ha4767azla0j0r";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1019,7 +1019,7 @@ buildLuarocksPackage {
pname = "lua-cjson";
version = "2.1.0.6-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-cjson-2.1.0.6-1.rockspec";
url = "mirror://luarocks/lua-cjson-2.1.0.6-1.rockspec";
sha256 = "1x6dk17lwmgkafpki99yl1hlypchbrxr9sxqafrmx7wwvzbz6q11";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1052,7 +1052,7 @@ buildLuarocksPackage {
pname = "lua-cmsgpack";
version = "0.4.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec";
url = "mirror://luarocks/lua-cmsgpack-0.4.0-0.rockspec";
sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1085,7 +1085,7 @@ buildLuarocksPackage {
pname = "lua-iconv";
version = "7-3";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-iconv-7-3.rockspec";
url = "mirror://luarocks/lua-iconv-7-3.rockspec";
sha256 = "0qh5vsaxd7s31p7a8rl08lwd6zv90wnvp15nll4fcz452kffpp72";
}).outPath;
src = fetchurl {
@ -1110,7 +1110,7 @@ buildLuarocksPackage {
pname = "lua-lsp";
version = "0.1.0-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-lsp-0.1.0-2.rockspec";
url = "mirror://luarocks/lua-lsp-0.1.0-2.rockspec";
sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1143,7 +1143,7 @@ buildLuarocksPackage {
pname = "lua-messagepack";
version = "0.5.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-messagepack-0.5.2-1.rockspec";
url = "mirror://luarocks/lua-messagepack-0.5.2-1.rockspec";
sha256 = "15liz6v8hsqgb3xrcd74a71nnjcz79gpc3ak351hk6k4gyjq2rfc";
}).outPath;
src = fetchurl {
@ -1166,17 +1166,17 @@ lua-resty-http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-resty-http";
version = "0.16.1-0";
version = "0.17.0.beta.1-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-http-0.16.1-0.rockspec";
sha256 = "1475zncd9zvnrblc3r60cwf49c7v0w3khqmi6wqrc5k331m0wm8w";
url = "mirror://luarocks/lua-resty-http-0.17.0.beta.1-0.rockspec";
sha256 = "1cjl007k43cyrwvj0p58hvp00q4lnd9rq3v3pcvwi5an2pvxnv80";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/ledgetech/lua-resty-http",
"rev": "9bf951dfe162dd9710a0e1f4525738d4902e9d20",
"date": "2021-04-09T17:11:35+01:00",
"path": "/nix/store/zzd1xj4r0iy3srs2hgv4mlm6wflmk24x-lua-resty-http",
"sha256": "1whwn2fwm8c9jda4z1sb5636sfy4pfgjdxw0grcgmf6451xi57nw",
"rev": "8cb73c4cc2118f0c62d9132e3b3b14aa36192e34",
"date": "2022-02-11T16:44:50+00:00",
"path": "/nix/store/29kr6whllphz0nla5nh1f8q30dgp9vnz-lua-resty-http",
"sha256": "0y253dnnx59a5c1nbkcv1p5kq7kdsd5i094i7wzpg5ar6xwvqhjb",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1201,7 +1201,7 @@ buildLuarocksPackage {
pname = "lua-resty-jwt";
version = "0.2.3-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-jwt-0.2.3-0.rockspec";
url = "mirror://luarocks/lua-resty-jwt-0.2.3-0.rockspec";
sha256 = "1fxdwfr4pna3fdfm85kin97n53caq73h807wjb59wpqiynbqzc8c";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1232,17 +1232,17 @@ lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-resty-openidc";
version = "1.7.4-1";
version = "1.7.5-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-openidc-1.7.4-1.rockspec";
sha256 = "12r03pzx1lpaxzy71iqh0kf1zs6gx1k89vpxc5va9r7nr47a56vy";
url = "mirror://luarocks/lua-resty-openidc-1.7.5-1.rockspec";
sha256 = "14z69c0v35hmhlqvg7kndagpqxa4j7i3cgkm0iyfradqlvgamab4";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/zmartzone/lua-resty-openidc",
"rev": "0c75741b41bc9a8b5dbe0b27f81a2851a6c68b60",
"date": "2020-11-17T17:42:16+01:00",
"path": "/nix/store/240kss5xx1br5n3qz6djw21cs1fj4pfg-lua-resty-openidc",
"sha256": "1gw71av1r0c6v4f1h0bj0l6way2hmipic6wmipnavr17bz7m1q7z",
"rev": "85e30a13e08156ef3d782ecf7236758334234c6c",
"date": "2021-12-21T16:23:45+01:00",
"path": "/nix/store/yr827kcbbrvxpymny5sa43sb1wf0vzqj-lua-resty-openidc",
"sha256": "111mnnl639mnyig105zp5bfynjsdnvs201wpg68zd218bh5f362l",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1264,17 +1264,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit}:
buildLuarocksPackage {
pname = "lua-resty-openssl";
version = "0.8.2-1";
version = "0.8.8-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-openssl-0.8.2-1.rockspec";
sha256 = "1dxaxh3l4vhrv5p2pwphl7jn7jpcjq3dmawfl9wbp3a88121gbsx";
url = "mirror://luarocks/lua-resty-openssl-0.8.8-1.rockspec";
sha256 = "17arjjhrxs3sas6d65ffh8nmvb220vrhwiwac3qam42im7zc8544";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/fffonion/lua-resty-openssl.git",
"rev": "53e2d4ba7e8c31181c1fd71d3817911da0533675",
"date": "2021-11-22T12:07:07+08:00",
"path": "/nix/store/x7s51wf9ysxs2xs4adixf7ypmadfwp5c-lua-resty-openssl",
"sha256": "19cvqz81d0lxql55pgsbgynval0jxh8sicps94nzapvj90xqjviy",
"rev": "7aad15a46bf9f5b81809be53f86ebbdb20ee2e8d",
"date": "2022-04-14T19:05:18+08:00",
"path": "/nix/store/3a8qz63k5xmkx44djm3prwhmig8wmjnf-lua-resty-openssl",
"sha256": "07h1sbfp9l04hr8h6zfgbhs9ray26gr3pa149733wzbdxfkl3bcz",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1295,17 +1295,17 @@ lua-resty-session = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-resty-session";
version = "3.8-1";
version = "3.10-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-session-3.8-1.rockspec";
sha256 = "0pz86bshawysmsnfc5q1yh13gr1458j2nh8r93a4rrmk1wggc4ka";
url = "mirror://luarocks/lua-resty-session-3.10-1.rockspec";
sha256 = "1a939ndnyqdn633dxv9nsfkgj59ig71822syx9qk0ai3v6426mw3";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/bungle/lua-resty-session.git",
"rev": "2cd1f8484fdd429505ac33abf7a44adda1f367bf",
"date": "2021-01-04T14:02:41+02:00",
"path": "/nix/store/jqc8arr46mx1xbmrsw503zza1kmz7mcv-lua-resty-session",
"sha256": "09q8xbxkr431i2k21vdyx740rv325v0zmnx0qa3q9x15kcfsd2fm",
"rev": "e6bf2630c90df7b3db35e859f0aa7e096af3e918",
"date": "2022-01-14T20:16:34+02:00",
"path": "/nix/store/76fxliqmhghj6r5qg5q2r59n6nzapra5-lua-resty-session",
"sha256": "1lx0pbb5swyl0fhxycqx0fs3r158rczb78fav02wlz43yc3nbfax",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1329,7 +1329,7 @@ buildLuarocksPackage {
pname = "lua-term";
version = "0.7-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-term-0.7-1.rockspec";
url = "mirror://luarocks/lua-term-0.7-1.rockspec";
sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2";
}).outPath;
src = fetchurl {
@ -1352,7 +1352,7 @@ buildLuarocksPackage {
pname = "lua-toml";
version = "2.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-toml-2.0-1.rockspec";
url = "mirror://luarocks/lua-toml-2.0-1.rockspec";
sha256 = "0zd3hrj1ifq89rjby3yn9y96vk20ablljvqdap981navzlbb7zvq";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1385,7 +1385,7 @@ buildLuarocksPackage {
pname = "lua-yajl";
version = "2.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-yajl-2.0-1.rockspec";
url = "mirror://luarocks/lua-yajl-2.0-1.rockspec";
sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1417,10 +1417,10 @@ lua-zlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-zlib";
version = "1.2-1";
version = "1.2-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-zlib-1.2-1.rockspec";
sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w";
url = "mirror://luarocks/lua-zlib-1.2-2.rockspec";
sha256 = "1ycjy59w6rkhasqqbiyra0f1sj87fswcz25zwxy4gyv7rrwy5hxd";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/brimworks/lua-zlib.git",
@ -1435,7 +1435,7 @@ buildLuarocksPackage {
}
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
@ -1503,17 +1503,17 @@ luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luacheck";
version = "0.25.0-1";
version = "0.26.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luacheck-0.25.0-1.rockspec";
sha256 = "11mvbpnykibg0dx9sdh5x9gpvrhkmvrw76qvjz337x83f8gmvy91";
url = "mirror://luarocks/luacheck-0.26.1-1.rockspec";
sha256 = "11r5g6xi1s2d7cpmz2fysfgi78wpszy58rxfkwikqpi6kyc8qmf5";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/luarocks/luacheck.git",
"rev": "abf7386a892df4ce566fef9e4640ddbf9af78411",
"date": "2021-08-10T12:19:20-03:00",
"path": "/nix/store/9cdlf6c3y0087qwh48ky8ysxxx3lirlj-luacheck",
"sha256": "1ymfkr0qmg6idrrxf9x6mfq14skag8h09kl2qlalwiykicrdljs1",
"url": "https://github.com/lunarmodules/luacheck.git",
"rev": "2445a9dd3859655646bd6eb848459f2b46b4a3e3",
"date": "2022-04-23T17:22:03+03:00",
"path": "/nix/store/7a8qrmy41bnn1wgs93b5gi48k30v5bfj-luacheck",
"sha256": "0zrcni7p0bpqmb383608kmfyxwfxs9qa42g3sb4lhvzg2zggri5q",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1525,7 +1525,7 @@ buildLuarocksPackage {
propagatedBuildInputs = [ lua argparse luafilesystem ];
meta = {
homepage = "https://github.com/luarocks/luacheck";
homepage = "https://github.com/lunarmodules/luacheck";
description = "A static analyzer and a linter for Lua";
license.fullName = "MIT";
};
@ -1538,7 +1538,7 @@ buildLuarocksPackage {
pname = "luacov";
version = "0.15.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luacov-0.15.0-1.rockspec";
url = "mirror://luarocks/luacov-0.15.0-1.rockspec";
sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1571,7 +1571,7 @@ buildLuarocksPackage {
pname = "luadbi";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-0.7.2-1.rockspec";
url = "mirror://luarocks/luadbi-0.7.2-1.rockspec";
sha256 = "0lj1qki20w6bl76cvlcazlmwh170b9wkv5nwlxbrr3cn6w7h370b";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1604,7 +1604,7 @@ buildLuarocksPackage {
pname = "luadbi-mysql";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-mysql-0.7.2-1.rockspec";
url = "mirror://luarocks/luadbi-mysql-0.7.2-1.rockspec";
sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1637,7 +1637,7 @@ buildLuarocksPackage {
pname = "luadbi-postgresql";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.rockspec";
url = "mirror://luarocks/luadbi-postgresql-0.7.2-1.rockspec";
sha256 = "07rx4agw4hjyzf8157apdwfqh9s26nqndmkr3wm7v09ygjvdjiix";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1670,7 +1670,7 @@ buildLuarocksPackage {
pname = "luadbi-sqlite3";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.rockspec";
url = "mirror://luarocks/luadbi-sqlite3-0.7.2-1.rockspec";
sha256 = "022iba0jbiafz8iv1h0iv95rhcivbfq5yg341nxk3dm87yf220vh";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1703,7 +1703,7 @@ buildLuarocksPackage {
pname = "luaepnf";
version = "0.3-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaepnf-0.3-2.rockspec";
url = "mirror://luarocks/luaepnf-0.3-2.rockspec";
sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1736,7 +1736,7 @@ buildLuarocksPackage {
pname = "luaevent";
version = "0.4.6-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaevent-0.4.6-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaevent-0.4.6-1.rockspec";
sha256 = "03zixadhx4a7nh67n0sm6sy97c8i9va1a78hibhrl7cfbqc2zc7f";
}).outPath;
src = fetchurl {
@ -1761,7 +1761,7 @@ buildLuarocksPackage {
pname = "luaexpat";
version = "1.4.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaexpat-1.4.1-1.rockspec";
url = "mirror://luarocks/luaexpat-1.4.1-1.rockspec";
sha256 = "1abwd385x7wnza7qqz5s4aj6m2l1c23pjmbgnpq73q0s17pn1h0c";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1828,7 +1828,7 @@ buildLuarocksPackage {
pname = "luafilesystem";
version = "1.7.0-2";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.rockspec";
url = "mirror://luarocks/luafilesystem-1.7.0-2.rockspec";
sha256 = "0xivgn8bbkx1g5a30jrjcv4hg5mpiiyrm3fhlz9lndgbh4cnjrq6";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1862,7 +1862,7 @@ buildLuarocksPackage {
pname = "lualogging";
version = "1.6.0-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lualogging-1.6.0-2.rockspec";
url = "mirror://luarocks/lualogging-1.6.0-2.rockspec";
sha256 = "1235sfss0gmcw744rnhzfffhd1z732g2b2vsbpbz9kcvvhznmamb";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1894,7 +1894,7 @@ buildLuarocksPackage {
pname = "luaossl";
version = "20200709-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaossl-20200709-0.rockspec";
url = "mirror://luarocks/luaossl-20200709-0.rockspec";
sha256 = "0izxxrzc49q4jancza43b2y4hfvasflpcag771nrhapk1n8k45f3";
}).outPath;
src = fetchurl {
@ -1918,7 +1918,7 @@ buildLuarocksPackage {
pname = "luaposix";
version = "34.1.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaposix-34.1.1-1.rockspec";
url = "mirror://luarocks/luaposix-34.1.1-1.rockspec";
sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz";
}).outPath;
src = fetchurl {
@ -1942,14 +1942,14 @@ luarepl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luarepl";
version = "0.9-1";
version = "0.10-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luarepl-0.9-1.rockspec";
sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z";
url = "mirror://luarocks/luarepl-0.10-1.rockspec";
sha256 = "12zdljfs4wg55mj7a38iwg7p5i1pmc934v9qlpi61sw4brp6x8d3";
}).outPath;
src = fetchurl {
url = "https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz";
sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w";
url = "https://github.com/hoelzro/lua-repl/archive/0.10.tar.gz";
sha256 = "0wv37h9w6y5pgr39m7yxbf8imkwvaila6rnwjcp0xsxl5c1rzfjm";
};
disabled = with lua; (luaOlder "5.1");
@ -1967,17 +1967,17 @@ luasec = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luasec";
version = "1.0.2-1";
version = "1.1.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luasec-1.0.2-1.rockspec";
sha256 = "02qkbfnvn3943zf2fnz3amnz1z05ipx9mnsn3i2rmpjpvvd414dg";
url = "mirror://luarocks/luasec-1.1.0-1.rockspec";
sha256 = "1j080wx40cfxfmb42w6jf06yp2wqfnlf281lda6i7lwh4rh2800m";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/brunoos/luasec",
"rev": "ef14b27a2c8e541cac071165048250e85a7216df",
"date": "2021-08-14T10:28:09-03:00",
"path": "/nix/store/jk2npg54asnmj5fnpldn8dxym9gx8x4g-luasec",
"sha256": "14hx72qw3gjgz12v5bwpz3irgbf69f8584z8y7lglccbyydp4jla",
"rev": "df27c62f4cea33cb3525fed2a4b280997ed11aad",
"date": "2022-04-13T10:46:36-03:00",
"path": "/nix/store/h9bxbfm36ab2z314lpny78jympq9cxli-luasec",
"sha256": "04zch1ims50phgzqnbpxdfnxyrr9kpb8wi5bm9hhsizrzsx637is",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1997,25 +1997,33 @@ buildLuarocksPackage {
}) {};
luasocket = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchurl, lua
, fetchgit, lua
}:
buildLuarocksPackage {
pname = "luasocket";
version = "3.0rc1-2";
version = "3.0.0-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.rockspec";
sha256 = "17fbkihp4zypv5wwgxz8dnghj37pf5bhpi2llg4gbljp1bl2f42c";
url = "mirror://luarocks/luasocket-3.0.0-1.rockspec";
sha256 = "00j6jss7ifrqsylh1k9254i715z17j99hhawhlkmha1y6wn4glam";
}).outPath;
src = fetchurl {
url = "https://github.com/diegonehab/luasocket/archive/v3.0-rc1.zip";
sha256 = "0x0fg07cg08ybgkpzif7zmzaaq5ga979rxwd9rj95kfws9bbrl0y";
};
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/luasocket.git",
"rev": "88c8a85cb6528232288ec590910b7a966aace52b",
"date": "2022-03-25T11:05:48+03:00",
"path": "/nix/store/vn80kf268mjilsnm7850ag4zhan5na2c-luasocket",
"sha256": "0263gmxdpb2snv9yrwqsg3q641a9gm6migqsmi871hrhxaq0l9c1",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "http://luaforge.net/projects/luasocket/";
homepage = "https://github.com/lunarmodules/luasocket";
description = "Network support for the Lua language";
license.fullName = "MIT";
};
@ -2028,15 +2036,15 @@ buildLuarocksPackage {
pname = "luasql-sqlite3";
version = "2.6.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luasql-sqlite3-2.6.0-1.rockspec";
url = "mirror://luarocks/luasql-sqlite3-2.6.0-1.rockspec";
sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/keplerproject/luasql.git",
"rev": "ce22164f63783afac9c644fd37c231e56fc097cb",
"date": "2021-10-14T09:38:24-03:00",
"path": "/nix/store/h8r8axcc76x7y6gwc2jzsmr7h2lqgbxa-luasql",
"sha256": "10gq3x7vqkafvfk9fs4039rl1xhnqpl2v60z4qpd96wbcy205gnk",
"rev": "fb70ea47433a66f9b72811cd046dd7d7418a0e89",
"date": "2022-05-29T22:25:54-03:00",
"path": "/nix/store/zkir0i3j5jxb704bi5cnn2i51niabl7c-luasql",
"sha256": "1gnp1892v0g5kzsfrg3l3ykhq81nfv11mhb0djhgrjqx7zaxi24l",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2062,7 +2070,7 @@ buildLuarocksPackage {
pname = "luassert";
version = "1.8.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luassert-1.8.0-0.rockspec";
url = "mirror://luarocks/luassert-1.8.0-0.rockspec";
sha256 = "1194y81nlkq4qmrrgl7z82i6vgvhqvp1p673kq0arjix8mv3zyz1";
}).outPath;
src = fetchurl {
@ -2087,7 +2095,7 @@ buildLuarocksPackage {
pname = "luasystem";
version = "0.2.1-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luasystem-0.2.1-0.rockspec";
url = "mirror://luarocks/luasystem-0.2.1-0.rockspec";
sha256 = "0xj5q7lzsbmlw5d3zbjqf3jpj78wcn348h2jcxn5ph4n4hx73z3n";
}).outPath;
src = fetchurl {
@ -2112,7 +2120,7 @@ buildLuarocksPackage {
pname = "luaunbound";
version = "1.0.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luaunbound-1.0.0-1.rockspec";
url = "mirror://luarocks/luaunbound-1.0.0-1.rockspec";
sha256 = "1zlkibdwrj5p97nhs33cz8xx0323z3kiq5x7v0h3i7v6j0h8ppvn";
}).outPath;
src = fetchurl {
@ -2137,7 +2145,7 @@ buildLuarocksPackage {
pname = "luautf8";
version = "0.1.3-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luautf8-0.1.3-1.rockspec";
url = "mirror://luarocks/luautf8-0.1.3-1.rockspec";
sha256 = "16i9wfgd0f299g1afgjp0hhczlrk5g8i0kq3ka0f8bwj3mp2wmcp";
}).outPath;
src = fetchurl {
@ -2163,7 +2171,7 @@ buildLuarocksPackage {
pname = "luazip";
version = "1.2.7-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luazip-1.2.7-1.rockspec";
url = "mirror://luarocks/luazip-1.2.7-1.rockspec";
sha256 = "1wxy3p2ksaq4s8lg925mi9cvbh875gsapgkzm323dr8qaxxg7mba";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -2196,7 +2204,7 @@ buildLuarocksPackage {
pname = "luuid";
version = "20120509-2";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luuid-20120509-2.rockspec";
url = "mirror://luarocks/luuid-20120509-2.rockspec";
sha256 = "1q2fv25wfbiqn49mqv26gs4pyllch311akcf7jjn27l5ik8ji5b6";
}).outPath;
src = fetchurl {
@ -2214,29 +2222,20 @@ buildLuarocksPackage {
};
}) {};
luv = callPackage ({ buildLuarocksPackage, luaOlder, luaAtLeast
luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, cmake, fetchurl, lua
}:
buildLuarocksPackage {
pname = "luv";
version = "1.43.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luv-1.43.0-0.rockspec";
url = "mirror://luarocks/luv-1.43.0-0.rockspec";
sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/luvit/luv.git",
"rev": "1.43.0-0",
"date": "2022-03-12T16:05:50+08:00",
"path": "/nix/store/d7f3sdw5l0cm8xkjdm4m6jkmx794w48j-luv",
"sha256": "sha256-CcUX69XzgWlJEwHUhhtqs9sDA5TNIusKek5yV2Nt3Wc=",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
src = fetchurl {
url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz";
sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn";
};
disabled = with lua; (luaOlder "5.1");
nativeBuildInputs = [ cmake ];
@ -2256,7 +2255,7 @@ buildLuarocksPackage {
pname = "lyaml";
version = "6.2.7-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lyaml-6.2.7-1.rockspec";
url = "mirror://luarocks/lyaml-6.2.7-1.rockspec";
sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja";
}).outPath;
src = fetchurl {
@ -2282,7 +2281,7 @@ buildLuarocksPackage {
pname = "markdown";
version = "0.33-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/markdown-0.33-1.rockspec";
url = "mirror://luarocks/markdown-0.33-1.rockspec";
sha256 = "02sixijfi6av8h59kx3ngrhygjn2sx1c85c0qfy20gxiz72wi1pl";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -2315,7 +2314,7 @@ buildLuarocksPackage {
pname = "mediator_lua";
version = "1.1.2-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/mediator_lua-1.1.2-0.rockspec";
url = "mirror://luarocks/mediator_lua-1.1.2-0.rockspec";
sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm";
}).outPath;
src = fetchurl {
@ -2370,7 +2369,7 @@ buildLuarocksPackage {
pname = "mpack";
version = "1.0.9-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/mpack-1.0.9-0.rockspec";
url = "mirror://luarocks/mpack-1.0.9-0.rockspec";
sha256 = "1v10kmw3qw559bbm142z40ib26bwvcyi64qjrk0vf8v6n1mx8wcn";
}).outPath;
src = fetchurl {
@ -2391,11 +2390,11 @@ nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "nvim-client";
version = "0.2.2-1";
version = "0.2.3-1";
src = fetchurl {
url = "https://github.com/neovim/lua-client/archive/0.2.2-1.tar.gz";
sha256 = "1h736im524lq0vwlpihv9b317jarpkf3j13a25xl5qq8y8asm8mr";
url = "https://github.com/neovim/lua-client/archive/0.2.3-1.tar.gz";
sha256 = "0w6rc7b9gmz17x4l1q2nv275bkzwvg3pfg5mzsd4wymy2iwrqphf";
};
disabled = with lua; (luaOlder "5.1");
@ -2417,10 +2416,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/penlight.git",
"rev": "0653cdb05591454a9804a7fee8c873b8f06b0b8f",
"date": "2021-08-31T23:42:29+02:00",
"path": "/nix/store/zf3k6z36bxsrbxkkmsa4w6m7vxvlpfgn-penlight",
"sha256": "0l1819dyr9hzmimnjjg99fad6k3ksmlm77hgvdybgz8558lj4g1i",
"rev": "a7b9f888cd72dfa875e3b7cc3b88be632f567d79",
"date": "2022-03-24T13:21:29+01:00",
"path": "/nix/store/vk0z1hx9rwl45g3nn0f6c4m6mx8d9p65-penlight",
"sha256": "0w5w13gdbbnli23zmixy20jq6z3j5p6z3br3abpl5qh36b01i5p4",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2448,10 +2447,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/nvim-lua/plenary.nvim",
"rev": "c2bb2d8fd5b44bfc6aad3a5463c84576a98dd4a9",
"date": "2021-12-06T21:11:29+01:00",
"path": "/nix/store/h376md0lpbv31n5wyrq0cilkpx2lkr18-plenary.nvim",
"sha256": "12csjz882yv9wwhzx964fq210655m8820491xjsrjlwccfc09i35",
"rev": "54b2e3d58f567983feabaeb9408eccf6b7f32206",
"date": "2022-06-01T15:32:39+02:00",
"path": "/nix/store/j29rrzs7dsm6720rsjmzk7r1a27zv7h1-plenary.nvim",
"sha256": "1ldjdc7yq4awlllr9dcv8fnkcwgdpvj0py5mhvx3v1yjniwrkn2i",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2470,7 +2469,7 @@ buildLuarocksPackage {
}) {};
rapidjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua
, cmake, fetchgit, lua
}:
buildLuarocksPackage {
pname = "rapidjson";
@ -2490,6 +2489,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ lua ];
meta = {
@ -2504,14 +2504,14 @@ readline = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "readline";
version = "3.0-0";
version = "3.1-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/readline-3.0-0.rockspec";
sha256 = "1bjj8yn61vc0fzy1lvrfp6cyakj4bf2255xcqai4h3rcg0i5cmpr";
url = "mirror://luarocks/readline-3.1-0.rockspec";
sha256 = "0bl5hsplnlg8fx3v83sz48y2p1rlxfig3iycnk1pn3xi724kscnc";
}).outPath;
src = fetchurl {
url = "http://www.pjb.com.au/comp/lua/readline-3.0.tar.gz";
sha256 = "1rr2b7q8w3i4bm1i634sd6kzhw6v1fpnh53mj09af6xdq1rfhr5n";
url = "http://www.pjb.com.au/comp/lua/readline-3.1.tar.gz";
sha256 = "0i02jsywj9mb4lwiyp742xgz53i9z5xzpx34lh54hcd6q3xkcrw2";
};
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
@ -2555,10 +2555,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lua-stdlib/_debug.git",
"rev": "3236c1561bfc2724a3abd153a6e10c7957b35cf2",
"date": "2020-04-15T16:34:01-07:00",
"path": "/nix/store/rgbn0nn7glm7s52d90ds87j10bx20nij-_debug",
"sha256": "0p6jz6syh2r8qfk08jf2hp4p902rkamjzpzl8xhkpzf8rdzs937w",
"rev": "eaaa493937974889007158fa8681835b312d2a35",
"date": "2022-01-02T17:12:19-08:00",
"path": "/nix/store/qrzwpcg9airmlnayfgxspy7p7pa8csyl-_debug",
"sha256": "0nik882xm0d243ah8v2z5przcny7pfbbj529yn4qyvvz67lsfydb",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2585,10 +2585,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lua-stdlib/normalize.git",
"rev": "fb1d61b88b03406e291f58ec4981edfc538b8216",
"date": "2020-04-15T17:16:16-07:00",
"path": "/nix/store/jr4agcn13fk56b8105p6yr9gn767fkds-normalize",
"sha256": "0jiykdjxc4b5my12fnzrw3bxracjgxc265xrn8kfx95350kvbzl1",
"rev": "ccc697998af22d9d7f675e73f4b27c7a52151b5c",
"date": "2022-01-02T16:33:35-08:00",
"path": "/nix/store/nvyy1ibp43pzaldj6ark02ypqr45wmy1-normalize",
"sha256": "1m6x4lp7xzghvagbqjljyqfcpilh76j25b71da6jd304xc9r0ngy",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2613,7 +2613,7 @@ buildLuarocksPackage {
pname = "stdlib";
version = "41.2.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/stdlib-41.2.2-1.rockspec";
url = "mirror://luarocks/stdlib-41.2.2-1.rockspec";
sha256 = "0rscb4cm8s8bb8fk8rknc269y7bjqpslspsaxgs91i8bvabja6f6";
}).outPath;
src = fetchurl {
@ -2639,7 +2639,7 @@ buildLuarocksPackage {
pname = "tl";
version = "0.13.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/tl-0.13.2-1.rockspec";
url = "mirror://luarocks/tl-0.13.2-1.rockspec";
sha256 = "0a9nr03q6w1689drd0r2y8m7qbyxm8n6bkgjplwkr6c6abvbis3f";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{

View File

@ -15,13 +15,17 @@ with prev;
});
busted = prev.busted.overrideAttrs(oa: {
nativeBuildInputs = [
pkgs.installShellFiles
];
postConfigure = ''
substituteInPlace ''${rockspecFilename} \
--replace "'lua_cliargs = 3.0-1'," "'lua_cliargs >= 3.0-1',"
'';
postInstall = ''
install -D completions/zsh/_busted $out/share/zsh/site-functions/_busted
install -D completions/bash/busted.bash $out/share/bash-completion/completions/busted
installShellCompletion --cmd busted \
--zsh completions/zsh/_busted \
--bash completions/bash/busted.bash
'';
});
@ -199,7 +203,7 @@ with prev;
# until Alloyed/lua-lsp#28
postConfigure = ''
substituteInPlace ''${rockspecFilename} \
--replace '"lpeglabel ~> 1.5",' '"lpeglabel >= 1.5",'
--replace '"dkjson ~> 2.5",' '"dkjson >= 2.5",'
'';
});
@ -332,15 +336,23 @@ with prev;
# we shouldn't use luarocks machinery to build complex cmake components
libluv = pkgs.stdenv.mkDerivation {
inherit (prev.luv) pname version meta src;
pname = "libluv";
inherit (prev.luv) version meta src;
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_MODULE=OFF"
"-DWITH_SHARED_LIBUV=ON"
"-DLUA_BUILD_TYPE=System"
"-DWITH_LUA_ENGINE=${if isLuaJIT then "LuaJit" else "Lua"}"
];
buildInputs = [ pkgs.libuv ];
# to make sure we dont use bundled deps
postUnpack = ''
rm -rf deps/lua deps/libuv
'';
buildInputs = [ pkgs.libuv final.lua ];
nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ]
++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ];
@ -350,18 +362,16 @@ with prev;
buildInputs = [ pkgs.pkg-config pkgs.libuv ];
doInstallCheck = true;
# Use system libuv instead of building local and statically linking
extraVariables = {
"WITH_SHARED_LIBUV" = "ON";
};
# we unset the LUA_PATH since the hook erases the interpreter defaults (To fix)
installCheckPhase = ''
# tests is not run since they are not part of the tarball anymore
preCheck = ''
unset LUA_PATH
rm tests/test-{dns,thread}.lua
lua tests/run.lua
'';
passthru.libluv = final.libluv;
@ -401,7 +411,7 @@ with prev;
})).overrideAttrs (old: {
# Without this, source root is wrongly set to ./readline-2.6/doc
setSourceRoot = ''
sourceRoot=./readline-3.0
sourceRoot=./readline-${pkgs.lib.versions.majorMinor old.version}
'';
});

View File

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "cry";
version = "0.6.5";
version = "0.6.7";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-cry";
rev = version;
sha256 = "1g4smccj27sv8pb9az5hbzxi99swg3d55mp7j25lz30xyabvksc3";
rev = "v${version}";
sha256 = "sha256-1Omp3LBKGTPVwEBd530H0Djn3xiEjOHLqso6S8yIJSQ=";
};
meta = with lib; {

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aiohue";
version = "4.4.1";
version = "4.4.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
hash = "sha256-zXjfPd40yYyAuuW4CmaGRvJuORyQJa+6CFQaO6RQPZo=";
hash = "sha256-rHd5mQlD/4enGgFyVRVnLXG1Fcd+8hyQj+WnF8QFqm0=";
};
propagatedBuildInputs = [

View File

@ -5,6 +5,7 @@
, buildPythonPackage
, docutils
, fetchFromGitHub
, fetchpatch
, imaplib2
, mock
, nose
@ -19,9 +20,7 @@ buildPythonPackage rec {
version = "0.9.0";
format = "setuptools";
# Check https://github.com/bamthomas/aioimaplib/issues/75
# for Python 3.10 support
disabled = pythonOlder "3.5" || pythonAtLeast "3.10";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bamthomas";
@ -30,6 +29,14 @@ buildPythonPackage rec {
sha256 = "sha256-xxZAeJDuqrPv4kGgDr0ypFuZJk1zcs/bmgeEzI0jpqY=";
};
patches = [
# https://github.com/bamthomas/aioimaplib/pull/76
(fetchpatch {
url = "https://github.com/bamthomas/aioimaplib/commit/03f796f45b60a163ad0f3d52166d58f280de7065.patch";
hash = "sha256-9staxkw/EfGoBz/uyrNKBvQ0KfN+za4rTGRyqrAJSd8=";
})
];
checkInputs = [
asynctest
docutils

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "ansible-doctor";
version = "1.3.0";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "thegeeklab";
repo = "ansible-doctor";
rev = "v${version}";
hash = "sha256-lJKJE9UccknQg8aqt/6qmjKKaICBxaCH5e8fdmie6u8=";
hash = "sha256-onRur31Sa95nsXUYFJdAHySm4nIXqP01nT70IFPwLCo=";
};
nativeBuildInputs = [
@ -56,7 +56,7 @@ buildPythonPackage rec {
--replace 'Jinja2 = "3.1.2"' 'Jinja2 = "*"' \
--replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \
--replace 'environs = "9.5.0"' 'environs = "*"' \
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' \
--replace 'jsonschema = "4.6.0"' 'jsonschema = "*"' \
--replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"'
'';

View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "ansible-later";
version = "2.0.13";
version = "2.0.14";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "thegeeklab";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-9xVFvXCHjgF+7asO1ialGIofJwsRRRiydo/Ui2C+Wig=";
hash = "sha256-iY+5p6LNrlCTGi61cm2DJdyt8SmAwYqKmXNXescjAVQ=";
};
nativeBuildInputs = [
@ -63,7 +63,7 @@ buildPythonPackage rec {
--replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \
--replace 'PyYAML = "6.0"' 'PyYAML = "*"' \
--replace 'unidiff = "0.7.3"' 'unidiff = "*"' \
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"'
--replace 'jsonschema = "4.6.0"' 'jsonschema = "*"'
'';
postInstall = ''

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "azure-eventhub";
version = "5.9.0";
version = "5.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "509c6b351db0c1674a7c33308e6ffebc5a9bd2b0a9d10bcb2fa3d0a3a47d42d0";
sha256 = "8c83fbe96a420813599a9a3c66adc315b7208f56d5a50a20aa04a8aa7062b074";
};
propagatedBuildInputs = [

View File

@ -5,17 +5,20 @@
, msrestazure
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-mgmt-logic";
version = "9.0.0";
version = "10.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "d3a780d299c4db59134bd984c4c9281b9b6ae5d4ba185bcbae43f6c3af04f85a";
hash = "sha256-s/pIZPFKqnr0HXeNkl8FHtKbYBb0Y0R2Xs0PSdDwTdY=";
};
propagatedBuildInputs = [
@ -23,12 +26,14 @@ buildPythonPackage rec {
msrestazure
azure-common
azure-mgmt-core
azure-mgmt-nspkg
];
# has no tests
# Module has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.logic" ];
pythonImportsCheck = [
"azure.mgmt.logic"
];
meta = with lib; {
description = "This is the Microsoft Azure Logic Apps Management Client Library";

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.6.1";
version = "7.7.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-wqt+uWKVklP2AxiQN9PeuOFUixtZuBUIUhN+WZBYrBI=";
hash = "sha256-D9CdVfPU7FwiAQd2Pw/CMJsHj8psYtVq3wYJlVHVA1s=";
};
propagatedBuildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "bite-parser";
version = "0.1.1";
version = "0.1.3";
disabled = pythonOlder "3.7";
@ -18,15 +18,9 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "8021100bfbd6cc6056605361e763a3591efdea38014b3d8aa76c74c74de4ead4";
sha256 = "0f246e98a5556d6ed9a33fda1e94c3ab906305729feb30d25e35344b3e1c1fd9";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'python = "^3.7,<=3.10"' 'python = "^3.7,<3.11"' \
--replace poetry.masonry.api poetry.core.masonry.api
'';
nativeBuildInputs = [
poetry-core
];
@ -42,6 +36,7 @@ buildPythonPackage rec {
meta = {
description = "Asynchronous parser taking incremental bites out of your byte input stream";
homepage = "https://github.com/jgosmann/bite-parser";
changelog = "https://github.com/jgosmann/bite-parser/blob/v${version}/CHANGELOG.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "bond-async";
version = "0.1.20";
version = "0.1.22";
disabled = pythonOlder "3.7";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bondhome";
repo = "bond-async";
rev = "v${version}";
hash = "sha256-iBtbHS3VzSB6wfWDFq5UVd3++x3HtQbWQ6soPYfcHiM=";
rev = "refs/tags/v${version}";
hash = "sha256-wU1niuzHwNmrmyjcTlBIKrBf1wMbHHFlIBxFNHUwDw4=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchPypi
, einops
, emoji
, flax
, ftfy
, jax
, jaxlib
, pillow
, transformers
, unidecode
, wandb
}:
buildPythonPackage rec {
pname = "dalle-mini";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Sbos44uWGnJLYMx/xy0wkyAJHlDhVIeOS7rnYt2W53w=";
};
format = "setuptools";
buildInputs = [
jaxlib
];
propagatedBuildInputs = [
einops
emoji
flax
ftfy
jax
pillow
transformers
unidecode
wandb
];
doCheck = false; # no upstream tests
pythonImportsCheck = [ "dalle_mini" ];
meta = with lib; {
description = "Generate images from a text prompt";
homepage = "https://github.com/borisdayma/dalle-mini";
license = licenses.asl20;
maintainers = with maintainers; [ r-burns ];
};
}

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dvc-render";
version = "0.0.5";
version = "0.0.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = "v${version}";
hash = "sha256-dL+ampYgcC77G89rnh7t6lVp7WoIR85gjP0eg89ci3g=";
rev = "refs/tags/${version}";
hash = "sha256-l0efiCLoOVuSYoHWYYyu8FT1yosdFl6BeogzJyNKltw=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "dvclive";
version = "0.8.2";
version = "0.9.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-ditc4WWTEuO4ACqL87BNgjm1B6Aj6PPWrFX+OoF5jOI=";
rev = "refs/tags/${version}";
hash = "sha256-3kbP8eL/cO/aSAIVrbfGS+vwCTsWoCbNS2orExYt4aw=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "json-stream";
version = "1.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-J5DBa8zeandkDIXpEaRN6cneZIIG2aRHS5zjmM/H0Uw=";
};
propagatedBuildInputs = [
requests
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"json_stream"
];
meta = with lib; {
description = "Streaming JSON parser";
homepage = "https://github.com/daggaz/json-stream";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -6,6 +6,7 @@
, fetchFromGitHub
, protobuf
, pythonOlder
, fetchpatch
}:
buildPythonPackage rec {
@ -29,6 +30,12 @@ buildPythonPackage rec {
# 10.12. The patch reverts
# https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654
./0001-Revert-Fix-MacOS-wheels-platform-tag.patch
# Allow for clang to be used to build native extensions
(fetchpatch {
url = "https://github.com/mysql/mysql-connector-python/commit/fd24ce9dc8c60cc446a8e69458f7851d047c7831.patch";
sha256 = "sha256-WvU1iB53MavCsksKCjGvUl7R3Ww/38alxxMVzjpr5Xg=";
})
];
propagatedBuildInputs = [
@ -44,7 +51,6 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
broken = stdenv.isDarwin;
description = "A MySQL driver";
longDescription = ''
A MySQL driver that does not depend on MySQL C client libraries and

View File

@ -0,0 +1,71 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, pythonOlder
, docutils
, jinja2
, markdown-it-py
, mdit-py-plugins
, pyyaml
, sphinx
, typing-extensions
, beautifulsoup4
, pytest-param-files
, pytest-regressions
, sphinx-pytest
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "myst-parser";
version = "0.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "executablebooks";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GEtrC7o5YnkuvBfQQfhG5P74QMiHz63Fdh1cC/r5CF0=";
};
format = "flit";
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [
docutils
jinja2
mdit-py-plugins
markdown-it-py
pyyaml
sphinx
typing-extensions
];
pythonImportsCheck = [ "myst_parser" ];
checkInputs = [
beautifulsoup4
pytest-param-files
pytest-regressions
sphinx-pytest
pytestCheckHook
];
disabledTests = [
# AssertionError due to different files
"test_basic"
"test_footnotes"
"test_gettext_html"
"test_fieldlist_extension"
];
meta = with lib; {
description = "Sphinx and Docutils extension to parse MyST";
homepage = "https://myst-parser.readthedocs.io/";
license = licenses.mit;
maintainers = with maintainers; [ loicreynier ];
};
}

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "0.4.7";
version = "1.0.11";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-DEK8vOWHv+O6zpzluUkhozsihhM9Ad2lOCEf4YnT+Yk=";
hash = "sha256-cY2+H6FiojUEOHuA+wuIubtJKjNQlgten1edWgkoLb0=";
};
postPatch = ''

View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pick";
version = "1.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "wong2";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9y9O6Iqo07Q+aPM6AvyvjAMQzZQOSpal92Qto8p8bzI=";
};
nativeBuildInputs = [
poetry-core
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pick"
];
meta = with lib; {
description = "Module to create curses-based interactive selection list in the terminal";
homepage = "https://github.com/wong2/pick";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python-magic
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pycketcasts";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "nwithan8";
repo = pname;
rev = version;
hash = "sha256-O4j89fE7fYPthhCH8b2gGskkelEA4mU6GvSbKIl+4Mk=";
};
propagatedBuildInputs = [
python-magic
requests
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"pycketcasts"
];
meta = with lib; {
description = "Module to interact with PocketCast's unofficial API";
homepage = "https://github.com/nwithan8/pycketcasts";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.1.0";
version = "1.1.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c=";
hash = "sha256-KrsZfLJRYqlV/VwMElv4YoT3/vvfJmrN47s7dGm4isw=";
};
propagatedBuildInputs = [

View File

@ -1,20 +1,22 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, lib
# pythonPackages
, pyasn1
, pythonOlder
}:
buildPythonPackage rec {
pname = "pysmb";
version = "1.2.7";
version = "1.2.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
format = "setuptools";
extension = "zip";
sha256 = "298605b8f467ce15b412caaf9af331c135e88fa2172333af14b1b2916361cb6b";
hash = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U=";
};
propagatedBuildInputs = [
@ -22,17 +24,18 @@ buildPythonPackage rec {
];
# Tests require Network Connectivity and a server up and running
# https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt
# https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt
doCheck = false;
pythonImportsCheck = [ "nmb" "smb" ];
pythonImportsCheck = [
"nmb"
"smb"
];
meta = {
meta = with lib; {
description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines";
homepage = "https://miketeo.net/wp/index.php/projects/pysmb";
license = lib.licenses.zlib;
maintainers = with lib.maintainers; [
kamadorueda
];
license = licenses.zlib;
maintainers = with maintainers; [ kamadorueda ];
};
}

View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, pytest
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pytest-param-files";
version = "0.3.4";
src = fetchFromGitHub {
owner = "chrisjsewell";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A=";
};
format = "flit";
nativeBuildInputs = [ flit-core ];
buildInputs = [
pytest
];
pythonImportsCheck = [ "pytest_param_files" ];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Package to generate parametrized pytests from external files";
homepage = "https://github.com/chrisjsewell/pytest-param-files";
license = licenses.mit;
maintainers = with maintainers; [ loicreynier ];
};
}

View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, pytest
, sphinx
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "sphinx-pytest";
version = "0.0.3";
src = fetchFromGitHub {
owner = "chrisjsewell";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8=";
};
format = "flit";
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [
sphinx
];
buildInputs = [
pytest
];
pythonImportsCheck = [ "sphinx_pytest" ];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Helpful pytest fixtures for Sphinx extensions";
homepage = "https://github.com/chrisjsewell/sphinx-pytest";
license = licenses.mit;
maintainers = with maintainers; [ loicreynier ];
};
}

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "ssh-mitm";
version = "2.0.3";
version = "2.0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,8 +25,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-TU+jrPZtE9SasUudg1BujvIi3uH+WRdW2TReTFYtntc=";
rev = "refs/tags/${version}";
hash = "sha256-F7+odIWiEy7Aea+Jnx5VuDv5PdMlvxX975QmlLQ5APE=";
};
propagatedBuildInputs = [

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