Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát 2023-04-24 08:10:21 +02:00
commit 011bf8f5d9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
107 changed files with 8962 additions and 2843 deletions

View file

@ -182,7 +182,26 @@ meta.hydraPlatforms = [];
### `broken` {#var-meta-broken}
If set to `true`, the package is marked as "broken", meaning that it wont show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed.
If set to `true`, the package is marked as "broken", meaning that it wont show up in [search.nixos.org](https://search.nixos.org/packages), and cannot be built or installed unless the environment variable [`NIXPKGS_ALLOW_BROKEN`](#opt-allowBroken) is set.
Such unconditionally-broken packages should be removed from Nixpkgs eventually unless they are fixed.
The value of this attribute can depend on a package's arguments, including `stdenv`.
This means that `broken` can be used to express constraints, for example:
- Does not cross compile
```nix
meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)
```
- Broken if all of a certain set of its dependencies are broken
```nix
meta.broken = lib.all (map (p: p.meta.broken) [ glibc musl ])
```
This makes `broken` strictly more powerful than `meta.badPlatforms`.
However `meta.availableOn` currently examines only `meta.platforms` and `meta.badPlatforms`, so `meta.broken` does not influence the default values for optional dependencies.
## Licenses {#sec-meta-license}

View file

@ -426,4 +426,81 @@ ${expr "" v}
abort "generators.toDhall: cannot convert a null to Dhall"
else
builtins.toJSON v;
/*
Translate a simple Nix expression to Lua representation with occasional
Lua-inlines that can be construted by mkLuaInline function.
Configuration:
* multiline - by default is true which results in indented block-like view.
* indent - initial indent.
Attention:
Regardless of multiline parameter there is no trailing newline.
Example:
generators.toLua {}
{
cmd = [ "typescript-language-server" "--stdio" ];
settings.workspace.library = mkLuaInline ''vim.api.nvim_get_runtime_file("", true)'';
}
->
{
["cmd"] = {
"typescript-language-server",
"--stdio"
},
["settings"] = {
["workspace"] = {
["library"] = (vim.api.nvim_get_runtime_file("", true))
}
}
}
Type:
toLua :: AttrSet -> Any -> String
*/
toLua = {
/* If this option is true, the output is indented with newlines for attribute sets and lists */
multiline ? true,
/* Initial indentation level */
indent ? ""
}@args: v:
with builtins;
let
innerIndent = "${indent} ";
introSpace = if multiline then "\n${innerIndent}" else " ";
outroSpace = if multiline then "\n${indent}" else " ";
innerArgs = args // { indent = innerIndent; };
concatItems = concatStringsSep ",${introSpace}";
isLuaInline = { _type ? null, ... }: _type == "lua-inline";
in
if v == null then
"nil"
else if isInt v || isFloat v || isString v || isBool v then
builtins.toJSON v
else if isList v then
(if v == [ ] then "{}" else
"{${introSpace}${concatItems (map (value: "${toLua innerArgs value}") v)}${outroSpace}}")
else if isAttrs v then
(
if isLuaInline v then
"(${v.expr})"
else if v == { } then
"{}"
else
"{${introSpace}${concatItems (
lib.attrsets.mapAttrsToList (key: value: "[${builtins.toJSON key}] = ${toLua innerArgs value}") v
)}${outroSpace}}"
)
else
abort "generators.toLua: type ${typeOf v} is unsupported";
/*
Mark string as Lua expression to be inlined when processed by toLua.
Type:
mkLuaInline :: String -> AttrSet
*/
mkLuaInline = expr: { _type = "lua-inline"; inherit expr; };
}

View file

@ -9,6 +9,14 @@ let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis
rec {
# these patterns are to be matched against {host,build,target}Platform.parsed
patterns = rec {
# The patterns below are lists in sum-of-products form.
#
# Each attribute is list of product conditions; non-list values are treated
# as a singleton list. If *any* product condition in the list matches then
# the predicate matches. Each product condition is tested by
# `lib.attrsets.matchAttrs`, which requires a match on *all* attributes of
# the product.
isi686 = { cpu = cpuTypes.i686; };
isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
isx86_64 = { cpu = { family = "x86"; bits = 64; }; };

View file

@ -915,6 +915,72 @@ runTests {
};
testToLuaEmptyAttrSet = {
expr = generators.toLua {} {};
expected = ''{}'';
};
testToLuaEmptyList = {
expr = generators.toLua {} [];
expected = ''{}'';
};
testToLuaListOfVariousTypes = {
expr = generators.toLua {} [ null 43 3.14159 true ];
expected = ''
{
nil,
43,
3.14159,
true
}'';
};
testToLuaString = {
expr = generators.toLua {} ''double-quote (") and single quotes (')'';
expected = ''"double-quote (\") and single quotes (')"'';
};
testToLuaAttrsetWithLuaInline = {
expr = generators.toLua {} { x = generators.mkLuaInline ''"abc" .. "def"''; };
expected = ''
{
["x"] = ("abc" .. "def")
}'';
};
testToLuaAttrsetWithSpaceInKey = {
expr = generators.toLua {} { "some space and double-quote (\")" = 42; };
expected = ''
{
["some space and double-quote (\")"] = 42
}'';
};
testToLuaWithoutMultiline = {
expr = generators.toLua { multiline = false; } [ 41 43 ];
expected = ''{ 41, 43 }'';
};
testToLuaBasicExample = {
expr = generators.toLua {} {
cmd = [ "typescript-language-server" "--stdio" ];
settings.workspace.library = generators.mkLuaInline ''vim.api.nvim_get_runtime_file("", true)'';
};
expected = ''
{
["cmd"] = {
"typescript-language-server",
"--stdio"
},
["settings"] = {
["workspace"] = {
["library"] = (vim.api.nvim_get_runtime_file("", true))
}
}
}'';
};
# CLI
testToGNUCommandLine = {

View file

@ -5135,6 +5135,12 @@
github = "fkautz";
githubId = 135706;
};
FlafyDev = {
name = "Flafy Arazi";
email = "flafyarazi@gmail.com";
github = "FlafyDev";
githubId = 44374434;
};
Flakebi = {
email = "flakebi@t-online.de";
github = "Flakebi";
@ -11299,6 +11305,12 @@
githubId = 3521180;
name = "Tom Sydney Kerckhove";
};
NotAShelf = {
name = "NotAShelf";
email = "itsashelf@gmail.com";
github = "NotAShelf";
githubId = 62766066;
};
notbandali = {
name = "Amin Bandali";
email = "bandali@gnu.org";

View file

@ -229,6 +229,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- To enable the HTTP3 (QUIC) protocol for a nginx virtual host, set the `quic` attribute on it to true, e.g. `services.nginx.virtualHosts.<name>.quic = true;`.
- The default Asterisk package was changed to v20 from v19. Asterisk versions 16 and 19 have been dropped due to being EOL. You may need to update /var/lib/asterisk to match the template files in `${asterisk-20}/var/lib/asterisk`.
- conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround.
- The `services.pipewire.config` options have been removed, as they have basically never worked correctly. All behavior defined by the default configuration can be overridden with drop-in files as necessary - see [below](#sec-release-23.05-migration-pipewire) for details.

View file

@ -487,7 +487,7 @@ let
};
email = mkOption {
type = types.str;
type = types.nullOr types.str;
inherit (defaultAndText "email" null) default defaultText;
description = lib.mdDoc ''
Email address for account creation and correspondence from the CA.
@ -555,7 +555,7 @@ let
};
credentialsFile = mkOption {
type = types.path;
type = types.nullOr types.path;
inherit (defaultAndText "credentialsFile" null) default defaultText;
description = lib.mdDoc ''
Path to an EnvironmentFile for the cert's service containing any required and

View file

@ -199,7 +199,7 @@ in
(filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
serviceConfig = {
ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
ExecStart = "@${lib.getExe cfg.package} consul agent -config-dir /etc/consul.d"
+ concatMapStrings (n: " -config-file ${n}") configFiles;
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
PermissionsStartOnly = true;
@ -207,10 +207,10 @@ in
Restart = "on-failure";
TimeoutStartSec = "infinity";
} // (optionalAttrs (cfg.leaveOnStop) {
ExecStop = "${cfg.package}/bin/consul leave";
ExecStop = "${lib.getExe cfg.package} leave";
});
path = with pkgs; [ iproute2 gnugrep gawk consul ];
path = with pkgs; [ iproute2 gawk cfg.package ];
preStart = let
family = if cfg.forceAddrFamily == "ipv6" then
"-6"
@ -269,7 +269,7 @@ in
serviceConfig = {
ExecStart = ''
${cfg.alerts.package}/bin/consul-alerts start \
${lib.getExe cfg.alerts.package} start \
--alert-addr=${cfg.alerts.listenAddr} \
--consul-addr=${cfg.alerts.consulAddr} \
${optionalString cfg.alerts.watchChecks "--watch-checks"} \

View file

@ -72,6 +72,7 @@ let
server.wait_for_unit("gitea.service")
server.wait_for_open_port(3000)
server.wait_for_open_port(22)
server.succeed("curl --fail http://localhost:3000/")
server.succeed(

View file

@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "mopidy-jellyfin";
version = "1.0.2";
version = "1.0.4";
src = python3Packages.fetchPypi {
inherit version;
pname = "Mopidy-Jellyfin";
sha256 = "0j7v5xx3c401r5dw1sqm1n2263chjga1d3ml85rg79hjhhhacy75";
sha256 = "ny0u6HdOlZCsmIzZuQ1rql+bvHU3xkh8IdwhJVHNH9c=";
};
propagatedBuildInputs = [ mopidy python3Packages.unidecode python3Packages.websocket-client ];

View file

@ -16,7 +16,7 @@
}:
let
rev = "c5dc02f6bd47039c320083b3befac0e569c0efa4";
rev = "7e1e6a4c349e720d75c892cd7230b29c35148342";
python = python3.withPackages (ps: with ps; [
epc
orjson
@ -26,13 +26,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "20230311.1648"; # 16:48 UTC
version = "20230424.1642"; # 16:42 UTC
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
inherit rev;
sha256 = "sha256-vbSVGPFBjAp4VRbJc6a2W0d2IqOusNa+rk4X6jRcjRI=";
sha256 = "sha256-e0XVQpsyjy8HeZN6kLRjnoTpyEefTqstsgydEKlEQ1c=";
};
commit = rev;

View file

@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "cemu";
version = "2.0-32";
version = "2.0-36";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
hash = "sha256-47uCGN1wFVx3ph/q3+BG+pwJ7nisbmRPUEatOIq0i9M=";
hash = "sha256-RO8c9gLK00LLwDzcD8UOS3kh3kwTwFyrpuRlIXcInPo=";
};
patches = [
@ -86,9 +86,12 @@ stdenv.mkDerivation rec {
"-DPORTABLE=OFF"
];
preConfigure = ''
preConfigure = with lib; let
tag = last (splitString "-" version);
in ''
rm -rf dependencies/imgui
ln -s ${imgui}/include/imgui dependencies/imgui
sed 's/\(EMULATOR_VERSION_SUFFIX\).*experimental.*/\1 "-${tag} (experimental)"/' -i src/Common/version.h
'';
installPhase = ''

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cen64";
version = "unstable-2021-03-12";
version = "unstable-2022-10-02";
src = fetchFromGitHub {
owner = "n64dev";
repo = "cen64";
rev = "1b31ca9b3c3bb783391ab9773bd26c50db2056a8";
sha256 = "0x1fz3z4ffl5xssiyxnmbhpjlf0k0fxsqn4f2ikrn17742dx4c0z";
rev = "ee6db7d803a77b474e73992fdc25d76b9723d806";
sha256 = "sha256-/CraSu/leNA0dl8NVgFjvKdOWrC9/namAz5NSxtPr+I=";
};
nativeBuildInputs = [ cmake ];

View file

@ -371,7 +371,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "felix"
version = "2.2.5"
version = "2.2.6"
dependencies = [
"chrono",
"content_inspector",

View file

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
version = "2.2.5";
version = "2.2.6";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg=";
sha256 = "sha256-t/BCRKqCCXZ76bFYyblNnKHB9y0oJ6ajqsbdIGq/YVM=";
};
cargoLock = {

View file

@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-7";
version = "7.1.1-8";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-PeXWtD8AX9VEJruZu/TO1Bpaoa1XNKIFGfGK+TpQEMs=";
hash = "sha256-2wAm2y8YQwhgsPNqxGGJ65emL/kMYoVvF2phZMXTpZc=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, alsa-lib
, appstream-glib
, cmake
@ -24,32 +23,24 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.5.18";
version = "0.6.0";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
hash = "sha256-N07Y9kmGvMFS0Kq4i2CltJvNTuqbXausZZGjAQRDmNU=";
hash = "sha256-47mWlUXp62fMh5c13enFjmuMxzrmEZlwJFsZhYCB1Vs=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"ink-stroke-modeler-rs-0.1.0" = "sha256-+R3T/9Ty+F6YxxtA0Un6UhFyKbGOvqBKwHt4WSHWhsk=";
"librsvg-2.55.92" = "sha256-WVwxjjWR/TloSmyzH8Jo1mTjLHVifBw1Xn965wuoEDs=";
"piet-0.6.2" = "sha256-76yeX0yQMC0hh6u2xT/kS/2fjs+GO+nCks2fnOImf0c=";
"ink-stroke-modeler-rs-0.1.0" = "sha256-DrbFolHGL3ywk2p6Ly3x0vbjqxy1mXld+5CPrNlJfQM=";
"librsvg-2.56.0" = "sha256-4poP7xsoylmnKaUWuJ0tnlgEMpw9iJrM3dvt4IaFi7w=";
"piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU=";
};
};
patches = [
# https://github.com/flxzt/rnote/pull/569
(fetchpatch {
url = "https://github.com/flxzt/rnote/commit/8585b446c08b246f3d55359026415cb3d242d44e.patch";
hash = "sha256-ePpTQ/3mzZTNjU9P4vTu9CM0vX8+r8b6njuj7hDgFCg=";
})
];
nativeBuildInputs = [
appstream-glib # For appstream-util
cmake
@ -85,7 +76,6 @@ stdenv.mkDerivation rec {
pushd build-aux
chmod +x cargo_build.py meson_post_install.py
patchShebangs cargo_build.py meson_post_install.py
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
popd
'';

View file

@ -4,10 +4,13 @@
, extra-cmake-modules
, kconfig
, kio
, leptonica
, mauikit
, opencv
, qtlocation
, exiv2
, kquickimageedit
, tesseract
}:
mkDerivation {
@ -21,10 +24,13 @@ mkDerivation {
buildInputs = [
kconfig
kio
leptonica
mauikit
opencv
qtlocation
exiv2
kquickimageedit
tesseract
];
meta = with lib; {

View file

@ -2,13 +2,7 @@
, mkDerivation
, cmake
, extra-cmake-modules
, kconfig
, kcoreaddons
, ki18n
, knotifications
, qtbase
, qtquickcontrols2
, qtx11extras
, qtsystems
}:
mkDerivation {
@ -19,6 +13,10 @@ mkDerivation {
extra-cmake-modules
];
buildInputs = [
qtsystems
];
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauiman";
description = "Maui Manager Library. Server and public library API";

View file

@ -3,6 +3,22 @@
{ fetchurl, mirror }:
{
agenda = {
version = "0.1.1";
src = fetchurl {
url = "${mirror}/stable/maui/agenda/0.1.1/agenda-0.1.1.tar.xz";
sha256 = "0czpsybvvvnfg0n1ri94a2agwhdnmy124ggxqb5kjnsw35ivz35a";
name = "agenda-0.1.1.tar.xz";
};
};
arca = {
version = "0.1.1";
src = fetchurl {
url = "${mirror}/stable/maui/arca/0.1.1/arca-0.1.1.tar.xz";
sha256 = "0d4mdv1israljn9mhpb3nx8442g7kiqg87gmsb74z08v02yywmc0";
name = "arca-0.1.1.tar.xz";
};
};
bonsai = {
version = "2.2.0";
src = fetchurl {
@ -12,43 +28,59 @@
};
};
booth = {
version = "1.0.1";
version = "1.0.2";
src = fetchurl {
url = "${mirror}/stable/maui/booth/1.0.1/booth-1.0.1.tar.xz";
sha256 = "02p3xxfk1fsqd8z55gmkhj68j8sjbgjyrj2anpq8qsmblznsvmdn";
name = "booth-1.0.1.tar.xz";
url = "${mirror}/stable/maui/booth/1.0.2/booth-1.0.2.tar.xz";
sha256 = "1b9akwwi1cmvk87zna0yrw1a6mwjd8qg0k3lnivwqfm5zi1xlpb6";
name = "booth-1.0.2.tar.xz";
};
};
buho = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/buho/2.2.1/buho-2.2.1.tar.xz";
sha256 = "1iv30avnfdh78zq7kxigxlkzdp2jfzx0sl88vssjcisniabyd1ri";
name = "buho-2.2.1.tar.xz";
url = "${mirror}/stable/maui/buho/2.2.2/buho-2.2.2.tar.xz";
sha256 = "0kvg34dmk46aawa8vnl70m8gi6qjr709czgmzb8a7pa77clyyyg8";
name = "buho-2.2.2.tar.xz";
};
};
clip = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/clip/2.2.1/clip-2.2.1.tar.xz";
sha256 = "00w9kgqw4dxb9b9rq11jzdb9pj48qdkdj23wdjwdk52nyfkw7sbh";
name = "clip-2.2.1.tar.xz";
url = "${mirror}/stable/maui/clip/2.2.2/clip-2.2.2.tar.xz";
sha256 = "1dk9x5lrp197g2qgi10p536dshaaxacgrkwr3pqywqcqqyrvjiyf";
name = "clip-2.2.2.tar.xz";
};
};
communicator = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/communicator/2.2.1/communicator-2.2.1.tar.xz";
sha256 = "1h689dr9iy07r7ypyfgrb3n0ljigz847m6vq1jaia6phgix07hn6";
name = "communicator-2.2.1.tar.xz";
url = "${mirror}/stable/maui/communicator/2.2.2/communicator-2.2.2.tar.xz";
sha256 = "02c7w6km6a5plf56g4wwdw8k8kif3pmwd1agvhvfpq84yq73naz4";
name = "communicator-2.2.2.tar.xz";
};
};
era = {
version = "0.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/era/0.1.0/era-0.1.0.tar.xz";
sha256 = "0qllnpibkhrr52gsngrkzrxcaj68hngsaavdwkds3rbaq4a5by9g";
name = "era-0.1.0.tar.xz";
};
};
fiery = {
version = "1.0.2";
src = fetchurl {
url = "${mirror}/stable/maui/fiery/1.0.2/fiery-1.0.2.tar.xz";
sha256 = "0xw3p0dna3p05k8mv8sw8aw3clgb3kx72405826k0ldva8mh5q55";
name = "fiery-1.0.2.tar.xz";
};
};
index-fm = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/index/2.2.1/index-fm-2.2.1.tar.xz";
sha256 = "1gin3may65f8nafbgyv90k31z69xwx1awnnxmciqn5zz7cdh9slm";
name = "index-fm-2.2.1.tar.xz";
url = "${mirror}/stable/maui/index/2.2.2/index-fm-2.2.2.tar.xz";
sha256 = "156fb5kx9hkdg4q4c2r0822s49w86kixvn3m7m1gfxbc6hr5h291";
name = "index-fm-2.2.2.tar.xz";
};
};
mauikit = {
@ -60,91 +92,99 @@
};
};
mauikit-accounts = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-accounts/2.2.1/mauikit-accounts-2.2.1.tar.xz";
sha256 = "13k9y7z9mw17rdn1z9ixgi1bf6q2hf0afp53nb8d9gz5mqkaf6qh";
name = "mauikit-accounts-2.2.1.tar.xz";
url = "${mirror}/stable/maui/mauikit-accounts/2.2.2/mauikit-accounts-2.2.2.tar.xz";
sha256 = "10rvzy5m5bmf98q5akvq87q00nz9mxmnp9ywnswl65gnmihiwis8";
name = "mauikit-accounts-2.2.2.tar.xz";
};
};
mauikit-calendar = {
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-calendar/1.0.0/mauikit-calendar-1.0.0.tar.xz";
sha256 = "1zqaf0nddb220w14ar9gg6p695p0my8whn8p8wgxm7mwjfb6hlil";
name = "mauikit-calendar-1.0.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-calendar/1.0.1/mauikit-calendar-1.0.1.tar.xz";
sha256 = "0l3195zy2qzcc1in9m0k8lpzbqbhdjvlr40n23plr6ldwc61q34b";
name = "mauikit-calendar-1.0.1.tar.xz";
};
};
mauikit-documents = {
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-documents/1.0.0/mauikit-documents-1.0.0.tar.xz";
sha256 = "1dniab7f113vbxng9b1nwmh6wviv1m1gb842k98vxgnhmsljq24a";
name = "mauikit-documents-1.0.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-documents/1.0.1/mauikit-documents-1.0.1.tar.xz";
sha256 = "0rfznsdlfhf0bjk4fkybbvv56c55w0krjaa8by26fzkqannd7smd";
name = "mauikit-documents-1.0.1.tar.xz";
};
};
mauikit-filebrowsing = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.1/mauikit-filebrowsing-2.2.1.tar.xz";
sha256 = "1szghmp1p9pvsfqx8sk345j7riqxv2kib41l277rm14pwbs6zx1c";
name = "mauikit-filebrowsing-2.2.1.tar.xz";
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.2/mauikit-filebrowsing-2.2.2.tar.xz";
sha256 = "0dj06qak410gf4xykhigxrswbchfkicgihzksgv63z9ggfg64jbr";
name = "mauikit-filebrowsing-2.2.2.tar.xz";
};
};
mauikit-imagetools = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-imagetools/2.2.1/mauikit-imagetools-2.2.1.tar.xz";
sha256 = "1wfhzkw4bs3518gylfxyp1arg2w204f73wg1l2s4pygbdh5ylav2";
name = "mauikit-imagetools-2.2.1.tar.xz";
url = "${mirror}/stable/maui/mauikit-imagetools/2.2.2/mauikit-imagetools-2.2.2.tar.xz";
sha256 = "1jf60725v887dfl3l9sbknkwns15bz7a7b9v0p6llhw00hiq83b4";
name = "mauikit-imagetools-2.2.2.tar.xz";
};
};
mauikit-terminal = {
version = "1.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-terminal/1.0.0/mauikit-terminal-1.0.0.tar.xz";
sha256 = "1r6dcna2fyglj4q33i5qnzv763y3y65fcqb4ralyydlb8x2nb248";
name = "mauikit-terminal-1.0.0.tar.xz";
};
};
mauikit-texteditor = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-texteditor/2.2.1/mauikit-texteditor-2.2.1.tar.xz";
sha256 = "0dzzlmdpl0y843lywfjc4za152r87kncafkmmbp8bdwc9j5fdzzv";
name = "mauikit-texteditor-2.2.1.tar.xz";
url = "${mirror}/stable/maui/mauikit-texteditor/2.2.2/mauikit-texteditor-2.2.2.tar.xz";
sha256 = "0g8n0xzn9iiq122hb23rhn3c9vkq6hm7kgv5mv8dx2kv17gdyzcg";
name = "mauikit-texteditor-2.2.2.tar.xz";
};
};
mauiman = {
version = "1.0.1";
version = "1.0.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauiman/1.0.1/mauiman-1.0.1.tar.xz";
sha256 = "0awqb8kygacirlhha58bzgrd47zsxmfm3h5k68g8liymqn00fh30";
name = "mauiman-1.0.1.tar.xz";
url = "${mirror}/stable/maui/mauiman/1.0.2/mauiman-1.0.2.tar.xz";
sha256 = "0v3jhy3j04aq5935pr6mzgdjwj6mgj1rwscmmg3b9vsi9f6s17n4";
name = "mauiman-1.0.2.tar.xz";
};
};
nota = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/nota/2.2.1/nota-2.2.1.tar.xz";
sha256 = "1fl4w0l3l6rdgxw5w479nzbcff7rmdcxil7y6jdr8z2q50lkazj8";
name = "nota-2.2.1.tar.xz";
url = "${mirror}/stable/maui/nota/2.2.2/nota-2.2.2.tar.xz";
sha256 = "1c72s4ra5gl9gpq8amwhaw9wkgrgd0fiaknxhn528gzpmq52i8rn";
name = "nota-2.2.2.tar.xz";
};
};
pix = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/pix/2.2.1/pix-2.2.1.tar.xz";
sha256 = "0j2kpcxgdz21phdl0mx84ynalzf6bf3qalq524j7p297pdkrq3d6";
name = "pix-2.2.1.tar.xz";
url = "${mirror}/stable/maui/pix/2.2.2/pix-2.2.2.tar.xz";
sha256 = "0j315n1aka0pikqyq2hy15k3indr7g8vkcyxsikdd3kj968386pv";
name = "pix-2.2.2.tar.xz";
};
};
shelf = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/shelf/2.2.1/shelf-2.2.1.tar.xz";
sha256 = "1h24mrzq5p63b11caml51az99gjipdlyrbx3na2jsxy4rvzryddm";
name = "shelf-2.2.1.tar.xz";
url = "${mirror}/stable/maui/shelf/2.2.2/shelf-2.2.2.tar.xz";
sha256 = "1aw6k7z7w0qslya20h0gv3k8h526jrz8a6vb10ack3i5gw6csp1k";
name = "shelf-2.2.2.tar.xz";
};
};
station = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/station/2.2.1/station-2.2.1.tar.xz";
sha256 = "1ch5c4728hahh90nlpqwnlaljpingvwrjwxajan1j2kgwb5lynwz";
name = "station-2.2.1.tar.xz";
url = "${mirror}/stable/maui/station/2.2.2/station-2.2.2.tar.xz";
sha256 = "1svs6kjbk09l3sprq64bdm01y73vcb10y4ifh5y2a1fwa99c59sb";
name = "station-2.2.2.tar.xz";
};
};
strike = {
@ -156,11 +196,11 @@
};
};
vvave = {
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "${mirror}/stable/maui/vvave/2.2.1/vvave-2.2.1.tar.xz";
sha256 = "0mg4p44da16xkcra1akvh6f2fixd682clmd6wqgc34j7n1a9y773";
name = "vvave-2.2.1.tar.xz";
url = "${mirror}/stable/maui/vvave/2.2.2/vvave-2.2.2.tar.xz";
sha256 = "0m8jg79gz3dljbkrgjqlfmbmpgwawzaz37avx5nj1rlpm36b195f";
name = "vvave-2.2.2.tar.xz";
};
};
}

View file

@ -2,6 +2,7 @@
, mkDerivation
, cmake
, extra-cmake-modules
, kconfig
, kcoreaddons
, ki18n
, kirigami2
@ -19,6 +20,7 @@ mkDerivation {
];
buildInputs = [
kconfig
kcoreaddons
ki18n
kirigami2

View file

@ -13,13 +13,13 @@
buildDotnetModule rec {
pname = "archisteamfarm";
# nixpkgs-update: no auto update
version = "5.4.3.2";
version = "5.4.4.5";
src = fetchFromGitHub {
owner = "justarchinet";
repo = pname;
rev = version;
sha256 = "sha256-SRWqe8KTjFdgVW7/EYRVUONtDWwxpcZ1GXWFPjKZzpI=";
sha256 = "sha256-xSHoBKhqEmWf9BXWhlsMqKGhgeeQi0zSG1nxNzivr7g=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;

View file

@ -57,7 +57,7 @@
(fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; })
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; })
(fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; })
(fetchNuGet { pname = "Markdig.Signed"; version = "0.31.0"; sha256 = "1amf0yp5fqdkrr2r6nscpw1h1r3gghhxbczk6j255smdhhy0dzv9"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
@ -80,19 +80,19 @@
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
(fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; })
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
(fetchNuGet { pname = "NLog"; version = "5.1.2"; sha256 = "1hgb5lqx9c10kw6rjldrkldd70lmkzij4ssgg6msybgz7vpsyhkk"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.2"; sha256 = "09y37z05c8w77hnj2mvzyhgprssam645llliyr0c3jycgy0ls707"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.2"; sha256 = "1ig6ffc1z0kadk2v6qsnrxyj945nwsral7jvddhvjhm12bd1zb6d"; })
(fetchNuGet { pname = "NLog"; version = "5.1.3"; sha256 = "0r09pd9cax95gn5bxskfhmalfd5qi3xx5j14znvryd1vn2vy6fln"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.3"; sha256 = "0p3zj9l45iv4khmrp5wx0ry9pc8yg3n3ml73mrckhjjw0p5f2lw2"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.3"; sha256 = "059h8r09jk84mbpljfqfbpp19w1wn3bs2nr9wdfg1p8z6mqawm01"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
(fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; })
(fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; })
(fetchNuGet { pname = "SteamKit2"; version = "2.5.0-beta.1"; sha256 = "0691285g4z12hv5kpv72l36h45086n14rw56x3dnixcvrjzg2q01"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.5.0"; sha256 = "1160r9splvmxrgk3b8yzgls0pxxwak3iqfr8v13ah5mwy8zkpx71"; })
@ -101,6 +101,7 @@
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })
(fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; })
(fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; })
(fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; })

View file

@ -11,8 +11,8 @@ let
repo = "ASF-ui";
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = "b30b3f5bcea53019bab1d7a433a75936a63eef27";
sha256 = "0ba4jjf1lxhffj77lcamg390hf8z9avg9skc0iap37zw5n5myb6c";
rev = "bc84d62e4f60f24cca6e9f8e820c30c750bcb0de";
sha256 = "10z3jv551f41f2k9p6y0yhrqk6jr8pmpkrd479s1zfj40ywh48bc";
};
in

File diff suppressed because it is too large Load diff

View file

@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gpxsee";
version = "12.2";
version = "12.4";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
hash = "sha256-d+hQNI+eCSMRFMzq09wL+GN9TgOIt245Z8GlPe7nY8E=";
hash = "sha256-/a6c30jv/sI0QbCXYCq9JrMpmZRk33lQBwbd0yjnxsQ=";
};
patches = (substituteAll {

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, glibcLocales
, installShellFiles
, python3
@ -9,13 +8,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "khal";
version = "0.10.5";
version = "0.11.1";
src = fetchFromGitHub {
owner = "pimutils";
repo = pname;
rev = "v${version}";
hash = "sha256-FneJmoAOb7WjSgluCwlspf27IU3MsQZFKryL9OSSsUw=";
hash = "sha256-5wBKo24EKdEUoYhhv1EqMPOjdwUS31d3R24kLdbyvPA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -55,18 +54,6 @@ python3.pkgs.buildPythonApplication rec {
vdirsyncer
];
patches = [
# Tests working with latest pytz version, https://github.com/pimutils/khal/pull/1183
(fetchpatch {
name = "support-later-pytz.patch";
url = "https://github.com/pimutils/khal/commit/53eb8a7426d5c09478c78d809c4df4391438e246.patch";
sha256 = "sha256-drGtvJlQ3qFUdeukRWCFycPSZGWG/FSRqnbwJzFKITc=";
excludes = [
"CHANGELOG.rst"
];
})
];
postInstall = ''
# shell completions
installShellCompletion --cmd khal \

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nwg-bar";
version = "0.1.1";
version = "0.1.3";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XeRQhDQeobO1xNThdNgBkoGvnO3PMAxrNwTljC1GKPM=";
sha256 = "sha256-/GkusNhHprXwGMNDruEEuFC2ULVIHBN5F00GNex/uq4=";
};
patches = [ ./fix-paths.patch ];
@ -17,7 +17,7 @@ buildGoModule rec {
substituteInPlace tools.go --subst-var out
'';
vendorHash = "sha256-EewEhkX7Bwnz+J1ptO31HKHU4NHo76r4NqMbcrWdiu4=";
vendorHash = "sha256-mqcXhnja8ed7vXIqOKBsNrcbrcaycTQXG1jqdc6zcyI=";
nativeBuildInputs = [ pkg-config ];

View file

@ -6,12 +6,12 @@
, gtk-mac-integration
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zathura";
version = "0.5.2";
src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";
sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6";
};
@ -25,16 +25,17 @@ stdenv.mkDerivation rec {
"-Dconvert-icon=enabled"
"-Dsynctex=enabled"
# Make sure tests are enabled for doCheck
"-Dtests=enabled"
] ++ lib.optional (!stdenv.isLinux) "-Dseccomp=disabled";
(lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
(lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux)
];
nativeBuildInputs = [
meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx
gettext wrapGAppsHook libxml2 check appstream-glib
meson ninja pkg-config desktop-file-utils python3.pythonForBuild.pkgs.sphinx
gettext wrapGAppsHook libxml2 appstream-glib
];
buildInputs = [
gtk girara libintl sqlite glib file librsvg
gtk girara libintl sqlite glib file librsvg check
texlive.bin.core
] ++ lib.optional stdenv.isLinux libseccomp
++ lib.optional stdenv.isDarwin gtk-mac-integration;
@ -48,4 +49,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ globin ];
};
}
})

View file

@ -88,7 +88,7 @@ let
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "12.0.4";
version = "12.0.5";
lang = "ALL";
@ -100,7 +100,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
hash = "sha256-VT0bD4v8SBq0emFYsxELreY4o+u+FQfyBEnSMzmRd7Y=";
hash = "sha256-V4BUs30h0+AKNuNsHuRriDXJ0ZzrIsg2SYn4GPZS6Hs=";
};
i686-linux = fetchurl {
@ -110,7 +110,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
hash = "sha256-mi8btxI6de5iQ8HzNpvuFdJHjzi03zZJT65dsWEiDHA=";
hash = "sha256-TUfS31EjAi/hgVjCKT/T5Jx8iCYXB/3EXPVm1KSqXLk=";
};
};

View file

@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.4)
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
colorize (0.8.1)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
ejson (1.3.1)
faraday (2.7.1)
faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
@ -21,30 +21,28 @@ GEM
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
googleauth (1.3.0)
googleauth (1.5.2)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
http (4.4.1)
addressable (~> 2.3)
http (5.1.1)
addressable (~> 2.8)
http-cookie (~> 1.0)
http-form_data (~> 2.2)
http-parser (~> 1.2.0)
llhttp-ffi (~> 0.4.0)
http-accept (1.7.0)
http-cookie (1.0.5)
domain_name (~> 0.5)
http-form_data (2.3.0)
http-parser (1.2.3)
ffi-compiler (>= 1.0, < 2.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jsonpath (1.1.2)
multi_json
jwt (2.5.0)
krane (3.0.1)
jwt (2.7.0)
krane (3.1.0)
activesupport (>= 5.0)
colorize (~> 0.8)
concurrent-ruby (~> 1.1)
@ -55,21 +53,24 @@ GEM
oj (~> 3.0)
statsd-instrument (>= 2.8, < 4)
thor (>= 1.0, < 2.0)
kubeclient (4.10.1)
http (>= 3.0, < 5.0)
kubeclient (4.11.0)
http (>= 3.0, < 6.0)
jsonpath (~> 1.0)
recursive-open-struct (~> 1.1, >= 1.1.1)
rest-client (~> 2.0)
llhttp-ffi (0.4.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
memoist (0.16.2)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
minitest (5.16.3)
mime-types-data (3.2023.0218.1)
minitest (5.18.0)
multi_json (1.15.0)
netrc (0.11.0)
oj (3.13.23)
oj (3.14.3)
os (1.1.4)
public_suffix (5.0.0)
public_suffix (5.0.1)
rake (13.0.6)
recursive-open-struct (1.1.3)
rest-client (2.1.0)
@ -83,9 +84,9 @@ GEM
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
statsd-instrument (3.5.0)
statsd-instrument (3.5.7)
thor (1.2.1)
tzinfo (2.0.5)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
@ -98,4 +99,4 @@ DEPENDENCIES
krane
BUNDLED WITH
2.3.24
2.4.10

View file

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0";
sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
type = "gem";
};
version = "7.0.4";
version = "7.0.4.3";
};
addressable = {
dependencies = ["public_suffix"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
type = "gem";
};
version = "2.8.1";
version = "2.8.4";
};
colorize = {
groups = ["default"];
@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
version = "1.1.10";
version = "1.2.2";
};
domain_name = {
dependencies = ["unf"];
@ -68,10 +68,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590";
sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj";
type = "gem";
};
version = "2.7.1";
version = "2.7.4";
};
faraday-net_http = {
groups = ["default"];
@ -110,21 +110,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai";
sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
type = "gem";
};
version = "1.3.0";
version = "1.5.2";
};
http = {
dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"];
dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y";
sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw";
type = "gem";
};
version = "4.4.1";
version = "5.1.1";
};
http-accept = {
groups = ["default"];
@ -157,17 +157,6 @@
};
version = "2.3.0";
};
http-parser = {
dependencies = ["ffi-compiler"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1";
type = "gem";
};
version = "1.2.3";
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
@ -195,10 +184,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq";
sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
type = "gem";
};
version = "2.5.0";
version = "2.7.0";
};
krane = {
dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"];
@ -206,10 +195,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j3hy00vqk58vf7djip7vhqqczb84pjqlp34h1w4jgbw05vfcbqx";
sha256 = "1d8vdj3wd2qp8agyadn0w33qf7z2p5lk3vlslb8jlph8x5y3mm70";
type = "gem";
};
version = "3.0.1";
version = "3.1.0";
};
kubeclient = {
dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"];
@ -217,10 +206,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10rg2l15xmv4sy3cjvw3r9rxkylf36p416fhlhpic9zlq8ang6c4";
sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9";
type = "gem";
};
version = "4.10.1";
version = "4.11.0";
};
llhttp-ffi = {
dependencies = ["ffi-compiler" "rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5";
type = "gem";
};
version = "0.4.0";
};
memoist = {
groups = ["default"];
@ -248,20 +248,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
type = "gem";
};
version = "3.2022.0105";
version = "3.2023.0218.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
type = "gem";
};
version = "5.16.3";
version = "5.18.0";
};
multi_json = {
groups = ["default"];
@ -288,10 +288,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90";
sha256 = "0l8l90iibzrxs33vn3adrhbg8cbmbn1qfh962p7gzwwybsdw73qy";
type = "gem";
};
version = "3.13.23";
version = "3.14.3";
};
os = {
groups = ["default"];
@ -308,10 +308,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
type = "gem";
};
version = "5.0.0";
version = "5.0.1";
};
rake = {
groups = ["default"];
@ -370,10 +370,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gl2n26hb8g12n3alh1yg5qg7cjrp9f9fyc25crmaccm5m17v0sa";
sha256 = "1pg308z3ck1vpazrmczklqa6f9qciay8nysnhc16pgfsh2npzzrz";
type = "gem";
};
version = "3.5.0";
version = "3.5.7";
};
thor = {
groups = ["default"];
@ -391,10 +391,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
type = "gem";
};
version = "2.0.5";
version = "2.0.6";
};
unf = {
dependencies = ["unf_ext"];

View file

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230414";
version = "20230421-1";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-0pCItZCYdwX/Bl20HHc/FhIF4ZHsqz9aadfFYNdQ71M=";
hash = "sha256-ZQFoajkD7vvz74TXVT7I4D0Qjknt5YxfHYpGi3i01Ns=";
};
postPatch = ''

View file

@ -0,0 +1,12 @@
diff --git a/sources/code/common/main.ts b/sources/code/common/main.ts
index 3936ee0..bd745ef 100644
--- a/sources/code/common/main.ts
+++ b/sources/code/common/main.ts
@@ -358,6 +358,7 @@ app.userAgentFallback = getUserAgent(process.versions.chrome, userAgent.mobile,
const singleInstance = app.requestSingleInstanceLock();
function main(): void {
+ session.defaultSession.loadExtension("@vencord@");
if (overwriteMain) {
// Execute flag-specific functions for ready application.
overwriteMain();

View file

@ -0,0 +1,18 @@
{ webcord
, substituteAll
, callPackage
, lib
}:
webcord.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [
(substituteAll {
src = ./add-extension.patch;
vencord = callPackage ./vencord-web-extension { };
})
];
meta = with lib; old.meta // {
description = "Webcord with Vencord web extension";
maintainers = with maintainers; [ FlafyDev NotAShelf ];
};
})

View file

@ -0,0 +1,60 @@
{ buildNpmPackage
, fetchFromGitHub
, lib
, substituteAll
, esbuild
, buildGoModule
}:
buildNpmPackage rec {
pname = "vencord-web-extension";
version = "1.1.6";
src = fetchFromGitHub {
owner = "Vendicated";
repo = "Vencord";
rev = "v${version}";
sha256 = "sha256-V9fzSoRqVlk9QqpzzR2x+aOwGHhQhQiSjXZWMC0uLnQ=";
};
ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {
buildGoModule = args: buildGoModule (args // rec {
version = "0.15.18";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
});
# Supresses an error about esbuild's version.
npmRebuildFlags = [ "|| true" ];
npmDepsHash = "sha256-jKSdeyQ8oHw7ZGby0XzDg4O8mtH276ykVuBcw7dU/Ls=";
npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = "buildWeb";
prePatch = ''
cp ${./package-lock.json} ./package-lock.json
'';
patches = [
(substituteAll {
src = ./replace-git.patch;
inherit version;
})
];
installPhase = ''
cp -r dist/extension-unpacked $out
'';
meta = with lib; {
description = "Vencord web extension";
homepage = "https://github.com/Vendicated/Vencord";
license = licenses.gpl3Only;
maintainers = with maintainers; [ FlafyDev NotAShelf ];
};
}

View file

@ -0,0 +1,26 @@
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 7ff599a..85b3bfa 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -24,7 +24,7 @@ import { promisify } from "util";
export const watch = process.argv.includes("--watch");
export const isStandalone = JSON.stringify(process.argv.includes("--standalone"));
-export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
+export const gitHash = "@version@";
export const banner = {
js: `
// Vencord ${gitHash}
@@ -124,11 +124,7 @@ export const gitRemotePlugin = {
namespace: "git-remote", path: args.path
}));
build.onLoad({ filter, namespace: "git-remote" }, async () => {
- const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
- const remote = res.stdout.trim()
- .replace("https://github.com/", "")
- .replace("git@github.com:", "")
- .replace(/.git$/, "");
+ const remote = "Vendicated/Vencord";
return { contents: `export default "${remote}"` };
});

View file

@ -6,6 +6,7 @@
, ncurses, swig2
, extraPackages ? []
, testers
, buildPackages
}:
let
@ -51,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: {
postFixup = lib.optionalString (lib.length extraPackages != 0) ''
# Join all plugins via symlinking
for i in ${toString extraPackages}; do
${lndir}/bin/lndir -silent $i $out
${buildPackages.xorg.lndir}/bin/lndir -silent $i $out
done
# Needed for at least the remote plugin server
for file in $out/bin/*; do

View file

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, xxd
, enableMpi ? false
, mpi
, openmp
}:
stdenv.mkDerivation rec {
pname = "hh-suite";
version = "3.3.0";
src = fetchFromGitHub {
owner = "soedinglab";
repo = "hh-suite";
rev = "v${version}";
hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw=";
};
nativeBuildInputs = [ cmake xxd ];
cmakeFlags = lib.optional stdenv.hostPlatform.isx86 "-DHAVE_SSE2=1"
++ lib.optional stdenv.hostPlatform.isAarch "-DHAVE_ARM8=1"
++ lib.optional stdenv.hostPlatform.avx2Support "-DHAVE_AVX2=1"
++ lib.optional stdenv.hostPlatform.sse4_1Support "-DHAVE_SSE4_1=1";
buildInputs = lib.optional stdenv.cc.isClang openmp
++ lib.optional enableMpi mpi;
meta = with lib; {
description = "Remote protein homology detection suite";
homepage = "https://github.com/soedinglab/hh-suite";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
};
}

View file

@ -13,26 +13,32 @@
}:
stdenv.mkDerivation rec {
pname = "kent";
version = "404";
version = "446";
src = fetchFromGitHub {
owner = "ucscGenomeBrowser";
repo = pname;
rev = "v${version}_base";
sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx";
hash = "sha256-d8gcoyMwINdHoD6xaNKt4rCKrKir99+i4KIzJ2YnxRw=";
};
buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ];
patchPhase = ''
runHook prePatch
substituteInPlace ./src/checkUmask.sh \
--replace "/bin/bash" "${bash}/bin/bash"
substituteInPlace ./src/hg/sqlEnvTest.sh \
--replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config"
runHook postPatch
'';
buildPhase = ''
runHook preBuild
export MACHTYPE=$(uname -m)
export CFLAGS="-fPIC"
export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g')
@ -56,18 +62,26 @@ stdenv.mkDerivation rec {
cd ../utils
make
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/lib
cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib
cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib
cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin
runHook postInstall
'';
meta = with lib; {
description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities";
homepage = "http://genome.ucsc.edu";
changelog = "https://github.com/ucscGenomeBrowser/kent/releases/tag/v${version}_base";
license = licenses.unfree;
maintainers = with maintainers; [ scalavision ];
platforms = platforms.linux;

View file

@ -1,17 +1,11 @@
{ bash
, brotli
, buildGoModule
, common-updater-scripts
, coreutils
, curl
, fetchurl
, forgejo
, git
, gzip
, jq
, lib
, makeWrapper
, nix
, nixosTests
, openssh
, pam
@ -20,19 +14,42 @@
, xorg
, runCommand
, stdenv
, fetchFromGitea
, buildNpmPackage
, writeShellApplication
}:
let
frontend = buildNpmPackage rec {
pname = "forgejo-frontend";
inherit (forgejo) src version;
npmDepsHash = "sha256-dB/uBuS0kgaTwsPYnqklT450ejLHcPAqBdDs3JT8Uxg=";
patches = [
./package-json-npm-build-frontend.patch
];
# override npmInstallHook
installPhase = ''
mkdir $out
cp -R ./public $out/
'';
};
in
buildGoModule rec {
pname = "forgejo";
version = "1.19.1-0";
src = fetchurl {
url = "https://codeberg.org/forgejo/forgejo/releases/download/v${version}/forgejo-src-${version}.tar.gz";
hash = "sha256-zoYEkUmJx7lt++2Rmjx/jgyZ2Y9uJH4k8VpD++My7mU=";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "forgejo";
repo = "forgejo";
rev = "v${version}";
hash = "sha256-0FmqLxQvr3bbgdzKFeAhRMvJp/xdRPW40WLH6eKNY9s=";
};
vendorHash = null;
vendorHash = "sha256-g8QJSewQFfyE/34A2JxrVnwk5vmiIRSbwrVE9LqYJrM=";
subPackages = [ "." ];
@ -59,15 +76,25 @@ buildGoModule rec {
"-X 'main.Tags=${lib.concatStringsSep " " tags}'"
];
preBuild = ''
go run build/merge-forgejo-locales.go
'';
postInstall = ''
mkdir $data
cp -R ./{public,templates,options} $data
cp -R ./{templates,options} ${frontend}/public $data
mkdir -p $out
cp -R ./options/locale $out/locale
wrapProgram $out/bin/gitea \
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
'';
# $data is not available in go-modules.drv and preBuild isn't needed
overrideModAttrs = (_: {
postPatch = null;
preBuild = null;
});
passthru = {
data-compressed = runCommand "forgejo-data-compressed" {
nativeBuildInputs = [ brotli xorg.lndir ];
@ -82,44 +109,6 @@ buildGoModule rec {
'';
tests = nixosTests.forgejo;
updateScript = lib.getExe (writeShellApplication {
name = "update-forgejo";
runtimeInputs = [
common-updater-scripts
coreutils
curl
jq
nix
];
text = ''
releases=$(curl "https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?draft=false&pre-release=false&limit=1" \
--silent \
--header "accept: application/json")
stable=$(jq '.[0]
| .tag_name[1:] as $version
| ("forgejo-src-\($version).tar.gz") as $filename
| { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \
<<< "$releases")
checksum_url=$(jq -r .sha256 <<< "$stable")
release_url=$(jq -r .html_url <<< "$stable")
version=$(jq -r .version <<< "$stable")
if [[ "${version}" = "$version" ]]; then
echo "No new version found (already at $version)"
exit 0
fi
echo "Release: $release_url"
sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1)
sri_hash=$(nix hash to-sri --type sha256 "$sha256")
update-source-version "${pname}" "$version" "$sri_hash"
'';
});
};
meta = with lib; {

View file

@ -0,0 +1,14 @@
diff --git a/package.json b/package.json
index 57dcfc2f7..c9f23dbf7 100644
--- a/package.json
+++ b/package.json
@@ -79,5 +79,8 @@
"defaults",
"not ie > 0",
"not ie_mob > 0"
- ]
+ ],
+ "scripts": {
+ "build": "node_modules/.bin/webpack"
+ }
}

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.86";
version = "0.87";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
hash = "sha256-FHjLEkxsvkYz4tK1k/pEUfDT9rfvN+K68gRc8fPVp7A=";
hash = "sha256-fG8UihNXCxc0j01ImAAI3N0ViNrd9gnTUhRKs7Il5R4=";
};
nativeBuildInputs = [ pkg-config bison ]

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.17.2";
version = "2.17.3";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
sha256 = "sha256-cPvbPvrTUMN/JYGXLat2obsulicCn0uasPdiRxtuJRg=";
sha256 = "sha256-9P6WpTefcyKtpPGbe+nxoatG/i8v8C/vOX28j9Cu1Hc=";
};
postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-XQZZEfS9ZrR/JKa11YWowsWhO8f4MVBmGkDhptMs43E=";
vendorHash = "sha256-YnGO5ccl1W3Q6DQ+6cEw7AEZTSbPcvJdQIWzWbQJ9Yo=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

View file

@ -0,0 +1,35 @@
{ lib, fetchurl, stdenvNoCC, makeWrapper, jre }:
stdenvNoCC.mkDerivation rec {
pname = "flix";
version = "0.35.0";
src = fetchurl {
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
sha256 = "sha256-liPOAQfdAYc2JlUb+BXQ5KhTOYexC1vBCIuO0nT2jhk=";
};
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
export JAR=$out/share/java/flix/flix.jar
install -D $src $JAR
makeWrapper ${jre}/bin/java $out/bin/flix \
--add-flags "-jar $JAR"
runHook postInstall
'';
meta = with lib; {
description = "The Flix Programming Language";
homepage = "https://github.com/flix/flix";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
maintainers = with maintainers; [ athas ];
inherit (jre.meta) platforms;
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper
{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk_headless, erlang, makeWrapper
, readline }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gcc flex bison texinfo jdk erlang readline ];
buildInputs = [ gcc flex bison texinfo jdk_headless erlang readline ];
patchPhase = ''
# Fix calls to programs in /bin
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
for e in $(ls $out/bin) ; do
wrapProgram $out/bin/$e \
--prefix PATH ":" "${gcc}/bin" \
--prefix PATH ":" "${jdk}/bin" \
--prefix PATH ":" "${jdk_headless}/bin" \
--prefix PATH ":" "${erlang}/bin"
done
'';

View file

@ -23,13 +23,13 @@ let
in stdenv.mkDerivation rec {
pname = "openshadinglanguage";
version = "1.11.17.0";
version = "1.12.11.0";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenShadingLanguage";
rev = "v${version}";
sha256 = "sha256-2OOkLnHLz+vmSeEDQl12SrJBTuWwbnvoTatnvm8lpbA=";
hash = "sha256-kN0+dWOUPXK8+xtR7onuPNimdn8WcaKcSRkOnaoi7BQ=";
};
cmakeFlags = [
@ -41,6 +41,7 @@ in stdenv.mkDerivation rec {
# Override defaults.
"-DLLVM_DIRECTORY=${llvm}"
"-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
"-DLLVM_BC_GENERATOR=${clang}/bin/clang++"
# Set C++11 to C++14 required for LLVM10+
"-DCMAKE_CXX_STANDARD=14"

View file

@ -7,11 +7,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "1.3.176";
version = "1.3.178";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-Kf7Yb7IrXiX5MGbpxvXSKqx3LEdHFV8+hgq43SAoe00=";
sha256 = "sha256-ihARaZ8GJsoFmlOd0qtbOAQkbs6a9zohJ9PREJoxdZg=";
};
graalvmDrv = graalvmCEPackages.graalvm19-ce;

View file

@ -2,7 +2,7 @@
{ lib
, lua
, wrapLua
, luarocks
# Whether the derivation provides a lua module or not.
, luarocksCheckHook
, luaLib
@ -38,13 +38,7 @@
# Skip wrapping of lua programs altogether
, dontWrapLuaPrograms ? false
, meta ? {}
, passthru ? {}
, doCheck ? false
, doInstallCheck ? false
# Non-Lua / system (e.g. C library) dependencies. Is a list of deps, where
# each dep is either a derivation, or an attribute set like
# { name = "rockspec external_dependencies key"; dep = derivation; }
@ -73,7 +67,6 @@
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
let
generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec";
# TODO fix warnings "Couldn't load rockspec for ..." during manifest
# construction -- from initial investigation, appears it will require
@ -82,43 +75,33 @@ let
# configured trees)
luarocks_config = "luarocks-config.lua";
# Filter out the lua derivation itself from the Lua module dependency
# closure, as it doesn't have a rock tree :)
requiredLuaRocks = lib.filter (d: d ? luaModule)
(lua.pkgs.requiredLuaModules (luarocksDrv.nativeBuildInputs ++ luarocksDrv.propagatedBuildInputs));
luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation (self: attrs // {
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) (
luarocksDrv.nativeBuildInputs ++ luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs)
);
externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation (finalAttrs: let
rocksSubdir = "${finalAttrs.pname}-${finalAttrs.version}-rocks";
luarocks_content = let
generatedConfig = luaLib.generateLuarocksConfig {
externalDeps = externalDeps ++ externalDepsGenerated;
inherit extraVariables rocksSubdir requiredLuaRocks;
};
in
''
${generatedConfig}
${extraConfig}
'';
in builtins.removeAttrs attrs ["disabled" "externalDeps" "extraVariables"] // {
name = namePrefix + pname + "-" + finalAttrs.version;
name = namePrefix + pname + "-" + self.version;
inherit rockspecVersion;
__structuredAttrs = true;
env = {
LUAROCKS_CONFIG="$PWD/${luarocks_config}";
};
generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec";
nativeBuildInputs = [
wrapLua
luarocks
] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ finalAttrs.nativeCheckInputs);
lua.pkgs.luarocks
];
buildInputs = buildInputs
++ (map (d: d.dep) externalDeps');
inherit doCheck extraVariables rockspecFilename knownRockspec externalDeps nativeCheckInputs;
buildInputs = let
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps;
in [ lua.pkgs.luarocks ]
++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs)
++ (map (d: d.dep) externalDeps')
;
# propagate lua to active setup-hook in nix-shell
propagatedBuildInputs = propagatedBuildInputs ++ [ lua ];
@ -126,25 +109,42 @@ let
# @-patterns do not capture formal argument default values, so we need to
# explicitly inherit this for it to be available as a shell variable in the
# builder
inherit rocksSubdir;
rocksSubdir = "${self.pname}-${self.version}-rocks";
luarocks_content = let
externalDepsGenerated = lib.filter (drv: !drv ? luaModule)
(self.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs);
generatedConfig = luaLib.generateLuarocksConfig {
externalDeps = lib.unique (self.externalDeps ++ externalDepsGenerated);
# Filter out the lua derivation itself from the Lua module dependency
# closure, as it doesn't have a rock tree :)
# luaLib.hasLuaModule
requiredLuaRocks = lib.filter luaLib.hasLuaModule
(lua.pkgs.requiredLuaModules (self.nativeBuildInputs ++ self.propagatedBuildInputs));
inherit (self) extraVariables rocksSubdir;
};
in
''
${generatedConfig}
${extraConfig}
'';
configurePhase = ''
runHook preConfigure
cat > ${luarocks_config} <<EOF
${luarocks_content}
${self.luarocks_content}
EOF
export LUAROCKS_CONFIG="$PWD/${luarocks_config}";
cat "$LUAROCKS_CONFIG"
''
+ lib.optionalString (rockspecFilename == null) ''
rockspecFilename="${generatedRockspecFilename}"
+ lib.optionalString (self.rockspecFilename == null) ''
rockspecFilename="${self.generatedRockspecFilename}"
''
+ lib.optionalString (knownRockspec != null) ''
+ lib.optionalString (self.knownRockspec != null) ''
# prevents the following type of error:
# Inconsistency between rockspec filename (42fm1b3d7iv6fcbhgm9674as3jh6y2sh-luv-1.22.0-1.rockspec) and its contents (luv-1.22.0-1.rockspec)
rockspecFilename="$TMP/$(stripHash ''${knownRockspec})"
cp ''${knownRockspec} "$rockspecFilename"
rockspecFilename="$TMP/$(stripHash ${self.knownRockspec})"
cp ${self.knownRockspec} "$rockspecFilename"
''
+ ''
runHook postConfigure
@ -155,9 +155,9 @@ let
nix_debug "Using LUAROCKS_CONFIG=$LUAROCKS_CONFIG"
LUAROCKS=luarocks
LUAROCKS_EXTRA_ARGS=""
if (( ''${NIX_DEBUG:-0} >= 1 )); then
LUAROCKS="$LUAROCKS --verbose"
LUAROCKS_EXTRA_ARGS=" --verbose"
fi
runHook postBuild
@ -167,7 +167,7 @@ let
wrapLuaPrograms
'' + attrs.postFixup or "";
installPhase = attrs.installPhase or ''
installPhase = ''
runHook preInstall
# work around failing luarocks test for Write access
@ -182,21 +182,17 @@ let
# maybe we could reestablish dependency checking via passing --rock-trees
nix_debug "ROCKSPEC $rockspecFilename"
nix_debug "cwd: $PWD"
$LUAROCKS make --deps-mode=all --tree=$out ''${rockspecFilename}
luarocks $LUAROCKS_EXTRA_ARGS make --deps-mode=all --tree=$out ''${rockspecFilename}
runHook postInstall
'';
checkPhase = attrs.checkPhase or ''
checkPhase = ''
runHook preCheck
$LUAROCKS test
luarocks test
runHook postCheck
'';
LUAROCKS_CONFIG="$PWD/${luarocks_config}";
shellHook = ''
runHook preShell
export LUAROCKS_CONFIG="$PWD/${luarocks_config}";
@ -205,16 +201,14 @@ let
passthru = {
inherit lua; # The lua interpreter
inherit externalDeps;
inherit luarocks_content;
} // passthru;
};
meta = {
platforms = lua.meta.platforms;
# add extra maintainer(s) to every package
maintainers = (meta.maintainers or []) ++ [ ];
maintainers = (attrs.meta.maintainers or []) ++ [ ];
broken = disabled;
} // meta;
} // attrs.meta;
}));
in
luarocksDrv

View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
libXi
# libXext is a transitive dependency of libXi
libXext
] ++ lib.optionals stdenv.hostPlatform.isLinux [
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemd) [
# libsystemd is a needed for dbus-broker support
systemd
];

View file

@ -61,13 +61,13 @@
stdenv.mkDerivation rec {
pname = "gdal";
version = "3.6.3";
version = "3.6.4";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "v${version}";
hash = "sha256-Rg/dvSkq1Hn8NgZEE0ID92Vihyw7MA78OBnON8Riy38=";
hash = "sha256-pGdZmQBUuNCk9/scUvq4vduINu5gqtCRLaz7QE2e6WU=";
};
nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libqglviewer";
version = "2.8.0";
version = "2.9.1";
src = fetchurl {
url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
sha256 = "sha256-A9LTOUhmzcQZ9DcTrtgnJixxTMT6zd6nw7odk9rjxMw=";
sha256 = "sha256-J4+DKgstPvvg1pUhGd+8YFh5C3oPGHaQmDfLZzzkP/M=";
};
nativeBuildInputs = [ qmake ];

View file

@ -65,7 +65,7 @@ rec {
so that luaRequireModules can be run later
*/
toLuaModule = drv:
drv.overrideAttrs( oldAttrs: {
drv.overrideAttrs(oldAttrs: {
# Use passthru in order to prevent rebuilds when possible.
passthru = (oldAttrs.passthru or {}) // {
luaModule = lua;
@ -81,8 +81,7 @@ rec {
};
*/
generateLuarocksConfig = {
externalDeps
externalDeps
# a list of lua derivations
, requiredLuaRocks
, extraVariables ? {}

View file

@ -56,6 +56,7 @@ with prev;
patches = [
./bit32.patch
];
meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
});
busted = prev.busted.overrideAttrs (oa: {
@ -73,13 +74,7 @@ with prev;
'';
});
cqueues = (prev.luaLib.overrideLuarocks prev.cqueues (drv: {
externalDeps = [
{ name = "CRYPTO"; dep = openssl; }
{ name = "OPENSSL"; dep = openssl; }
];
disabled = luaOlder "5.1" || luaAtLeast "5.4";
})).overrideAttrs (oa: rec {
cqueues = prev.cqueues.overrideAttrs (oa: rec {
# Parse out a version number without the Lua version inserted
version = with lib; let
version' = prev.cqueues.version;
@ -89,10 +84,17 @@ with prev;
in
"${date}-${rev}";
meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
nativeBuildInputs = oa.nativeBuildInputs ++ [
gnum4
];
externalDeps = [
{ name = "CRYPTO"; dep = openssl; }
{ name = "OPENSSL"; dep = openssl; }
];
# Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
# version, which doesn't work well for us, so modify it
postConfigure = let inherit (prev.cqueues) pname; in
@ -109,7 +111,7 @@ with prev;
'';
});
cyrussasl = prev.luaLib.overrideLuarocks prev.cyrussasl (drv: {
cyrussasl = prev.cyrussasl.overrideAttrs (drv: {
externalDeps = [
{ name = "LIBSASL"; dep = cyrus_sasl; }
];
@ -138,7 +140,11 @@ with prev;
*/
});
ldbus = prev.luaLib.overrideLuarocks prev.ldbus (drv: {
lpty = prev.lpty.overrideAttrs (oa: {
meta.broken = luaOlder "5.1" || luaAtLeast "5.3";
});
ldbus = prev.ldbus.overrideAttrs (oa: {
extraVariables = {
DBUS_DIR = "${dbus.lib}";
DBUS_ARCH_INCDIR = "${dbus.lib}/lib/dbus-1.0/include";
@ -149,7 +155,7 @@ with prev;
];
});
ljsyscall = prev.luaLib.overrideLuarocks prev.ljsyscall (drv: rec {
ljsyscall = prev.ljsyscall.overrideAttrs (oa: rec {
version = "unstable-20180515";
# package hasn't seen any release for a long time
src = fetchFromGitHub {
@ -163,9 +169,9 @@ with prev;
preConfigure = ''
sed -i 's/lua == 5.1/lua >= 5.1, < 5.3/' ${knownRockspec}
'';
disabled = luaOlder "5.1" || luaAtLeast "5.3";
meta.broken = luaOlder "5.1" || luaAtLeast "5.3";
propagatedBuildInputs = with lib; optional (!isLuaJIT) luaffi;
propagatedBuildInputs = with lib; oa.propagatedBuildInputs ++ optional (!isLuaJIT) luaffi;
});
lgi = prev.lgi.overrideAttrs (oa: {
@ -228,7 +234,7 @@ with prev;
'';
});
lmpfrlib = prev.luaLib.overrideLuarocks prev.lmpfrlib (drv: {
lmpfrlib = prev.lmpfrlib.overrideAttrs (oa: {
externalDeps = [
{ name = "GMP"; dep = gmp; }
{ name = "MPFR"; dep = mpfr; }
@ -238,32 +244,32 @@ with prev;
'';
});
lrexlib-gnu = prev.luaLib.overrideLuarocks prev.lrexlib-gnu (drv: {
buildInputs = [
lrexlib-gnu = prev.lrexlib-gnu.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
gnulib
];
});
lrexlib-pcre = prev.luaLib.overrideLuarocks prev.lrexlib-pcre (drv: {
lrexlib-pcre = prev.lrexlib-pcre.overrideAttrs (oa: {
externalDeps = [
{ name = "PCRE"; dep = pcre; }
];
});
lrexlib-posix = prev.luaLib.overrideLuarocks prev.lrexlib-posix (drv: {
buildInputs = [
lrexlib-posix = prev.lrexlib-posix.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
glibc.dev
];
});
lua-curl = prev.luaLib.overrideLuarocks prev.lua-curl (drv: {
buildInputs = [
curl
lua-curl = prev.lua-curl.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
curl.dev
];
});
lua-iconv = prev.luaLib.overrideLuarocks prev.lua-iconv (drv: {
buildInputs = [
lua-iconv = prev.lua-iconv.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
libiconv
];
});
@ -276,39 +282,39 @@ with prev;
'';
});
lua-zlib = prev.luaLib.overrideLuarocks prev.lua-zlib (drv: {
buildInputs = [
lua-zlib = prev.lua-zlib.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
zlib.dev
];
disabled = luaOlder "5.1" || luaAtLeast "5.4";
meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
});
luadbi-mysql = prev.luaLib.overrideLuarocks prev.luadbi-mysql (drv: {
luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: {
extraVariables = {
# Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql";
MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql";
};
buildInputs = [
buildInputs = oa.buildInputs ++ [
mariadb.client
libmysqlclient
];
});
luadbi-postgresql = prev.luaLib.overrideLuarocks prev.luadbi-postgresql (drv: {
buildInputs = [
luadbi-postgresql = prev.luadbi-postgresql.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
postgresql
];
});
luadbi-sqlite3 = prev.luaLib.overrideLuarocks prev.luadbi-sqlite3 (drv: {
luadbi-sqlite3 = prev.luadbi-sqlite3.overrideAttrs (oa: {
externalDeps = [
{ name = "SQLITE"; dep = sqlite; }
];
});
luaevent = prev.luaLib.overrideLuarocks prev.luaevent (drv: {
propagatedBuildInputs = [
luaevent = prev.luaevent.overrideAttrs (oa: {
propagatedBuildInputs = oa.propagatedBuildInputs ++ [
luasocket
];
externalDeps = [
@ -317,7 +323,7 @@ with prev;
disabled = luaOlder "5.1" || luaAtLeast "5.4";
});
luaexpat = prev.luaLib.overrideLuarocks prev.luaexpat (drv: {
luaexpat = prev.luaexpat.overrideAttrs (_: {
externalDeps = [
{ name = "EXPAT"; dep = expat; }
];
@ -325,7 +331,7 @@ with prev;
# TODO Somehow automatically amend buildInputs for things that need luaffi
# but are in luajitPackages?
luaffi = prev.luaLib.overrideLuarocks prev.luaffi (drv: {
luaffi = prev.luaffi.overrideAttrs (oa: {
# The packaged .src.rock version is pretty old, and doesn't work with Lua 5.3
src = fetchFromGitHub {
owner = "facebook";
@ -334,75 +340,74 @@ with prev;
sha256 = "1nwx6sh56zfq99rcs7sph0296jf6a9z72mxknn0ysw9fd7m1r8ig";
};
knownRockspec = with prev.luaffi; "${pname}-${version}.rockspec";
disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT;
meta.broken = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT;
});
lualdap = prev.luaLib.overrideLuarocks prev.lualdap (drv: {
lualdap = prev.lualdap.overrideAttrs (_: {
externalDeps = [
{ name = "LDAP"; dep = openldap; }
];
});
luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: {
luaossl = prev.luaossl.overrideAttrs (_: {
externalDeps = [
{ name = "CRYPTO"; dep = openssl; }
{ name = "OPENSSL"; dep = openssl; }
];
});
luaposix = prev.luaLib.overrideLuarocks prev.luaposix (drv: {
luaposix = prev.luaposix.overrideAttrs (_: {
externalDeps = [
{ name = "CRYPT"; dep = libxcrypt; }
];
});
luasec = prev.luaLib.overrideLuarocks prev.luasec (drv: {
luasec = prev.luasec.overrideAttrs (oa: {
externalDeps = [
{ name = "OPENSSL"; dep = openssl; }
];
});
luasql-sqlite3 = prev.luaLib.overrideLuarocks prev.luasql-sqlite3 (drv: {
luasql-sqlite3 = prev.luasql-sqlite3.overrideAttrs (oa: {
externalDeps = [
{ name = "SQLITE"; dep = sqlite; }
];
});
luasystem = prev.luaLib.overrideLuarocks prev.luasystem (drv: lib.optionalAttrs stdenv.isLinux {
luasystem = prev.luasystem.overrideAttrs (oa: lib.optionalAttrs stdenv.isLinux {
buildInputs = [ glibc.out ];
});
luazip = prev.luaLib.overrideLuarocks prev.luazip (drv: {
buildInputs = [
luazip = prev.luazip.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
zziplib
];
});
lua-yajl = prev.luaLib.overrideLuarocks prev.lua-yajl (drv: {
buildInputs = [
lua-yajl = prev.lua-yajl.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
yajl
];
});
luaunbound = prev.luaLib.overrideLuarocks prev.luaunbound (drv: {
luaunbound = prev.luaunbound.overrideAttrs (oa: {
externalDeps = [
{ name = "libunbound"; dep = unbound; }
];
});
lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: {
lua-subprocess = prev.lua-subprocess.overrideAttrs (oa: {
meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
});
lush-nvim = prev.lush-nvim.overrideAttrs (drv: {
doCheck = false;
});
luuid = (prev.luaLib.overrideLuarocks prev.luuid (drv: {
luuid = prev.luuid.overrideAttrs (oa: {
externalDeps = [
{ name = "LIBUUID"; dep = libuuid; }
];
disabled = luaOlder "5.1" || (luaAtLeast "5.4");
})).overrideAttrs (oa: {
meta = oa.meta // {
platforms = lib.platforms.linux;
};
# Trivial patch to make it work in both 5.1 and 5.2. Basically just the
# tiny diff between the two upstream versions placed behind an #if.
# Upstreams:
@ -415,6 +420,10 @@ with prev;
postConfigure = ''
sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|'
'';
meta = oa.meta // {
broken = luaOlder "5.1" || (luaAtLeast "5.4");
platforms = lib.platforms.linux;
};
});
@ -444,14 +453,14 @@ with prev;
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
};
luv = prev.luaLib.overrideLuarocks prev.luv (drv: {
luv = prev.luv.overrideAttrs (oa: {
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = oa.nativeBuildInputs ++ [ pkg-config ];
buildInputs = [ libuv ];
# Use system libuv instead of building local and statically linking
extraVariables = {
"WITH_SHARED_LIBUV" = "ON";
WITH_SHARED_LIBUV = "ON";
};
# we unset the LUA_PATH since the hook erases the interpreter defaults (To fix)
@ -460,22 +469,21 @@ with prev;
unset LUA_PATH
rm tests/test-{dns,thread}.lua
'';
passthru.libluv = final.libluv;
});
lyaml = prev.luaLib.overrideLuarocks prev.lyaml (oa: {
lyaml = prev.lyaml.overrideAttrs (oa: {
buildInputs = [
libyaml
];
});
mpack = prev.luaLib.overrideLuarocks prev.mpack (drv: {
buildInputs = [ libmpack ];
# the rockspec doesn't use the makefile so you may need to export more flags
USE_SYSTEM_LUA = "yes";
USE_SYSTEM_MPACK = "yes";
mpack = prev.mpack.overrideAttrs (drv: {
buildInputs = (drv.buildInputs or []) ++ [ libmpack ];
env = {
# the rockspec doesn't use the makefile so you may need to export more flags
USE_SYSTEM_LUA = "yes";
USE_SYSTEM_MPACK = "yes";
};
});
rapidjson = prev.rapidjson.overrideAttrs (oa: {
@ -485,24 +493,23 @@ with prev;
'';
});
readline = (prev.luaLib.overrideLuarocks prev.readline (drv: {
unpackCmd = ''
unzip "$curSrc"
tar xf *.tar.gz
'';
propagatedBuildInputs = prev.readline.propagatedBuildInputs ++ [ readline.out ];
readline = prev.readline.overrideAttrs (oa: {
propagatedBuildInputs = oa.propagatedBuildInputs ++ [ readline.out ];
extraVariables = rec {
READLINE_INCDIR = "${readline.dev}/include";
HISTORY_INCDIR = READLINE_INCDIR;
};
})).overrideAttrs (old: {
unpackCmd = ''
unzip "$curSrc"
tar xf *.tar.gz
'';
# Without this, source root is wrongly set to ./readline-2.6/doc
setSourceRoot = ''
sourceRoot=./readline-${lib.versions.majorMinor old.version}
sourceRoot=./readline-${lib.versions.majorMinor oa.version}
'';
});
sqlite = prev.luaLib.overrideLuarocks prev.sqlite (drv: {
sqlite = prev.sqlite.overrideAttrs (drv: {
doCheck = true;
nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped ];
@ -532,6 +539,11 @@ with prev;
make all
'';
});
vstruct = prev.vstruct.overrideAttrs (_: {
meta.broken = (luaOlder "5.1" || luaAtLeast "5.3");
});
vusted = prev.vusted.overrideAttrs (_: {
# make sure vusted_entry.vim doesn't get wrapped
postInstall = ''

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-resource";
version = "22.0.0";
version = "23.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-/rXZeeGLUvLP0CO0oKM+VKb3bMaiUtyM117OLGMpjpQ=";
hash = "sha256-5hN6vDJE797Mcw/u0FsXVCzNr4c1pmuRQa0KN42HKSI=";
};
propagatedBuildInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bx-py-utils";
version = "76";
version = "78";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "boxine";
repo = "bx_py_utils";
rev = "refs/tags/v${version}";
hash = "sha256-daqbF+DCt4yvKHbEzwJyOzEgsYLqhR31a0pYqp9OSvo=";
hash = "sha256-dMcbv/qf+8Qzu47MVFU2QUviT/vjKsHp+45F/6NOlWo=";
};
nativeBuildInputs = [

View file

@ -1,4 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, bleach
, mt-940
, requests
@ -8,15 +11,17 @@
}:
buildPythonPackage rec {
version = "3.1.0";
version = "4.0.0";
pname = "fints";
disabled = isPy27;
disabled = pythonOlder "3.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "raphaelm";
repo = "python-fints";
rev = "v${version}";
hash = "sha256-3frJIEZgVnZD2spWYIuEtUt7MVsU/Zj82HOB9fKYQWE=";
hash = "sha256-SREprcrIdeKVpL22IViexwiKmFfbT2UbKEmxtVm6iu0=";
};
propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];

View file

@ -5,17 +5,21 @@
, flask
, pytestCheckHook
, python-socketio
, pythonOlder
, redis
}:
buildPythonPackage rec {
pname = "Flask-SocketIO";
version = "5.1.1";
version = "5.3.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "miguelgrinberg";
repo = "Flask-SocketIO";
rev = "v${version}";
hash = "sha256-PnNJEtcWaisOlt6OmYUl97TlZb9cK2ORvtEcmGPxSB0=";
hash = "sha256-oqy6tSk569QaSkeNsyXuaD6uUB3yuEFg9Jwh5rneyOE=";
};
propagatedBuildInputs = [
@ -24,8 +28,8 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
coverage
pytestCheckHook
redis
];
pytestFlagsArray = [

View file

@ -20,6 +20,12 @@ buildPythonPackage rec {
dontConfigure = true;
postPatch = ''
# https://github.com/nexB/gemfileparser2/pull/8
substituteInPlace setup.cfg \
--replace ">=3.6.*" ">=3.6"
'';
nativeBuildInputs = [
setuptools-scm
];

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
version = "2.15.0";
version = "2.16.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-/tm08lOWjQMjV1IVov8cX0EJsKjwxMQD2NIcJnoHdVc=";
hash = "sha256-CspzN6DaD62IBATlB/+vefIf2oMT9Cwr9kHq63V6k2Q=";
};
propagatedBuildInputs = [

View file

@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "jaraco-abode";
version = "4.1.0";
version = "5.0.1";
disabled = pythonOlder "3.7";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "jaraco";
repo = "jaraco.abode";
rev = "refs/tags/v${version}";
hash = "sha256-MD8Piwgm+WStEKX+LP0sCezRI4gdHmHis/XMJ8Vuw04=";
hash = "sha256-vKlvZrgRKv2C43JLfl4Wum4Icz9yOKEaB6qKapZ0rwQ=";
};
postPatch = ''
@ -86,6 +86,7 @@ buildPythonPackage rec {
];
meta = with lib; {
changelog = "https://github.com/jaraco/jaraco.abode/blob/${src.rev}/CHANGES.rst";
homepage = "https://github.com/jaraco/jaraco.abode";
description = "Library interfacing to the Abode home security system";
license = licenses.mit;

View file

@ -1,15 +1,21 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "pydsdl";
version = "1.12.1";
disabled = pythonOlder "3.5"; # only python>=3.5 is supported
version = "1.18.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "UAVCAN";
owner = "OpenCyphal";
repo = pname;
rev = version;
hash = "sha256-5AwwqduIvLSZk6WcI59frwRKwjniQXfNWWVsy6V6I1E=";
rev = "refs/tags/${version}";
hash = "sha256-sn7KoJmJbr7Y+N9PAXyhJnts/hW+Gi06nrHj5VIDZMU=";
};
# allow for writable directory for darwin
@ -17,7 +23,7 @@
export HOME=$TMPDIR
'';
# repo doesn't contain tests
# Module doesn't contain tests
doCheck = false;
pythonImportsCheck = [
@ -25,12 +31,17 @@
];
meta = with lib; {
description = "A UAVCAN DSDL compiler frontend implemented in Python";
description = "Library to process Cyphal DSDL";
longDescription = ''
It supports all DSDL features defined in the UAVCAN specification.
PyDSDL is a Cyphal DSDL compiler front-end implemented in Python. It accepts
a DSDL namespace at the input and produces a well-annotated abstract syntax
tree (AST) at the output, evaluating all constant expressions in the process.
All DSDL features defined in the Cyphal Specification are supported. The
library should, in theory, work on any platform and with any Python
implementation.
'';
homepage = "https://uavcan.org";
maintainers = with maintainers; [ wucke13 ];
homepage = "https://pydsdl.readthedocs.io/";
license = licenses.mit;
maintainers = with maintainers; [ wucke13 ];
};
}

View file

@ -11,15 +11,22 @@
buildPythonPackage rec {
pname = "python-ipmi";
version = "0.5.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kontron";
repo = pname;
rev = version;
rev = "refs/tags/${version}";
hash = "sha256-IXEq3d1nXGEndciQw2MJ1Abc0vmEYez+k6aWGSWEzWA=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "version=version," "version='${version}',"
'';
propagatedBuildInputs = [
future
];
@ -30,7 +37,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "pyipmi" ];
pythonImportsCheck = [
"pyipmi"
];
meta = with lib; {
description = "Python IPMI Library";

View file

@ -27,6 +27,11 @@ buildPythonPackage rec {
hash = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "version=__version__," 'version="${version}",'
'';
propagatedBuildInputs = [
certifi
charset-normalizer

View file

@ -4,6 +4,7 @@
, authlib
, requests
, nose
, pyjwt
, pythonOlder
, pytz
, responses
@ -26,6 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
authlib
pyjwt
requests
zeep
];
@ -42,9 +44,14 @@ buildPythonPackage rec {
runHook postCheck
'';
pythonImportsCheck = [
"simple_salesforce"
];
meta = with lib; {
description = "A very simple Salesforce.com REST API client for Python";
homepage = "https://github.com/simple-salesforce/simple-salesforce";
changelog = "https://github.com/simple-salesforce/simple-salesforce/blob/v${version}/CHANGES";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
};

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "sphinxext-opengraph";
version = "0.8.1";
version = "0.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "wpilibsuite";
repo = "sphinxext-opengraph";
rev = "refs/tags/v${version}";
hash = "sha256-3q/OKkLtyA1Dw2PfTT4Fmzyn5qPbjprekpE7ItnFNUo=";
hash = "sha256-SrZTtVzEp4E87fzisWKHl8iRP49PWt5kkJq62CqXrBc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "trove-classifiers";
version = "2023.4.18";
version = "2023.4.22";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-n4kqg8y9+eZphhqUfGsD1bkah/RJrv7x12/EFp943bo=";
hash = "sha256-ZejLOSnjeIFB25Cgd2t2/K++tUik++au5L/ZZW6JmTk=";
};
nativeBuildInputs = [

View file

@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
version = "0.7.20"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
dependencies = [
"memchr",
]
[[package]]
name = "analysis"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"config",
"diagnostic",
@ -107,7 +107,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chain-map"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"fast-hash",
"str-util",
@ -116,11 +116,11 @@ dependencies = [
[[package]]
name = "char-name"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]]
name = "cm-syntax"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"lex-util",
"paths",
@ -132,14 +132,14 @@ dependencies = [
[[package]]
name = "code-h2-md-map"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"fast-hash",
]
[[package]]
name = "config"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"fast-hash",
"serde",
@ -206,7 +206,7 @@ dependencies = [
[[package]]
name = "diagnostic"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]]
name = "diff"
@ -223,7 +223,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
[[package]]
name = "elapsed"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"log",
]
@ -271,7 +271,7 @@ dependencies = [
[[package]]
name = "event-parse"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"drop_bomb",
"rowan",
@ -281,7 +281,7 @@ dependencies = [
[[package]]
name = "fast-hash"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"rustc-hash",
]
@ -299,7 +299,7 @@ dependencies = [
[[package]]
name = "fmt-util"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]]
name = "form_urlencoded"
@ -352,7 +352,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "identifier-case"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]]
name = "idna"
@ -367,7 +367,7 @@ dependencies = [
[[package]]
name = "idx"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]]
name = "indexmap"
@ -381,7 +381,7 @@ dependencies = [
[[package]]
name = "input"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"cm-syntax",
"config",
@ -440,7 +440,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524"
[[package]]
name = "lang-srv"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"analysis",
"anyhow",
@ -468,19 +468,19 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lex-util"
version = "0.9.3"
version = "0.9.4"
[[package]]
name = "libc"
version = "0.2.141"
version = "0.2.142"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
[[package]]
name = "linux-raw-sys"
version = "0.3.1"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c"
[[package]]
name = "log"
@ -533,7 +533,7 @@ dependencies = [
[[package]]
name = "millet-cli"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"analysis",
"config",
@ -543,11 +543,12 @@ dependencies = [
"panic-hook",
"paths",
"pico-args",
"sml-naive-fmt",
]
[[package]]
name = "millet-ls"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"anyhow",
"env_logger",
@ -567,7 +568,7 @@ dependencies = [
[[package]]
name = "mlb-hir"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"fast-hash",
"paths",
@ -578,7 +579,7 @@ dependencies = [
[[package]]
name = "mlb-statics"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"config",
"diagnostic",
@ -602,7 +603,7 @@ dependencies = [
[[package]]
name = "mlb-syntax"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"lex-util",
"paths",
@ -668,7 +669,7 @@ dependencies = [
[[package]]
name = "panic-hook"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"better-panic",
]
@ -676,7 +677,7 @@ dependencies = [
[[package]]
name = "paths"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"fast-hash",
"glob",
@ -687,7 +688,7 @@ dependencies = [
[[package]]
name = "pattern-match"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"fast-hash",
]
@ -748,9 +749,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.7.3"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
checksum = "ac6cf59af1067a3fb53fbe5c88c053764e930f932be1d71d3ffe032cbe147f59"
dependencies = [
"aho-corasick",
"memchr",
@ -759,9 +760,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.29"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
checksum = "b6868896879ba532248f33598de5181522d8b3d9d724dfd230911e1a7d4822f5"
[[package]]
name = "rowan"
@ -778,9 +779,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
version = "0.1.22"
version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b"
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustc-hash"
@ -790,9 +791,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustix"
version = "0.37.11"
version = "0.37.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0"
dependencies = [
"bitflags",
"errno",
@ -861,7 +862,7 @@ dependencies = [
[[package]]
name = "slash-var-path"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"fast-hash",
"str-util",
@ -869,14 +870,14 @@ dependencies = [
[[package]]
name = "sml-comment"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"sml-syntax",
]
[[package]]
name = "sml-dynamics"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"fast-hash",
"sml-mir",
@ -885,7 +886,7 @@ dependencies = [
[[package]]
name = "sml-file-syntax"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"config",
"elapsed",
@ -899,7 +900,7 @@ dependencies = [
[[package]]
name = "sml-fixity"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"fast-hash",
"once_cell",
@ -908,7 +909,7 @@ dependencies = [
[[package]]
name = "sml-hir"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"la-arena",
"sml-lab",
@ -919,7 +920,7 @@ dependencies = [
[[package]]
name = "sml-hir-lower"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"config",
"diagnostic",
@ -933,14 +934,14 @@ dependencies = [
[[package]]
name = "sml-lab"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"str-util",
]
[[package]]
name = "sml-lex"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"diagnostic",
"lex-util",
@ -950,20 +951,29 @@ dependencies = [
[[package]]
name = "sml-libs"
version = "0.1.0"
source = "git+https://github.com/azdavis/sml-libs.git#360d865bfe1e8afc4f8e483e0ac8f53da0593041"
source = "git+https://github.com/azdavis/sml-libs.git#7ae671a607a143fd8529e34019f96f6fb275df45"
[[package]]
name = "sml-mir"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"sml-lab",
"sml-scon",
"uniq",
]
[[package]]
name = "sml-mir-lower"
version = "0.9.4"
dependencies = [
"sml-hir",
"sml-mir",
"uniq",
]
[[package]]
name = "sml-naive-fmt"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"fast-hash",
"sml-comment",
@ -972,11 +982,11 @@ dependencies = [
[[package]]
name = "sml-namespace"
version = "0.9.3"
version = "0.9.4"
[[package]]
name = "sml-parse"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"diagnostic",
"event-parse",
@ -988,14 +998,14 @@ dependencies = [
[[package]]
name = "sml-path"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"str-util",
]
[[package]]
name = "sml-scon"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"num-bigint",
"num-traits",
@ -1004,7 +1014,7 @@ dependencies = [
[[package]]
name = "sml-statics"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"chain-map",
"config",
@ -1025,7 +1035,7 @@ dependencies = [
[[package]]
name = "sml-statics-types"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"chain-map",
"code-h2-md-map",
@ -1042,7 +1052,7 @@ dependencies = [
[[package]]
name = "sml-syntax"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"char-name",
"code-h2-md-map",
@ -1055,7 +1065,7 @@ dependencies = [
[[package]]
name = "sml-ty-var-scope"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"fast-hash",
"sml-hir",
@ -1073,7 +1083,7 @@ dependencies = [
[[package]]
name = "str-util"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"smol_str",
]
@ -1103,7 +1113,7 @@ dependencies = [
[[package]]
name = "syntax-gen"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"fast-hash",
"identifier-case",
@ -1123,7 +1133,7 @@ dependencies = [
[[package]]
name = "tests"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"analysis",
"cm-syntax",
@ -1148,7 +1158,7 @@ dependencies = [
[[package]]
name = "text-pos"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"fast-hash",
"text-size-util",
@ -1163,7 +1173,7 @@ checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
[[package]]
name = "text-size-util"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
dependencies = [
"text-size",
]
@ -1186,7 +1196,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "token"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]]
name = "toml"
@ -1225,7 +1235,7 @@ dependencies = [
[[package]]
name = "topo-sort"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]]
name = "ungrammar"
@ -1272,7 +1282,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "uniq"
version = "0.1.0"
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032"
[[package]]
name = "url"
@ -1457,7 +1467,7 @@ dependencies = [
[[package]]
name = "xtask"
version = "0.9.3"
version = "0.9.4"
dependencies = [
"anyhow",
"flate2",

View file

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
hash = "sha256-swT16F/gOHiAeZGrD9O4THIHMXDQOpsaUsSjhpkw3fU=";
hash = "sha256-wupTEZGsfqH7Ekqr5eiQ5Ne1cD8Fw3cpaZJVsOlXJyw=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"char-name-0.1.0" = "sha256-hO7SO1q5hPY5wJJ8A+OxxCI7GeHtdMz34OWu9ViVny0=";
"sml-libs-0.1.0" = "sha256-+sxaPBG5qBIC195BFQYH8Yo6juuelGZzztCUiS45WRg=";
"char-name-0.1.0" = "sha256-IisHUxD6YQIb7uUZ1kYd3hnH1v87OhMBYDqJpBGmwfQ=";
"sml-libs-0.1.0" = "sha256-0gRiXJAGddrrbgI3AhlWqVKipNZI0OxMTrkWdcSbG7A=";
};
};

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "okteto";
version = "2.14.2";
version = "2.14.3";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
hash = "sha256-2bO6konOAyrCD+t31ZJ2+Ptp26ylY9wr1uArFu9rlnI=";
hash = "sha256-E96IAAbWmFIQILUU3WLjX6NAXzwIkrbEgKUs4wrh8z4=";
};
vendorHash = "sha256-b2qxvP9spXEJVYOq7o0VG2WOxzUchwtLaY97/2IYoV4=";

View file

@ -0,0 +1,25 @@
{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "cargo-pgx";
version = "0.7.1";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-t/gdlrBeP6KFkBFJiZUa8KKVJVYMf6753vQGKJdytss=";
};
cargoSha256 = "sha256-muce9wT4LAJmfNLWWEShARnpZgglXe/KrfxlitmGgXk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Cargo subcommand for pgx to make Postgres extension development easy";
homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx";
license = licenses.mit;
maintainers = with maintainers; [ typetetris ];
};
}

View file

@ -0,0 +1,25 @@
{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "cargo-pgx";
version = "0.7.4";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-uyMWfxI+A8mws8oZFm2pmvr7hJgSNIb328SrVtIDGdA=";
};
cargoSha256 = "sha256-RgpL/hJdfrtLDANs5U53m5a6aEEAhZ9SFOIM7V8xABM=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Cargo subcommand for pgx to make Postgres extension development easy";
homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx";
license = licenses.mit;
maintainers = with maintainers; [ typetetris ];
};
}

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-semver-checks";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "obi1kenobi";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tZ83Lxo7yKpFQrD1rnm/3YaT3MgiVb/jL2OVdt491xg=";
sha256 = "sha256-z7mDGWU498KU6lEHqLhl0HdTA55Wz3RbZOlF6g1gwN4=";
};
cargoSha256 = "sha256-k0dc/bOkIcLP++ZH+rh01do5kcVDh/8hNGM3MPhg/0g=";
cargoSha256 = "sha256-JQdL4D6ECH8wLOCcAGm7HomJAfJD838KfI4/IRAeqD0=";
nativeBuildInputs = [ pkg-config ];

View file

@ -17,17 +17,17 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.3.421";
version = "1.3.457";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-MZXnIkOVv49HEkatLEGbIxeJyaiOrh2XLTp5TdvMhk8=";
hash = "sha256-PN/Gt2iDOWsbKspyWYKjnX98xF6NQuGVFjlEg3ZZpio=";
fetchSubmodules = true;
};
vendorHash = "sha256-TPm2X0QERJ5lBfojOAWIS60CeAz+Ps2REFtNIT2zGnY=";
vendorHash = "sha256-vI8EyZgjJA89UmqoDuh/H+qQzAKO9pyqpmA8hci9cco=";
buildInputs = [
alsa-lib

View file

@ -46,11 +46,11 @@ in
stdenv.mkDerivation rec {
inherit pname;
version = "4.3.4";
version = "4.3.5";
src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
sha256 = "sha256-l4QAF+mTaWi/BNPizqpTPw0KdcrYjw71K+D325/BKdo=";
sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM=";
};
buildInputs = [

View file

@ -227,13 +227,19 @@ in {
# to be adapted
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "6.2";
latestCompatibleLinuxPackages = linuxPackages_6_1;
kernelCompatible =
if stdenv'.isx86_64
then kernel.kernelOlder "6.3"
else kernel.kernelOlder "6.2";
latestCompatibleLinuxPackages =
if stdenv'.isx86_64
then linuxPackages_6_2
else linuxPackages_6_1;
# this package should point to the latest release.
version = "2.1.9";
version = "2.1.11";
sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc=";
sha256 = "tJLwyqUj1l5F0WKZDeMGrEFa8fc/axKqm31xtN51a5M=";
};
zfsUnstable = common {
@ -254,19 +260,11 @@ in {
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.1.10-staging-2023-03-15";
rev = "a5c469c5f380b09705ad0bee15e2ca7a5f78213c";
version = "2.1.12-staging-2023-04-18";
rev = "e25f9131d679692704c11dc0c1df6d4585b70c35";
sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U=";
sha256 = "tJLwyqUj1l5F0WKZDeMGrEFa8fc/axKqm31xtN51a5M=";
isUnstable = true;
# Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658
extraPatches = [
(fetchpatch {
url = "https://github.com/openzfs/zfs/pull/14668.patch";
hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk=";
})
];
};
}

View file

@ -37,24 +37,20 @@
let
# remove when upgrading to pjsip >2.13
pjsip_patches = [
pjsip_2_13_patches = [
(fetchpatch {
name = "0152-CVE-2022-39269.patch";
url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch";
sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ=";
name = "CVE-2022-23537.patch";
url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch";
sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA=";
})
(fetchpatch {
name = "pjsip-2.12.1-CVE-2022-23537.patch";
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23537.patch";
sha256 = "sha256-KNSnHt0/o1qJk4r2z5bxbYxKAa7WBtzGOhRXkru3VK4=";
})
(fetchpatch {
name = "pjsip-2.12.1-CVE-2022-23547.patch";
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23547.patch";
sha256 = "sha256-0iEr/Z4UQpWsTXYWVYzWWk7MQDOFnTQ1BBYpynGLTVQ=";
name = "CVE-2022-23547.patch";
url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch";
sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k=";
})
];
common = { version, sha256, externals }: stdenv.mkDerivation {
common = { version, sha256, externals, pjsip_patches ? [ ] }: stdenv.mkDerivation {
inherit version;
pname = "asterisk"
+ lib.optionalString ldapSupport "-ldap";
@ -159,9 +155,12 @@ let
};
};
pjproject_2_12_1 = fetchurl {
url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.12.1/pjproject-2.12.1.tar.bz2";
hash = "sha256-DiNH1hB5ZheYzyUjFyk1EtlsMJlgjf+QRVKjEk+hNjc=";
pjproject_2_13 = fetchurl
{
url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13/pjproject-2.13.tar.bz2";
hash = "sha256-Zj93PUAct13KVR5taOWEbQdKq76wicaBTNHpHC0rICY=";
} // {
pjsip_patches = pjsip_2_13_patches;
};
mp3-202 = fetchsvn {
@ -180,13 +179,18 @@ let
# auto-generated by update.py
versions = lib.mapAttrs
(_: { version, sha256 }: common {
inherit version sha256;
externals = {
"externals_cache/pjproject-2.12.1.tar.bz2" = pjproject_2_12_1;
"addons/mp3" = mp3-202;
};
})
(_: { version, sha256 }:
let
pjsip = pjproject_2_13;
in
common {
inherit version sha256;
inherit (pjsip) pjsip_patches;
externals = {
"externals_cache/${pjsip.name}" = pjsip;
"addons/mp3" = mp3-202;
};
})
(lib.importJSON ./versions.json);
updateScript_python = python39.withPackages (p: with p; [ packaging beautifulsoup4 requests ]);
@ -197,18 +201,20 @@ let
in
{
# Supported releases (as of 2022-04-05).
# Supported releases (as of 2023-04-19).
# v16 and v19 have been dropped because they go EOL before the NixOS 23.11 release.
# Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
# Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
#
# Series Type Rel. Date Sec. Fixes EOL
# 16.x LTS 2018-10-09 2022-10-09 2023-10-09
# 16.x LTS 2018-10-09 2022-10-09 2023-10-09 (dropped)
# 18.x LTS 2020-10-20 2024-10-20 2025-10-20
# 19.x Standard 2021-11-02 2022-11-02 2023-11-02
# 19.x Standard 2021-11-02 2022-11-02 2023-11-02 (dropped)
# 20.x LTS 2022-11-02 2026-10-19 2027-10-19
# 21.x Standard 2023-10-18 2025-10-18 2026-10-18 (unreleased)
asterisk-lts = versions.asterisk_18;
asterisk-stable = versions.asterisk_19;
asterisk = versions.asterisk_19.overrideAttrs (o: {
asterisk-stable = versions.asterisk_20;
asterisk = versions.asterisk_20.overrideAttrs (o: {
passthru = (o.passthru or { }) // { inherit updateScript; };
});

View file

@ -4,15 +4,15 @@
"version": "16.30.0"
},
"asterisk_18": {
"sha256": "2d280794ae7505ed3dfc58b3190774cb491aa74c339fbde1a11740e6be79b466",
"version": "18.16.0"
"sha256": "66f0e55d84f9e5bf4e79a56255d35a034448acce00d219c3bf4930b1ebb0e88e",
"version": "18.17.1"
},
"asterisk_19": {
"sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa",
"version": "19.8.0"
},
"asterisk_20": {
"sha256": "4364dc762652e2fd4d3e7dc8428c83550ebae090b8a0e9d4820583e081778883",
"version": "20.1.0"
"sha256": "df12e47000fbac42bb780bb06172aa8bb8ac26faf77cc9f95184695b0cec69c3",
"version": "20.2.1"
}
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bird";
version = "2.0.12";
version = "2.13";
src = fetchurl {
url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
hash = "sha256-PsRiojfQbR9EVdbsAKQvCxaGBh/JiOXImoQdAd11O1M=";
hash = "sha256-jYlePjEYgOnvuIi0OGy+wvfhi/uDNOjUyMp8Q0EJJjg=";
};
nativeBuildInputs = [ flex bison ];

View file

@ -1,6 +1,9 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook
, pam, libkrb5, cyrus_sasl, miniupnpc, libxcrypt }:
let
remove_getaddrinfo_checks = stdenv.hostPlatform.isMips64 || !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
in
stdenv.mkDerivation rec {
pname = "dante";
version = "1.4.3";
@ -10,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0pbahkj43rx7rmv2x40mf5p3g3x9d6i2sz7pzglarf54w5ghd2j1";
};
nativeBuildInputs = lib.optional stdenv.hostPlatform.isMips64 autoreconfHook;
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc libxcrypt ];
configureFlags = if !stdenv.isDarwin
@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
dontAddDisableDepTrack = stdenv.isDarwin;
patches = lib.optionals stdenv.hostPlatform.isMips64 [
patches = lib.optionals remove_getaddrinfo_checks [
(fetchpatch {
name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";
url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";

View file

@ -8,13 +8,13 @@ let
x86_64-darwin = "x64";
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-iuI24gT7/RFZ9xc4csd+zWEzPSPsxqYY5F+78IWRjxQ=";
arm64-linux_hash = "sha256-yHAoZxLeKF6mlR/Av0EH0Lh2XquM9Vx6huNDTEs4wyU=";
x64-osx_hash = "sha256-ES6njZTSfd/36+RvibE1hlQlCT+hEEcOem8epBSsnXc=";
x64-linux_hash = "sha256-JGv4SXONVncRdWqtqvKnBWJXnp16AWLyFvULTWPmAgc=";
arm64-linux_hash = "sha256-irZLQfeGAkM6mb6EXC2tuslyw7QYBZg/aRb0Lx7CJFA=";
x64-osx_hash = "sha256-UcPZXf0BzoqlTmOSn1gDEvSZHijyB2nAb6HBj9R1D9Q=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "lidarr";
version = "1.0.2.2592";
version = "1.1.4.3027";
src = fetchurl {
url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz";

View file

@ -39,6 +39,16 @@
"agpl"
]
},
"files_markdown": {
"sha256": "14q3xz8fisbimym0hrh4qvfychf15qf0im1japiyihjckq4pwm4b",
"url": "https://github.com/icewind1991/files_markdown/releases/download/v2.4.0/files_markdown-v2.4.0.tar.gz",
"version": "2.4.0",
"description": "Markdown Editor extends the Nextcloud text editor with a live preview for markdown files.\n\nA full list of features can be found [in the README](https://github.com/icewind1991/files_markdown)",
"homepage": "https://github.com/icewind1991/files_markdown",
"licenses": [
"agpl"
]
},
"files_texteditor": {
"sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss",
"url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz",
@ -90,9 +100,9 @@
]
},
"mail": {
"sha256": "0w0v7w9v8pg8qm42x8azfqzwl5pdpn6j1klnbcjh0hw3x1rzns48",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.5/mail-v2.2.5.tar.gz",
"version": "2.2.5",
"sha256": "1k4sj04spx5x2d2xk1cg50v6090yfdkm3bnynxx5vxqbxx8r1rby",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.6/mail-v2.2.6.tar.gz",
"version": "2.2.6",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
@ -140,9 +150,9 @@
]
},
"polls": {
"sha256": "0aqm4wq10py8s6l36yqaa5zsqk7n3wr663zw521ckir5877md86w",
"url": "https://github.com/nextcloud/polls/releases/download/v5.0.0/polls.tar.gz",
"version": "5.0.0",
"sha256": "1zzsjzfihcxb6rpi4fmpndif90bqzvyb9yv8n7lcbwsmik8xw6ar",
"url": "https://github.com/nextcloud/polls/releases/download/v5.0.3/polls.tar.gz",
"version": "5.0.3",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls",
"licenses": [
@ -150,9 +160,9 @@
]
},
"previewgenerator": {
"sha256": "0vwlx3z80i12f9hm0qrm014a0wybjk2j5is7vyn9wcizhr6mpzjv",
"url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.2/previewgenerator-v5.2.2.tar.gz",
"version": "5.2.2",
"sha256": "0qcilg85rgjj9ygvhbkfcw08lay2y6ijxyk06wv0p6yw66pj8x0w",
"url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.4/previewgenerator-v5.2.4.tar.gz",
"version": "5.2.4",
"description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.",
"homepage": "https://github.com/nextcloud/previewgenerator",
"licenses": [

View file

@ -39,6 +39,16 @@
"agpl"
]
},
"files_markdown": {
"sha256": "14q3xz8fisbimym0hrh4qvfychf15qf0im1japiyihjckq4pwm4b",
"url": "https://github.com/icewind1991/files_markdown/releases/download/v2.4.0/files_markdown-v2.4.0.tar.gz",
"version": "2.4.0",
"description": "Markdown Editor extends the Nextcloud text editor with a live preview for markdown files.\n\nA full list of features can be found [in the README](https://github.com/icewind1991/files_markdown)",
"homepage": "https://github.com/icewind1991/files_markdown",
"licenses": [
"agpl"
]
},
"files_texteditor": {
"sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss",
"url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz",
@ -90,9 +100,9 @@
]
},
"mail": {
"sha256": "1q9vqjmr7mkxszjpwxcbwfqgn6m2qzrzmbxa7rbiy1dnb1frnsks",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.1.0/mail-v3.1.0.tar.gz",
"version": "3.1.0",
"sha256": "1h2z54jix775hx4dblr55k93d1472ly5lg25kqj8i2334ddmcblw",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.1.1/mail-v3.1.1.tar.gz",
"version": "3.1.1",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
@ -140,9 +150,9 @@
]
},
"polls": {
"sha256": "0aqm4wq10py8s6l36yqaa5zsqk7n3wr663zw521ckir5877md86w",
"url": "https://github.com/nextcloud/polls/releases/download/v5.0.0/polls.tar.gz",
"version": "5.0.0",
"sha256": "1zzsjzfihcxb6rpi4fmpndif90bqzvyb9yv8n7lcbwsmik8xw6ar",
"url": "https://github.com/nextcloud/polls/releases/download/v5.0.3/polls.tar.gz",
"version": "5.0.3",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls",
"licenses": [
@ -150,9 +160,9 @@
]
},
"previewgenerator": {
"sha256": "0vwlx3z80i12f9hm0qrm014a0wybjk2j5is7vyn9wcizhr6mpzjv",
"url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.2/previewgenerator-v5.2.2.tar.gz",
"version": "5.2.2",
"sha256": "0qcilg85rgjj9ygvhbkfcw08lay2y6ijxyk06wv0p6yw66pj8x0w",
"url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.4/previewgenerator-v5.2.4.tar.gz",
"version": "5.2.4",
"description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.",
"homepage": "https://github.com/nextcloud/previewgenerator",
"licenses": [
@ -170,9 +180,9 @@
]
},
"spreed": {
"sha256": "15wfbqfif2bnbgva57jkjadx3b7ypx51idcxr3xyn4mraijdll3d",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.2/spreed-v16.0.2.tar.gz",
"version": "16.0.2",
"sha256": "0y4qnpmbs0lbxf0cp6flhlmlxd17xi25jxs3acnbsg0dwrhhhhmm",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.3/spreed-v16.0.3.tar.gz",
"version": "16.0.3",
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds",
"homepage": "https://github.com/nextcloud/spreed",
"licenses": [

View file

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.32.0.6950-8521b7d99";
version = "1.32.0.6973-a787c5a8e";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "sha256-bsq/8c67FlMzkoxL1cy4kg26Ue/6YPZnIm/lwXM9XpU=";
sha256 = "sha256-96nvvjrE+aHdGLKZpZvu1+JLDJNjM4fCKlK3UFW5VfM=";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "sha256-Yuq710mDr0aTaiaE91HDJNLCFr2Qabneux6WN8VXZ7Q=";
sha256 = "sha256-fwMD/vYdwMrUvDB7JmMmVCt47ZtD17zk3bfIuO91dH8=";
};
outputs = [ "out" "basedb" ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "soft-serve";
version = "0.4.6";
version = "0.4.7";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "soft-serve";
rev = "v${version}";
sha256 = "sha256-7LegGf/fCWJQfiayqkbg0S13NOICzxxCWxS+vXHmP08=";
sha256 = "sha256-Bjb2CC7yWhbVyKAL2+R+qLfkElux7pSgkD/glkv/jVw=";
};
vendorHash = "sha256-k/IKpeSjgCYQRBRW/TMThQOFWfx1BFJpHpwMQxITkxY=";
vendorHash = "sha256-JVEUR05ciD5AX2uhQjWFNVSY2qD2M4kti9ACHyb+UfM=";
doCheck = false;

View file

@ -4,9 +4,10 @@
, postgresql
, stdenv
, nixosTests
, cargo-pgx_0_6_1
}:
buildPgxExtension rec {
(buildPgxExtension.override {cargo-pgx = cargo-pgx_0_6_1;})rec {
inherit postgresql;
pname = "timescaledb_toolkit";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "galene";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "jech";
repo = "galene";
rev = "galene-${version}";
hash = "sha256-Bnx0GqgkOHfoDYLJqVAz/tKyF+cZ0BQTRTGO2pDv7tM=";
hash = "sha256-P1KW9JUHzH/aK3wehVMSVJcUmMqDEGc8zVg8P6F828s=";
};
vendorSha256 = "sha256-HZQeVa4UB/1jpPbfrh3XgWQe2S3qA8CM268KghgJA0w=";
vendorSha256 = "sha256-+itNqxEy0S2g5UGpUIthJE2ILQzToISref/8F4zTmYg=";
ldflags = [ "-s" "-w" ];
preCheck = "export TZ=UTC";
@ -29,6 +29,6 @@ buildGoModule rec {
changelog = "https://github.com/jech/galene/raw/galene-${version}/CHANGES";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ rgrunbla ];
maintainers = with maintainers; [ rgrunbla erdnaxe ];
};
}

View file

@ -33,13 +33,13 @@ let
in package.override rec {
pname = "snipe-it";
version = "6.0.14";
version = "6.1.0";
src = fetchFromGitHub {
owner = "snipe";
repo = pname;
rev = "v${version}";
hash = "sha256-c2hzuNOpvVl+ZriCo3TRl/GHY+LCrIb2GO2U894S2yk=";
sha256 = "0c8cjywhyiywfav2syjkah777qj5f1jrckgri70ypqyxbwgb4rpm";
};
meta = with lib; {

View file

@ -15,10 +15,10 @@ let
"arietimmerman/laravel-scim-server" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "arietimmerman-laravel-scim-server-d0e3d7c0b5da2ec76283b8a2fa2e672a91596509";
name = "arietimmerman-laravel-scim-server-9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419";
src = fetchurl {
url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/d0e3d7c0b5da2ec76283b8a2fa2e672a91596509";
sha256 = "0xznsbdph32q1nx5ibl90gfqa7j0bj0ikcvz8hfpxxk967k1ayfj";
url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419";
sha256 = "02if4yvnqagpwgrq8b0371nva24lsk0h3h06q51vjxyqjhqvc2nr";
};
};
};
@ -245,10 +245,10 @@ let
"dompdf/dompdf" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "dompdf-dompdf-79573d8b8a141ec8a17312515de8740eed014fa9";
name = "dompdf-dompdf-e8d2d5e37e8b0b30f0732a011295ab80680d7e85";
src = fetchurl {
url = "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9";
sha256 = "0glv4fhzk674jgk1v9rkhb4859x5h1aspr63qdn7ajls27c582l5";
url = "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85";
sha256 = "0a2qk57c3qwg7j8gp1hwyd8y8dwm5pb8lg1npb49sijig8kyjlv3";
};
};
};
@ -705,10 +705,10 @@ let
"masterminds/html5" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "masterminds-html5-f640ac1bdddff06ea333a920c95bbad8872429ab";
name = "masterminds-html5-897eb517a343a2281f11bc5556d6548db7d93947";
src = fetchurl {
url = "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab";
sha256 = "1v9sn44z710wha5jrzy0alx1ayj3d0fcin1xpx6c6fdhlksbqc6z";
url = "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947";
sha256 = "12fmcgsrmh0f0llnpcvk33mrs4067nw246ci5619rr79ijy3yc0k";
};
};
};
@ -838,7 +838,7 @@ let
name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b";
src = fetchurl {
url = "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b";
sha256 = "0ycj3n22k5i3h8p7gn0xff6a7smjypazl2k5qvyzg86fjr7s3vfv";
sha256 = "1df8mxmdh14y2scw80yhh1l90lvdnxq1pjlli3is1cakc0cdw90z";
};
};
};
@ -872,13 +872,13 @@ let
};
};
};
"patchwork/utf8" = {
"paragonie/sodium_compat" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "patchwork-utf8-e1fa4d4a57896d074c9a8d01742b688d5db4e9d5";
name = "paragonie-sodium_compat-cb15e403ecbe6a6cc515f855c310eb6b1872a933";
src = fetchurl {
url = "https://api.github.com/repos/tchwork/utf8/zipball/e1fa4d4a57896d074c9a8d01742b688d5db4e9d5";
sha256 = "0rarkg8v23y58bc4n6j39wdi6is0p1rgqxnixqlgavcm35xjgnw0";
url = "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933";
sha256 = "01jxl868i8bkx5szgp2fp6mi438ani80bqkdcc7rnn9z22lrsm78";
};
};
};
@ -895,10 +895,10 @@ let
"phenx/php-svg-lib" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "phenx-php-svg-lib-4498b5df7b08e8469f0f8279651ea5de9626ed02";
name = "phenx-php-svg-lib-76876c6cf3080bcb6f249d7d59705108166a6685";
src = fetchurl {
url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02";
sha256 = "01w65haq96sfyjl8ahm9nb95wasgl66ymv5lycx1cbagy653xdin";
url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685";
sha256 = "0bjynrs81das9f9jwd5jgsxx9gjv2m6c0mkvlgx4w1f4pgbvwsf5";
};
};
};

View file

@ -1,9 +1,7 @@
diff --git a/web/config.py b/web/config.py
index 4774043..5b73fd3 100644
--- a/web/config.py
+++ b/web/config.py
@@ -884,6 +884,12 @@ if os.path.exists(system_config_dir + '/config_system.py'):
user_config_settings.update(config_system_settings)
--- a/web/pgadmin/evaluate_config.py 2023-04-11 17:36:46.000000000 +0200
+++ b/web/pgadmin/evaluate_config.py 2023-04-14 09:54:33.496434314 +0200
@@ -76,6 +76,12 @@
custom_config_settings.update(config_system_settings)
except ImportError:
pass
+ except PermissionError:
@ -13,5 +11,5 @@ index 4774043..5b73fd3 100644
+ {str(system_config_dir + '/config_system.py')}, please check the correct permissions.")
+ pass
# Update settings for 'LOG_FILE', 'SQLITE_PATH', 'SESSION_DB_PATH',
# 'AZURE_CREDENTIAL_CACHE_DIR', 'KERBEROS_CCACHE_DIR', 'STORAGE_DIR'
def evaluate_and_patch_config(config: dict) -> dict:

View file

@ -12,11 +12,11 @@
let
pname = "pgadmin";
version = "6.21";
version = "7.0";
src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
hash = "sha256-9ErMhxzixyiwcwcduLP63JfM3rNy0W/3w0b+BbQAjUA=";
hash = "sha256-iYsICW9aTG47eWB0g3MlWo5F1BStQLiM84+qxFq7G70=";
};
yarnDeps = mkYarnModules {
@ -31,75 +31,6 @@ let
# keep the scope, as it is used throughout the derivation and tests
# this also makes potential future overrides easier
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
# flask-security-too 4.1.5 is incompatible with flask-babel 3.x
flask-babel = prev.flask-babel.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0";
src = prev.fetchPypi {
inherit pname version;
hash = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0=";
};
nativeBuildInputs = [ ];
format = "setuptools";
outputs = [ "out" ];
patches = [ ];
});
# flask-babel 2.0.0 is incompatible with babel > 2.11.0
babel = prev.babel.overridePythonAttrs (oldAttrs: rec {
version = "2.11.0";
src = prev.fetchPypi {
pname = "Babel";
inherit version;
hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y=";
};
propagatedBuildInputs = [ prev.pytz ];
});
# pgadmin 6.21 is incompatible with flask 2.2
# https://redmine.postgresql.org/issues/7651
flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
version = "2.1.3";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
};
});
# flask 2.1.3 is incompatible with flask-sqlalchemy > 3
flask-sqlalchemy = prev.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "2.5.1";
format = "setuptools";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI=";
};
});
# flask-sqlalchemy 2.5.1 is incompatible with sqlalchemy > 1.4.45
sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.4.45";
src = prev.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-/WmFCGAJOj9p/v4KtW0EHt/f4YUQtT2aLq7LovFfp5U=";
};
});
# flask-security-too 4.1.5 is incompatible with flask-wtf > 1.0.1
flask-wtf = prev.flask-wtf.overridePythonAttrs (oldAttrs: rec {
version = "1.0.1";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-NP5cb+4PabUOMPgaO36haqFJKncf6a0JdNFkYQwJpsk=";
};
});
# pgadmin 6.21 is incompatible with the major flask-security-too update to 5.0.x
flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {
version = "4.1.5";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM=";
};
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
final.pythonPackages.flask_mail
final.pythonPackages.pyqrcode
];
});
});
in
@ -132,10 +63,13 @@ pythonPackages.buildPythonApplication rec {
# relax dependencies
sed 's|==|>=|g' -i requirements.txt
#TODO: Can be removed once cryptography>=40 has been merged to master
substituteInPlace requirements.txt \
--replace "cryptography>=40.0.*" "cryptography>=39.0.*"
# fix extra_require error with "*" in match
sed 's|*|0|g' -i requirements.txt
substituteInPlace pkg/pip/setup_pip.py \
--replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req"
--replace "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
${lib.optionalString (!server-mode) ''
substituteInPlace web/config.py \
--replace "SERVER_MODE = True" "SERVER_MODE = False"
@ -203,7 +137,7 @@ pythonPackages.buildPythonApplication rec {
wtforms
flask-paranoid
psutil
psycopg2
psycopg
python-dateutil
sqlalchemy
itsdangerous
@ -234,6 +168,8 @@ pythonPackages.buildPythonApplication rec {
dnspython
greenlet
speaklater3
google-auth-oauthlib
google-api-python-client
];
passthru.tests = {

View file

@ -8,7 +8,7 @@
"license": "PostgreSQL",
"devDependencies": {
"@babel/core": "^7.10.2",
"@babel/eslint-parser": "^7.17.0",
"@babel/eslint-parser": "^7.21.3",
"@babel/eslint-plugin": "^7.17.7",
"@babel/plugin-proposal-object-rest-spread": "^7.10.1",
"@babel/plugin-syntax-jsx": "^7.16.0",
@ -20,7 +20,9 @@
"@emotion/styled": "^10.0.14",
"@emotion/utils": "^1.0.0",
"@svgr/webpack": "^6.2.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
"@typescript-eslint/eslint-plugin": "^5.57.0",
"@typescript-eslint/parser": "^5.57.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"autoprefixer": "^10.2.4",
"axios-mock-adapter": "^1.17.0",
"babel-loader": "^8.1.0",
@ -32,7 +34,7 @@
"css-loader": "^6.7.2",
"css-minimizer-webpack-plugin": "^3.0.0",
"enzyme": "^3.11.0",
"eslint": "^7.19.0",
"eslint": "^8.37.0",
"eslint-plugin-react": "^7.20.5",
"eslint-plugin-react-hooks": "^4.3.0",
"exports-loader": "^2.0.0",
@ -54,12 +56,11 @@
"karma-jasmine-html-reporter": "^1.4.0",
"karma-requirejs": "~1.1.0",
"karma-source-map-support": "^1.4.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-sourcemap-loader": "^0.4.0",
"karma-webpack": "^5.0.0",
"loader-utils": "^3.2.1",
"mini-css-extract-plugin": "^1.3.5",
"popper.js": "^1.16.1",
"postcss-loader": "^5.0.0",
"postcss-loader": "^7.1.0",
"process": "^0.11.10",
"prop-types": "^15.7.2",
"resize-observer-polyfill": "^1.5.1",
@ -67,16 +68,16 @@
"sass-loader": "^11.0.0",
"sass-resources-loader": "^2.2.1",
"shim-loader": "^1.0.1",
"style-loader": "^3.3.1",
"style-loader": "^3.3.2",
"stylis": "^4.0.7",
"svgo": "^2.7.0",
"svgo-loader": "^2.2.0",
"terser-webpack-plugin": "^5.1.1",
"typescript": "^3.2.2",
"url-loader": "^4.1.1",
"webfonts-loader": "^7.5.2",
"webpack": "^5.21.2",
"webpack-bundle-analyzer": "^4.4.0",
"webfonts-loader": "^8.0.1",
"webpack": "^5.76.3",
"webpack-bundle-analyzer": "^4.8.0",
"webpack-cli": "^4.5.0",
"yarn-audit-html": "^4.0.0"
},
@ -95,7 +96,7 @@
"@szhsin/react-menu": "^2.2.0",
"@types/classnames": "^2.2.6",
"@types/react": "^16.7.18",
"@types/react-dom": "^16.0.11",
"@types/react-dom": "^17.0.11",
"ajv": "^8.8.2",
"anti-trojan-source": "^1.4.0",
"aspen-decorations": "^1.0.2",
@ -103,8 +104,6 @@
"babelify": "~10.0.0",
"bignumber.js": "^9.0.1",
"bootstrap": "^4.3.1",
"bootstrap-datepicker": "^1.8.0",
"bootstrap4-toggle": "^3.6.1",
"brace": "^0.11.1",
"browserfs": "^1.4.3",
"chart.js": "^3.0.0",
@ -122,6 +121,7 @@
"insert-if": "^1.1.0",
"ip-address": "^7.1.0",
"jquery": "^3.6.0",
"jquery-contextmenu": "^2.9.2",
"json-bignumber": "^1.0.1",
"jsoneditor": "^9.5.4",
"karma-coverage": "^2.0.3",
@ -136,13 +136,14 @@
"path-fx": "^2.0.0",
"pathfinding": "^0.4.18",
"paths-js": "^0.4.9",
"popper.js": "^1.16.1",
"postcss": "^8.2.15",
"raf": "^3.4.1",
"rc-dock": "^3.2.9",
"react": "^17.0.1",
"react-aspen": "^1.1.0",
"react-checkbox-tree": "^1.7.2",
"react-data-grid": "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8",
"react-data-grid": "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^17.0.1",
@ -152,22 +153,20 @@
"react-resize-detector": "^8.0.3",
"react-rnd": "^10.3.5",
"react-router-dom": "^6.2.2",
"react-select": "^4.2.1",
"react-select": "^5.7.2",
"react-table": "^7.6.3",
"react-timer-hook": "^3.0.5",
"react-virtualized-auto-sizer": "^1.0.6",
"react-window": "^1.8.5",
"select2": "^4.0.13",
"snapsvg-cjs": "^0.0.6",
"socket.io-client": "^4.5.0",
"split.js": "^1.5.10",
"styled-components": "^5.2.1",
"tempusdominus-bootstrap-4": "^5.1.2",
"tempusdominus-core": "^5.19.3",
"uplot": "^1.6.24",
"uplot-react": "^1.1.4",
"valid-filename": "^2.0.1",
"webcabin-docker": "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
"webcabin-docker": "https://github.com/pgadmin-org/wcdocker#460fc6d90ba170bb177faaa8277f5fbb8279522a",
"wkx": "^0.5.0",
"xterm": "^4.11.0",
"xterm-addon-fit": "^0.5.0",
@ -175,7 +174,7 @@
"xterm-addon-web-links": "^0.4.0"
},
"scripts": {
"linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js --ext .jsx .",
"linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js --ext .jsx --ext .ts --ext .tsx .",
"webpacker": "yarn run webpack --config webpack.config.js --progress",
"webpacker:watch": "yarn run webpack --config webpack.config.js --progress --watch",
"bundle:watch": "yarn run linter && yarn run webpacker:watch",

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,63 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
, zig
}:
stdenv.mkDerivation rec {
pname = "linuxwave";
version = "0.1.3";
src = fetchFromGitHub {
owner = "orhun";
repo = "linuxwave";
rev = "v${version}";
hash = "sha256-e+QTteyHAyYmU4vb86Ju92DxNFFX01g/rsViNI5ba1s=";
fetchSubmodules = true;
};
nativeBuildInputs = [
installShellFiles
zig
];
postConfigure = ''
export XDG_CACHE_HOME=$(mktemp -d)
'';
buildPhase = ''
runHook preBuild
zig build -Drelease-safe -Dcpu=baseline
runHook postBuild
'';
checkPhase = ''
runHook preCheck
zig build test
runHook postCheck
'';
installPhase = ''
runHook preInstall
zig build -Drelease-safe -Dcpu=baseline --prefix $out install
installManPage man/linuxwave.1
runHook postInstall
'';
meta = with lib; {
description = "Generate music from the entropy of Linux";
homepage = "https://github.com/orhun/linuxwave";
changelog = "https://github.com/orhun/linuxwave/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
platforms = platforms.all;
};
}

View file

@ -1,17 +1,18 @@
{ lib
, stdenv
, fetchFromGitHub
, nixosTests
}:
stdenv.mkDerivation {
pname = "apfsprogs";
version = "unstable-2022-10-15";
version = "unstable-2023-03-21";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "apfsprogs";
rev = "e3d5eec21da31107457f868f7f37c48c6809b7fa";
hash = "sha256-gxcsWLIs2+28SOLLeAP7iP6MaLE445CKTlD+gVE6V5g=";
rev = "be41cc38194bd41a41750631577e6d8b31953103";
hash = "sha256-9o8DKXyK5qIoVGVKMJxsinEkbJImyuDglf534kanzFE=";
};
buildPhase = ''
@ -28,6 +29,10 @@ stdenv.mkDerivation {
runHook postInstall
'';
passthru.tests = {
apfs = nixosTests.apfs;
};
meta = with lib; {
description = "Experimental APFS tools for linux";
homepage = "https://github.com/linux-apfs/apfsprogs";

View file

@ -1,5 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchFromGitHub
, fetchurl
, substituteAll
@ -13,6 +14,7 @@
, hwdata
, mangohud32
, addOpenGLRunpath
, appstream
, glslang
, mako
, meson
@ -32,6 +34,17 @@
}:
let
# Derived from subprojects/cmocka.wrap
cmocka = rec {
version = "1.81";
src = fetchFromGitLab {
owner = "cmocka";
repo = "cmocka";
rev = "59dc0013f9f29fcf212fe4911c78e734263ce24c";
hash = "sha256-IbAZOC0Q60PrKlKVWsgg/PFDV0PLb/yy+Iz/4Iziny0=";
};
};
# Derived from subprojects/imgui.wrap
imgui = rec {
version = "1.81";
@ -79,6 +92,9 @@ stdenv.mkDerivation (finalAttrs: {
# Unpack subproject sources
postUnpack = ''(
cd "$sourceRoot/subprojects"
${lib.optionalString finalAttrs.doCheck ''
cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka
''}
cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version}
cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version}
)'';
@ -127,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags = [
"-Dwith_wayland=enabled"
"-Duse_system_spdlog=enabled"
"-Dtests=disabled" # Tests require AMD GPU
"-Dtests=${if finalAttrs.doCheck then "enabled" else "disabled"}"
] ++ lib.optionals gamescopeSupport [
"-Dmangoapp=true"
"-Dmangoapp_layer=true"
@ -160,6 +176,12 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libXrandr
];
doCheck = true;
nativeCheckInputs = [
appstream
];
# Support 32bit Vulkan applications by linking in 32bit Vulkan layers
# This is needed for the same reason the 32bit preload workaround is needed.
postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
@ -172,12 +194,16 @@ stdenv.mkDerivation (finalAttrs: {
''}
'';
# Add OpenGL driver path to RUNPATH to support NVIDIA cards
postFixup = ''
# Add OpenGL driver path to RUNPATH to support NVIDIA cards
addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so"
${lib.optionalString gamescopeSupport ''
addOpenGLRunpath "$out/bin/mangoapp"
''}
${lib.optionalString finalAttrs.doCheck ''
# libcmocka.so is only used for tests
rm "$out/lib/libcmocka.so"
''}
'';
passthru.updateScript = nix-update-script { };

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