Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -9245,6 +9245,13 @@
|
||||
githubId = 2057309;
|
||||
name = "Sergey Sofeychuk";
|
||||
};
|
||||
lx = {
|
||||
email = "alex@adnab.me";
|
||||
github = "Alexis211";
|
||||
githubId = 101484;
|
||||
matrix = "@lx:deuxfleurs.fr";
|
||||
name = "Alex Auvolat";
|
||||
};
|
||||
lxea = {
|
||||
email = "nix@amk.ie";
|
||||
github = "lxea";
|
||||
|
||||
@@ -107,6 +107,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [trurl](https://github.com/curl/trurl), a command line tool for URL parsing and manipulation.
|
||||
|
||||
- [wgautomesh](https://git.deuxfleurs.fr/Deuxfleurs/wgautomesh), a simple utility to help connect wireguard nodes together in a full mesh topology. Available as [services.wgautomesh](options.html#opt-services.wgautomesh.enable).
|
||||
|
||||
- [woodpecker-agents](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-agents](#opt-services.woodpecker-agents.agents._name_.enable).
|
||||
|
||||
- [woodpecker-server](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-server](#opt-services.woodpecker-server.enable).
|
||||
|
||||
@@ -1044,6 +1044,7 @@
|
||||
./services/networking/wg-netmanager.nix
|
||||
./services/networking/webhook.nix
|
||||
./services/networking/wg-quick.nix
|
||||
./services/networking/wgautomesh.nix
|
||||
./services/networking/wireguard.nix
|
||||
./services/networking/wpa_supplicant.nix
|
||||
./services/networking/wstunnel.nix
|
||||
|
||||
@@ -0,0 +1,161 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.wgautomesh;
|
||||
settingsFormat = pkgs.formats.toml { };
|
||||
configFile =
|
||||
# Have to remove nulls manually as TOML generator will not just skip key
|
||||
# if value is null
|
||||
settingsFormat.generate "wgautomesh-config.toml"
|
||||
(filterAttrs (k: v: v != null)
|
||||
(mapAttrs
|
||||
(k: v:
|
||||
if k == "peers"
|
||||
then map (e: filterAttrs (k: v: v != null) e) v
|
||||
else v)
|
||||
cfg.settings));
|
||||
runtimeConfigFile =
|
||||
if cfg.enableGossipEncryption
|
||||
then "/run/wgautomesh/wgautomesh.toml"
|
||||
else configFile;
|
||||
in
|
||||
{
|
||||
options.services.wgautomesh = {
|
||||
enable = mkEnableOption (mdDoc "the wgautomesh daemon");
|
||||
logLevel = mkOption {
|
||||
type = types.enum [ "trace" "debug" "info" "warn" "error" ];
|
||||
default = "info";
|
||||
description = mdDoc "wgautomesh log level.";
|
||||
};
|
||||
enableGossipEncryption = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = mdDoc "Enable encryption of gossip traffic.";
|
||||
};
|
||||
gossipSecretFile = mkOption {
|
||||
type = types.path;
|
||||
description = mdDoc ''
|
||||
File containing the shared secret key to use for gossip encryption.
|
||||
Required if `enableGossipEncryption` is set.
|
||||
'';
|
||||
};
|
||||
enablePersistence = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = mdDoc "Enable persistence of Wireguard peer info between restarts.";
|
||||
};
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = mdDoc "Automatically open gossip port in firewall (recommended).";
|
||||
};
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
|
||||
interface = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc ''
|
||||
Wireguard interface to manage (it is NOT created by wgautomesh, you
|
||||
should use another NixOS option to create it such as
|
||||
`networking.wireguard.interfaces.wg0 = {...};`).
|
||||
'';
|
||||
example = "wg0";
|
||||
};
|
||||
gossip_port = mkOption {
|
||||
type = types.port;
|
||||
description = mdDoc ''
|
||||
wgautomesh gossip port, this MUST be the same number on all nodes in
|
||||
the wgautomesh network.
|
||||
'';
|
||||
default = 1666;
|
||||
};
|
||||
lan_discovery = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = mdDoc "Enable discovery of peers on the same LAN using UDP broadcast.";
|
||||
};
|
||||
upnp_forward_external_port = mkOption {
|
||||
type = types.nullOr types.port;
|
||||
default = null;
|
||||
description = mdDoc ''
|
||||
Public port number to try to redirect to this machine's Wireguard
|
||||
daemon using UPnP IGD.
|
||||
'';
|
||||
};
|
||||
peers = mkOption {
|
||||
type = types.listOf (types.submodule {
|
||||
options = {
|
||||
pubkey = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc "Wireguard public key of this peer.";
|
||||
};
|
||||
address = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc ''
|
||||
Wireguard address of this peer (a single IP address, multliple
|
||||
addresses or address ranges are not supported).
|
||||
'';
|
||||
example = "10.0.0.42";
|
||||
};
|
||||
endpoint = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
description = mdDoc ''
|
||||
Bootstrap endpoint for connecting to this Wireguard peer if no
|
||||
other address is known or none are working.
|
||||
'';
|
||||
default = null;
|
||||
example = "wgnode.mydomain.example:51820";
|
||||
};
|
||||
};
|
||||
});
|
||||
default = [ ];
|
||||
description = mdDoc "wgautomesh peer list.";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
default = { };
|
||||
description = mdDoc "Configuration for wgautomesh.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.wgautomesh.settings = {
|
||||
gossip_secret_file = mkIf cfg.enableGossipEncryption "$CREDENTIALS_DIRECTORY/gossip_secret";
|
||||
persist_file = mkIf cfg.enablePersistence "/var/lib/wgautomesh/state";
|
||||
};
|
||||
|
||||
systemd.services.wgautomesh = {
|
||||
path = [ pkgs.wireguard-tools ];
|
||||
environment = { RUST_LOG = "wgautomesh=${cfg.logLevel}"; };
|
||||
description = "wgautomesh";
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
|
||||
ExecStart = "${getExe pkgs.wgautomesh} ${runtimeConfigFile}";
|
||||
Restart = "always";
|
||||
RestartSec = "30";
|
||||
LoadCredential = mkIf cfg.enableGossipEncryption [ "gossip_secret:${cfg.gossipSecretFile}" ];
|
||||
|
||||
ExecStartPre = mkIf cfg.enableGossipEncryption [
|
||||
''${pkgs.envsubst}/bin/envsubst \
|
||||
-i ${configFile} \
|
||||
-o ${runtimeConfigFile}''
|
||||
];
|
||||
|
||||
DynamicUser = true;
|
||||
StateDirectory = "wgautomesh";
|
||||
StateDirectoryMode = "0700";
|
||||
RuntimeDirectory = "wgautomesh";
|
||||
AmbientCapabilities = "CAP_NET_ADMIN";
|
||||
CapabilityBoundingSet = "CAP_NET_ADMIN";
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
networking.firewall.allowedUDPPorts =
|
||||
mkIf cfg.openFirewall [ cfg.settings.gossip_port ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ let
|
||||
mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
|
||||
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
|
||||
|
||||
phpExt = pkgs.php80.buildEnv {
|
||||
phpExt = pkgs.php81.buildEnv {
|
||||
extensions = { all, ... }: with all; [ iconv mbstring curl openssl tokenizer soap ctype zip gd simplexml dom intl sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache exif sodium ];
|
||||
extraConfig = "max_input_vars = 5000";
|
||||
};
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hstr";
|
||||
version = "2.6";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dvorka";
|
||||
repo = "hstr";
|
||||
rev = version;
|
||||
sha256 = "sha256-yfaDISnTDb20DgMOvh6jJYisV6eL/Mp5jafnWEnFG8c=";
|
||||
hash = "sha256-OuLy1aiEwUJDGy3+UXYF1Vx1nNXic46WIZEM1xrIPfA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kaniko";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "kaniko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sPICsDgkijQ7PyeTWQgT553toc4/rWPPo7SY3ptX82U=";
|
||||
hash = "sha256-dXQ0/o1qISv+sjNVIpfF85bkbM9sGOGwqVbWZpMWfMY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hydroxide";
|
||||
version = "0.2.25";
|
||||
version = "0.2.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YBaimsHRmmh5d98c9x56JIyOOnkZsypxdqlSCG6pVJ4=";
|
||||
sha256 = "sha256-UCS49P83dGTD/Wx95Mslstm2C6hKgJB/1tJTZmmwLDg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU=";
|
||||
|
||||
@@ -1,16 +1,22 @@
|
||||
{ lib, mkFranzDerivation, fetchurl, xorg }:
|
||||
{ lib, mkFranzDerivation, fetchurl, xorg, nix-update-script }:
|
||||
|
||||
mkFranzDerivation rec {
|
||||
pname = "ferdium";
|
||||
name = "Ferdium";
|
||||
version = "6.2.4";
|
||||
version = "6.2.6";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
|
||||
sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo=";
|
||||
sha256 = "sha256-jG3NdolWqQzj/62jYwnqJHz5uT6QIuOkrpL/FcLl56k=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ xorg.libxshmfence ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [ "--override-filename" ./default.nix ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "All your services in one place built by the community";
|
||||
homepage = "https://ferdium.org/";
|
||||
|
||||
@@ -28,9 +28,10 @@
|
||||
|
||||
# Helper function for building a derivation for Franz and forks.
|
||||
|
||||
{ pname, name, version, src, meta, extraBuildInputs ? [] }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
{ pname, name, version, src, meta, extraBuildInputs ? [], ... } @ args:
|
||||
let
|
||||
cleanedArgs = builtins.removeAttrs args [ "pname" "name" "version" "src" "meta" "extraBuildInputs" ];
|
||||
in stdenv.mkDerivation (rec {
|
||||
inherit pname version src meta;
|
||||
|
||||
# Don't remove runtime deps.
|
||||
@@ -91,4 +92,4 @@ stdenv.mkDerivation rec {
|
||||
--suffix PATH : ${xdg-utils}/bin \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
'';
|
||||
}
|
||||
} // cleanedArgs)
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glab";
|
||||
version = "1.26.0";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k0wkHw12MyVsAudaihoymGkP4y5y98cR7LKa+hEC1Mc=";
|
||||
hash = "sha256-e3tblY/lf25TJrsLeQdaPcgVlsaEimkjQxO0P9X1o6w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FZ1CiR8Rj/sMoCnQm6ArGQfRTlvmD14EZDmufnlTSTk=";
|
||||
vendorHash = "sha256-PH0PJujdRtnVS0s6wWtS6kffQBQduqb2KJYru9ePatw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.67.2";
|
||||
version = "1.70.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
hash = "sha256-iSL5ogS8BLcxge3eo+kCqtsGmj7P1wbi+/84nA9fO2Q=";
|
||||
hash = "sha256-CAoMXWxtsGJOEOxZ8ZLwLYAWW0kY/4jryrIAFDbOeXA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -36,7 +36,9 @@ in
|
||||
, conmon
|
||||
, coreutils
|
||||
, cryptsetup
|
||||
, e2fsprogs
|
||||
, fakeroot
|
||||
, fuse2fs ? e2fsprogs.fuse2fs
|
||||
, go
|
||||
, gpgme
|
||||
, libseccomp
|
||||
@@ -46,6 +48,10 @@ in
|
||||
, openssl
|
||||
, squashfsTools
|
||||
, squashfuse
|
||||
# Test dependencies
|
||||
, singularity-tools
|
||||
, cowsay
|
||||
, hello
|
||||
# Overridable configurations
|
||||
, enableNvidiaContainerCli ? true
|
||||
# Compile with seccomp support
|
||||
@@ -83,7 +89,7 @@ let
|
||||
ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap"
|
||||
'');
|
||||
in
|
||||
buildGoModule {
|
||||
(buildGoModule {
|
||||
inherit pname version src;
|
||||
|
||||
# Override vendorHash with the output got from
|
||||
@@ -113,6 +119,12 @@ buildGoModule {
|
||||
which
|
||||
];
|
||||
|
||||
# Search inside the project sources
|
||||
# and see the `control` file of the Debian package from upstream repos
|
||||
# for build-time dependencies and run-time utilities
|
||||
# apptainer/apptainer: https://github.com/apptainer/apptainer/blob/main/dist/debian/control
|
||||
# sylabs/singularity: https://github.com/sylabs/singularity/blob/main/debian/control
|
||||
|
||||
buildInputs = [
|
||||
bash # To patch /bin/sh shebangs.
|
||||
conmon
|
||||
@@ -120,8 +132,7 @@ buildGoModule {
|
||||
gpgme
|
||||
libuuid
|
||||
openssl
|
||||
squashfsTools
|
||||
squashfuse
|
||||
squashfsTools # Required at build time by SingularityCE
|
||||
]
|
||||
++ lib.optional enableNvidiaContainerCli nvidia-docker
|
||||
++ lib.optional enableSeccomp libseccomp
|
||||
@@ -144,6 +155,8 @@ buildGoModule {
|
||||
bash
|
||||
coreutils
|
||||
cryptsetup # cryptsetup
|
||||
fakeroot
|
||||
fuse2fs # Mount ext3 filesystems
|
||||
go
|
||||
privileged-un-utils
|
||||
squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image
|
||||
@@ -191,10 +204,7 @@ buildGoModule {
|
||||
substituteInPlace "$out/bin/run-singularity" \
|
||||
--replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}"
|
||||
wrapProgram "$out/bin/${projectName}" \
|
||||
--prefix PATH : "${lib.makeBinPath [
|
||||
fakeroot
|
||||
squashfsTools # Singularity (but not Apptainer) expects unsquashfs from the host PATH
|
||||
]}"
|
||||
--prefix PATH : "''${defaultPathInputs// /\/bin:}"
|
||||
# Make changes in the config file
|
||||
${lib.optionalString enableNvidiaContainerCli ''
|
||||
substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \
|
||||
@@ -235,4 +245,14 @@ buildGoModule {
|
||||
maintainers = with maintainers; [ jbedo ShamrockLee ];
|
||||
mainProgram = projectName;
|
||||
} // extraMeta;
|
||||
}
|
||||
}).overrideAttrs (finalAttrs: prevAttrs: {
|
||||
passthru = prevAttrs.passthru or { } // {
|
||||
tests = {
|
||||
image-hello-cowsay = singularity-tools.buildImage {
|
||||
name = "hello-cowsay";
|
||||
contents = [ hello cowsay ];
|
||||
singularity = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,20 +7,20 @@ let
|
||||
apptainer = callPackage
|
||||
(import ./generic.nix rec {
|
||||
pname = "apptainer";
|
||||
version = "1.1.5";
|
||||
version = "1.1.7";
|
||||
projectName = "apptainer";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apptainer";
|
||||
repo = "apptainer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-onJkpHJNsO0cQO2m+TmdMuMkuvH178mDhOeX41bYFic=";
|
||||
hash = "sha256-3F8qwP27IXcnnEYMnLzkCOxQDx7yej6QIZ40Wb5pk34=";
|
||||
};
|
||||
|
||||
# Update by running
|
||||
# nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules"
|
||||
# at the root directory of the Nixpkgs repository
|
||||
vendorHash = "sha256-tAnh7A8Lw5KtY7hq+sqHMEUlgXvgeeCKKIfRZFoRtug=";
|
||||
vendorHash = "sha256-PfFubgR/W1WBXIsRO+Kg7hA6ebeAcRiJlTlAZbnl19A=";
|
||||
|
||||
extraDescription = " (previously known as Singularity)";
|
||||
extraMeta.homepage = "https://apptainer.org";
|
||||
@@ -38,20 +38,20 @@ let
|
||||
singularity = callPackage
|
||||
(import ./generic.nix rec {
|
||||
pname = "singularity-ce";
|
||||
version = "3.10.4";
|
||||
version = "3.11.1";
|
||||
projectName = "singularity";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sylabs";
|
||||
repo = "singularity";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bUnQXQVwaVA3Lkw3X9TBWqNBgiPxAVCHnkq0vc+CIsM=";
|
||||
hash = "sha256-gdgg6VN3Ily+2Remz6dZBhhfWIxyaBa4bIlFcgrA/uY=";
|
||||
};
|
||||
|
||||
# Update by running
|
||||
# nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).go-modules"
|
||||
# at the root directory of the Nixpkgs repository
|
||||
vendorHash = "sha256-K8helLcOuz3E4LzBE9y3pnZqwdwhO/iMPTN1o22ipVg=";
|
||||
vendorHash = "sha256-mBhlH6LSmcJuc6HbU/3Q9ii7vJkW9jcikBWCl8oeMOk=";
|
||||
|
||||
# Do not build conmon from the Git submodule source,
|
||||
# Use Nixpkgs provided version
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, crystal
|
||||
, pcre2
|
||||
, shards
|
||||
, git
|
||||
, pkg-config
|
||||
@@ -90,7 +91,8 @@ stdenv.mkDerivation (mkDerivationArgs // {
|
||||
|
||||
inherit enableParallelBuilding;
|
||||
strictDeps = true;
|
||||
buildInputs = args.buildInputs or [ ] ++ [ crystal ];
|
||||
buildInputs = args.buildInputs or [ ] ++ [ crystal ]
|
||||
++ lib.optional (lib.versionAtLeast crystal.version "1.8") pcre2;
|
||||
|
||||
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
|
||||
crystal
|
||||
|
||||
@@ -72,18 +72,6 @@ let
|
||||
meta.platforms = lib.attrNames sha256s;
|
||||
};
|
||||
|
||||
commonBuildInputs = extraBuildInputs: [
|
||||
boehmgc
|
||||
pcre
|
||||
pcre2
|
||||
libevent
|
||||
libyaml
|
||||
zlib
|
||||
libxml2
|
||||
openssl
|
||||
] ++ extraBuildInputs
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
generic = (
|
||||
{ version
|
||||
, sha256
|
||||
@@ -92,7 +80,7 @@ let
|
||||
, extraBuildInputs ? [ ]
|
||||
, buildFlags ? [ "all" "docs" "release=1"]
|
||||
}:
|
||||
lib.fix (compiler: stdenv.mkDerivation {
|
||||
lib.fix (compiler: stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "crystal";
|
||||
inherit buildFlags doCheck version;
|
||||
|
||||
@@ -172,7 +160,16 @@ let
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ];
|
||||
buildInputs = commonBuildInputs extraBuildInputs;
|
||||
buildInputs = [
|
||||
boehmgc
|
||||
(if lib.versionAtLeast version "1.8" then pcre2 else pcre)
|
||||
libevent
|
||||
libyaml
|
||||
zlib
|
||||
libxml2
|
||||
openssl
|
||||
] ++ extraBuildInputs
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
makeFlags = [
|
||||
"CRYSTAL_CONFIG_VERSION=${version}"
|
||||
@@ -202,7 +199,7 @@ let
|
||||
--suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \
|
||||
--suffix CRYSTAL_PATH : lib:$lib/crystal \
|
||||
--suffix CRYSTAL_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
|
||||
lib.makeLibraryPath finalAttrs.buildInputs
|
||||
}
|
||||
install -dm755 $lib/crystal
|
||||
cp -r src/* $lib/crystal/
|
||||
@@ -248,7 +245,7 @@ let
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ david50407 manveru peterhoeg ];
|
||||
};
|
||||
})
|
||||
}))
|
||||
);
|
||||
|
||||
in
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grpc";
|
||||
version = "1.53.0"; # N.B: if you change this, please update:
|
||||
version = "1.54.0"; # N.B: if you change this, please update:
|
||||
# pythonPackages.grpcio-tools
|
||||
# pythonPackages.grpcio-status
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YRVWR1woMDoq8TWFrL2nqQvAbtqBnUd3QlfbFTJm8dc=";
|
||||
hash = "sha256-WVH7rYyFx2LyAnctnNbX4KevoJ5KKZujN+SmL0Y6wvw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -135,6 +135,7 @@ stdenv.mkDerivation rec {
|
||||
"-Dpolkit=disabled"
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
"-Dlibcap-ng=disabled"
|
||||
"-Degl=disabled"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"-Dcoroutine=gthread" # Fixes "Function missing:makecontext"
|
||||
];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.215";
|
||||
version = "0.6.217";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Yv59F3i++l6UA8J3l3pyyaeagAcPIqsAWBlSojxjflg=";
|
||||
sha256 = "sha256-wrdR0g8lND0V7BCKXDyk93Kf7eEIdg4Vb85MbhhK8AE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{ lib, buildDunePackage
|
||||
, cohttp, cohttp-lwt, logs, lwt, js_of_ocaml, js_of_ocaml-ppx, js_of_ocaml-lwt
|
||||
, nodejs, lwt_ppx
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "cohttp-lwt-jsoo";
|
||||
inherit (cohttp-lwt) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cohttp
|
||||
cohttp-lwt
|
||||
logs
|
||||
lwt
|
||||
js_of_ocaml
|
||||
js_of_ocaml-ppx
|
||||
js_of_ocaml-lwt
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
nodejs
|
||||
lwt_ppx
|
||||
];
|
||||
|
||||
meta = cohttp-lwt.meta // {
|
||||
description = "CoHTTP implementation for the Js_of_ocaml JavaScript compiler";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{ lib, buildDunePackage, cohttp }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "cohttp-top";
|
||||
inherit (cohttp) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ cohttp ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = cohttp.meta // {
|
||||
description = "CoHTTP toplevel pretty printers for HTTP types";
|
||||
};
|
||||
}
|
||||
@@ -11,10 +11,11 @@ buildDunePackage rec {
|
||||
sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9";
|
||||
};
|
||||
|
||||
useDune2 = false;
|
||||
duneVersion = "1";
|
||||
|
||||
minimalOCamlVersion = "4.02";
|
||||
|
||||
nativeBuildInputs = [ camlp4 ];
|
||||
propagatedBuildInputs = [ camlp4 ];
|
||||
|
||||
preBuild = "rm META.lwt_camlp4";
|
||||
|
||||
@@ -1,22 +1,49 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, django, persisting-theory, six
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# dependencies
|
||||
, django
|
||||
, persisting-theory
|
||||
, six
|
||||
|
||||
# tests
|
||||
, djangorestframework
|
||||
, pytest-django
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-dynamic-preferences";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wAq8uNUkBnOQpmUYz80yaDuHrTzGINWRNkn8dwe4CDM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "agateblue";
|
||||
repo = "django-dynamic-preferences";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-S0PAlSrMOQ68mX548pZzARfau/lytXWC4S5uVO1rUmo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six django persisting-theory ];
|
||||
buildInputs = [
|
||||
django
|
||||
];
|
||||
|
||||
# django.core.exceptions.ImproperlyConfigured: Requested setting DYNAMIC_PREFERENCES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
persisting-theory
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
djangorestframework
|
||||
pytestCheckHook
|
||||
pytest-django
|
||||
];
|
||||
|
||||
env.DJANGO_SETTINGS = "tests.settings";
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/agateblue/django-dynamic-preferences/blob/${version}/HISTORY.rst";
|
||||
homepage = "https://github.com/EliotBerriot/django-dynamic-preferences";
|
||||
description = "Dynamic global and instance settings for your django project";
|
||||
license = licenses.bsd3;
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-status";
|
||||
version = "1.53.0";
|
||||
version = "1.54.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-WkaCDcfZS6xIquXdl8lMreoJ2AoFVTrKdKkqKVQDBCA=";
|
||||
hash = "sha256-tQMF1SwN9haUk8yl8uObm013Oz8w1Kemtt18GMuJAHw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
version = "1.53.0";
|
||||
version = "1.54.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kl7/8tY8oyZvk8kk/+ul1JbxaozL4SX6DRis9HzF+og=";
|
||||
hash = "sha256-33msv1mZcBjhMXE7cWov3bVVbhhA6fud5MpzvyBZWQ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-gazelle";
|
||||
version = "0.28.0";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-axpRS8SZwChmLYSaarxZkwvrRk72XRHW7v4d11EtJ3k=";
|
||||
sha256 = "sha256-95nA6IEuAIh/6J6G2jADz3UKpQj5wybQ1HpaHSI+QRo=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -37,8 +37,8 @@ let
|
||||
in
|
||||
rec {
|
||||
shards_0_17 = generic {
|
||||
version = "0.17.2";
|
||||
hash = "sha256-2HpoMgyi8jnWYiBHscECYiaRu2g0mAH+dCY1t5m/l1s=";
|
||||
version = "0.17.3";
|
||||
hash = "sha256-vgcMB/vp685YwYI9XtJ5cTEjdnYaZY9aOMUnJBJaQoU=";
|
||||
};
|
||||
|
||||
shards = shards_0_17;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "datree";
|
||||
version = "1.8.47";
|
||||
version = "1.8.65";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datreeio";
|
||||
repo = "datree";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pL8fagVEVrAoIwbKQy1UpHOvFxYaMiw4cmmRgIamyic=";
|
||||
hash = "sha256-UL8VVKQBRwJz7kw9/0IHaFvsh3h94BrzDoqDFqOzjXU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MrVIpr2iwddW3yUeBuDfeg+Xo9Iarr/fp4Rc4WGYGeU=";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.17.16";
|
||||
version = "0.17.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GwYuxEGFS8qcu7C7mmndcz2cUVoYp0+oEMKhSItf0DU=";
|
||||
hash = "sha256-UPY/edmriacHqQ030nvYsuRj6OwdazFbsCs1oHAahaU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
+99
-82
@@ -28,7 +28,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "analysis"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
@@ -107,7 +107,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chain-map"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
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#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
|
||||
[[package]]
|
||||
name = "cm-syntax"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
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#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
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#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
|
||||
[[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#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
dependencies = [
|
||||
"log",
|
||||
]
|
||||
@@ -271,7 +271,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "event-parse"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
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#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
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#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
|
||||
[[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#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
@@ -367,7 +367,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "idx"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
@@ -381,7 +381,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "input"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"cm-syntax",
|
||||
"config",
|
||||
@@ -440,7 +440,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524"
|
||||
|
||||
[[package]]
|
||||
name = "lang-srv"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"anyhow",
|
||||
@@ -468,7 +468,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "lex-util"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
@@ -533,7 +533,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "millet-cli"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"config",
|
||||
@@ -547,7 +547,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "millet-ls"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
@@ -567,7 +567,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-hir"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"paths",
|
||||
@@ -578,20 +578,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-statics"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
"fast-hash",
|
||||
"mlb-hir",
|
||||
"once_cell",
|
||||
"paths",
|
||||
"sml-comment",
|
||||
"sml-file-syntax",
|
||||
"sml-fixity",
|
||||
"sml-hir",
|
||||
"sml-hir-lower",
|
||||
"sml-libs",
|
||||
"sml-lower",
|
||||
"sml-namespace",
|
||||
"sml-statics",
|
||||
"sml-statics-types",
|
||||
@@ -603,7 +602,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-syntax"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
@@ -669,7 +668,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "panic-hook"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"better-panic",
|
||||
]
|
||||
@@ -677,7 +676,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "paths"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"glob",
|
||||
@@ -688,7 +687,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "pattern-match"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
]
|
||||
@@ -826,7 +825,7 @@ checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.14",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -848,7 +847,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.14",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -862,7 +861,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "slash-var-path"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
@@ -870,20 +869,29 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-comment"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"sml-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-dynamics"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-mir",
|
||||
"uniq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-file-syntax"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"config",
|
||||
"elapsed",
|
||||
"sml-fixity",
|
||||
"sml-hir-lower",
|
||||
"sml-lex",
|
||||
"sml-lower",
|
||||
"sml-parse",
|
||||
"sml-ty-var-scope",
|
||||
"text-pos",
|
||||
@@ -891,7 +899,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-fixity"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
@@ -900,17 +908,39 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-hir"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"la-arena",
|
||||
"num-bigint",
|
||||
"sml-lab",
|
||||
"sml-path",
|
||||
"sml-scon",
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-hir-lower"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
"fast-hash",
|
||||
"lex-util",
|
||||
"sml-hir",
|
||||
"sml-path",
|
||||
"sml-syntax",
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-lab"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-lex"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"lex-util",
|
||||
@@ -923,23 +953,17 @@ version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/sml-libs.git#360d865bfe1e8afc4f8e483e0ac8f53da0593041"
|
||||
|
||||
[[package]]
|
||||
name = "sml-lower"
|
||||
version = "0.9.0"
|
||||
name = "sml-mir"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
"fast-hash",
|
||||
"lex-util",
|
||||
"num-traits",
|
||||
"sml-hir",
|
||||
"sml-path",
|
||||
"sml-syntax",
|
||||
"str-util",
|
||||
"sml-lab",
|
||||
"sml-scon",
|
||||
"uniq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-naive-fmt"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-comment",
|
||||
@@ -948,11 +972,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-namespace"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
|
||||
[[package]]
|
||||
name = "sml-parse"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"event-parse",
|
||||
@@ -964,14 +988,23 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-path"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-scon"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-traits",
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"config",
|
||||
@@ -992,7 +1025,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics-types"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"code-h2-md-map",
|
||||
@@ -1009,7 +1042,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-syntax"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"char-name",
|
||||
"code-h2-md-map",
|
||||
@@ -1022,7 +1055,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-ty-var-scope"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-hir",
|
||||
@@ -1040,7 +1073,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "str-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
dependencies = [
|
||||
"smol_str",
|
||||
]
|
||||
@@ -1058,9 +1091,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.14"
|
||||
version = "2.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5"
|
||||
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -1070,7 +1103,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "syntax-gen"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"identifier-case",
|
||||
@@ -1090,7 +1123,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"cm-syntax",
|
||||
@@ -1110,13 +1143,12 @@ dependencies = [
|
||||
"sml-syntax",
|
||||
"str-util",
|
||||
"text-pos",
|
||||
"xshell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "text-pos"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"text-size-util",
|
||||
@@ -1131,7 +1163,7 @@ checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
|
||||
[[package]]
|
||||
name = "text-size-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
dependencies = [
|
||||
"text-size",
|
||||
]
|
||||
@@ -1154,7 +1186,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
[[package]]
|
||||
name = "token"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
@@ -1193,7 +1225,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "topo-sort"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
|
||||
[[package]]
|
||||
name = "ungrammar"
|
||||
@@ -1240,7 +1272,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
[[package]]
|
||||
name = "uniq"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
@@ -1423,24 +1455,9 @@ dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xshell"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "962c039b3a7b16cf4e9a4248397c6585c07547412e7d6a6e035389a802dcfe90"
|
||||
dependencies = [
|
||||
"xshell-macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xshell-macros"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c"
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.9.0"
|
||||
version = "0.9.3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"flate2",
|
||||
|
||||
@@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.9.0";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lZW+R9fSrW10bLJCIsdtfgrrRRKnfg/sVtlfxl+XFR0=";
|
||||
hash = "sha256-swT16F/gOHiAeZGrD9O4THIHMXDQOpsaUsSjhpkw3fU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"char-name-0.1.0" = "sha256-dq7y7WOzOzEZztojgh21wPrIqCfiioFJ/gbJ2jY10lQ=";
|
||||
"char-name-0.1.0" = "sha256-hO7SO1q5hPY5wJJ8A+OxxCI7GeHtdMz34OWu9ViVny0=";
|
||||
"sml-libs-0.1.0" = "sha256-+sxaPBG5qBIC195BFQYH8Yo6juuelGZzztCUiS45WRg=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "phpunit";
|
||||
version = "10.0.16";
|
||||
version = "10.1.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://phar.phpunit.de/phpunit-${version}.phar";
|
||||
hash = "sha256-e/wUIri2y4yKI1V+U/vAD3ef2ZeKxBcFrb0Ay/rlTtM=";
|
||||
hash = "sha256-1zYGgYV4BHxjBE3QcV6XP73u2JIaUzCKS70eDB7e9DQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.5.14";
|
||||
version = "0.5.16";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-J1oG1lnpdLYBLmBK8UcLhM6xr9q53FDkjM3ihYthznY=";
|
||||
sha256 = "sha256-aVvYQ9/04juse89EzYY6f9HEwRHjZxbDnuJpX6jzlbc=";
|
||||
};
|
||||
cargoSha256 = "sha256-4noIfJifszGI5PlvZf8ZkDRuXsGBX+Io2H0blrE0vy4=";
|
||||
cargoSha256 = "sha256-dxKtOWhHSZdr5RNQ+w+CXFHN+oQXUmSQ7w9i9IO7Q6I=";
|
||||
|
||||
# skip tests which require llvm-tools-preview
|
||||
checkFlags = [
|
||||
|
||||
@@ -34,20 +34,20 @@
|
||||
|
||||
let
|
||||
pname = "mindustry";
|
||||
version = "142";
|
||||
version = "143.1";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
Mindustry = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xL1oy93ljAl1hdzsdEF9NHZL/yb11markUg271C++R4=";
|
||||
hash = "sha256-p6HxccLg+sjFW+ZGGTfo5ZvOIs6lKjub88kX/iaBres=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CKcAnYAuHQb6wPkDUpinU83MVxhdvhYpjjuS3sEb6cg=";
|
||||
hash = "sha256-fbFjelwqBRadcUmbW3/oDnhmNAjTj660qB5WwXugIIU=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
@@ -126,7 +126,7 @@ let
|
||||
| sh
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-Fy2GXdB+cmRfiQFKnnz+UTUxT+LBTZa69BNwC23XD84=";
|
||||
outputHash = "sha256-uxnW5AqX6PazqHJYLuF/By5qpev8Se+992jCyacogSY=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "router";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apollographql";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TA0HE5zbSSPTq5Z/NP6/s1yqXyCicDmSAgqulmKbQeM=";
|
||||
sha256 = "sha256-xekMw0StdCSI3tls0D2I5rqRV8fVtecGSEzlB3ao6zY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-binpEhtq5tQhSDD2mRKYMdwg9VZlBQZR3xZpOeZNYyY=";
|
||||
cargoSha256 = "sha256-F9MomJQShJUE9QIJJmdFxSs/FVctig17ZclndFl1SUY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,36 +1,23 @@
|
||||
{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp
|
||||
, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd
|
||||
, flock
|
||||
, flock, autoreconfHook
|
||||
, nixosTests
|
||||
, withMysql ? false
|
||||
, withPgsql ? false
|
||||
, withSqlite ? false, sqlite
|
||||
, withPam ? false, pam
|
||||
, withZlib ? true, zlib
|
||||
, withIconv ? true
|
||||
, withTools ? false
|
||||
, withRedis ? false
|
||||
}:
|
||||
|
||||
let
|
||||
fakegit = writeScriptBin "git" ''
|
||||
#! ${stdenv.shell} -e
|
||||
if [ "$1" = "describe" ]; then
|
||||
[ -r .rev ] && cat .rev || true
|
||||
fi
|
||||
'';
|
||||
|
||||
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "21.04";
|
||||
pname = "ejabberd";
|
||||
version = "23.01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz";
|
||||
sha256 = "09s8mj0dkvp9mxazsqxqqmnl5n2xyi8avx0rzgvqrbl3byanzfzr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fakegit makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper autoreconfHook ];
|
||||
|
||||
buildInputs = [ erlang openssl expat libyaml gd ]
|
||||
++ lib.optional withSqlite sqlite
|
||||
@@ -38,15 +25,25 @@ in stdenv.mkDerivation rec {
|
||||
++ lib.optional withZlib zlib
|
||||
;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz";
|
||||
sha256 = "sha256-K4P+A2u/Hbina4b3GP8T3wmPoQxiv88GuB4KZOb2+cA=";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) ejabberd;
|
||||
};
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
pname = "ejabberd-deps";
|
||||
inherit version;
|
||||
|
||||
inherit src;
|
||||
inherit src version;
|
||||
|
||||
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
|
||||
|
||||
nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib ];
|
||||
nativeBuildInputs = [
|
||||
git erlang openssl expat libyaml sqlite pam zlib autoreconfHook
|
||||
];
|
||||
|
||||
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
@@ -66,25 +63,29 @@ in stdenv.mkDerivation rec {
|
||||
cp -r deps $out
|
||||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
# avoid /nix/store references in the source
|
||||
dontPatchShebangs = true;
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "1mvixgb46ss35abjwz3lw38c69bii1xyj557a92bvrxc1gc6gx31";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-Lj4YSPOiiJQ6uN4cAR+1s/eVSfoIsuvWR7gGkVYrOfc=";
|
||||
};
|
||||
|
||||
configureFlags =
|
||||
[ (lib.enableFeature withMysql "mysql")
|
||||
(lib.enableFeature withPgsql "pgsql")
|
||||
(lib.enableFeature withSqlite "sqlite")
|
||||
(lib.enableFeature withPam "pam")
|
||||
(lib.enableFeature withZlib "zlib")
|
||||
(lib.enableFeature withIconv "iconv")
|
||||
(lib.enableFeature withTools "tools")
|
||||
(lib.enableFeature withRedis "redis")
|
||||
] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}";
|
||||
configureFlags = [
|
||||
(lib.enableFeature withMysql "mysql")
|
||||
(lib.enableFeature withPgsql "pgsql")
|
||||
(lib.enableFeature withSqlite "sqlite")
|
||||
(lib.enableFeature withPam "pam")
|
||||
(lib.enableFeature withZlib "zlib")
|
||||
(lib.enableFeature withTools "tools")
|
||||
(lib.enableFeature withRedis "redis")
|
||||
] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
postPatch = ''
|
||||
cp -r $deps deps
|
||||
chmod -R +w deps
|
||||
patchShebangs .
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.136.0";
|
||||
version = "0.137.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-KWWMogB2yTu6FYU0BYkhY0VfAg7ppQqTmtrlvD2cds0=";
|
||||
hash = "sha256-OTTEJugF/yur3n6LZ1ESJV03DzFEvQ4HXCFUDLrTbYg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WJiCK5DVsCU+aBlkhpHISuY8MxDxJiVK1nKtY8uxziI=";
|
||||
vendorHash = "sha256-q+xLO1oppamR34TMFEajY/D+3nPcXDW0oeA/pzS8hI0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -3,21 +3,21 @@ GEM
|
||||
specs:
|
||||
CFPropertyList (3.0.6)
|
||||
rexml
|
||||
addressable (2.8.1)
|
||||
addressable (2.8.4)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
artifactory (3.0.15)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.716.0)
|
||||
aws-sdk-core (3.170.0)
|
||||
aws-partitions (1.748.0)
|
||||
aws-sdk-core (3.171.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-kms (1.62.0)
|
||||
aws-sdk-kms (1.63.0)
|
||||
aws-sdk-core (~> 3, >= 3.165.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.119.1)
|
||||
aws-sdk-s3 (1.120.1)
|
||||
aws-sdk-core (~> 3, >= 3.165.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
@@ -66,7 +66,7 @@ GEM
|
||||
faraday_middleware (1.2.0)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.2.6)
|
||||
fastlane (2.212.1)
|
||||
fastlane (2.212.2)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
addressable (>= 2.8, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
@@ -106,8 +106,8 @@ GEM
|
||||
xcpretty (~> 0.3.0)
|
||||
xcpretty-travis-formatter (>= 0.0.3)
|
||||
gh_inspector (1.1.3)
|
||||
google-apis-androidpublisher_v3 (0.34.0)
|
||||
google-apis-core (>= 0.9.1, < 2.a)
|
||||
google-apis-androidpublisher_v3 (0.39.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-core (0.11.0)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
@@ -119,8 +119,8 @@ GEM
|
||||
webrick
|
||||
google-apis-iamcredentials_v1 (0.17.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.12.0)
|
||||
google-apis-core (>= 0.9.1, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.13.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-storage_v1 (0.19.0)
|
||||
google-apis-core (>= 0.9.0, < 2.a)
|
||||
google-cloud-core (1.6.0)
|
||||
@@ -128,7 +128,7 @@ GEM
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (1.6.0)
|
||||
faraday (>= 0.17.3, < 3.0)
|
||||
google-cloud-errors (1.3.0)
|
||||
google-cloud-errors (1.3.1)
|
||||
google-cloud-storage (1.44.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
@@ -137,7 +137,7 @@ GEM
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
mini_mime (~> 1.0)
|
||||
googleauth (1.3.0)
|
||||
googleauth (1.5.2)
|
||||
faraday (>= 0.17.3, < 3.a)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
memoist (~> 0.16)
|
||||
@@ -215,4 +215,4 @@ DEPENDENCIES
|
||||
fastlane
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.6
|
||||
2.4.10
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
|
||||
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.8.4";
|
||||
};
|
||||
artifactory = {
|
||||
groups = ["default"];
|
||||
@@ -45,10 +45,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dy4pxcblfl67gdw64ffjh9zxv10nnjszri861f8xa6cfqr3hqp1";
|
||||
sha256 = "12pi6xcvwaplzgy24vqiw2q9aaxs5r8gl92kv2gy6riqldgs10gi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.716.0";
|
||||
version = "1.748.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
|
||||
@@ -56,10 +56,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r";
|
||||
sha256 = "0732vv8zi67z25fss1sdvqx0vv1ap3w6hz1avxzwznkjp002vj39";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.170.0";
|
||||
version = "3.171.0";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
dependencies = ["aws-sdk-core" "aws-sigv4"];
|
||||
@@ -67,10 +67,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr";
|
||||
sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.62.0";
|
||||
version = "1.63.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
|
||||
@@ -78,10 +78,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp";
|
||||
sha256 = "1mapdzm97rv22pca1hvvshwsafa12gd2yv2fcy63dfjn5vjjq893";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.119.1";
|
||||
version = "1.120.1";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
dependencies = ["aws-eventstream"];
|
||||
@@ -368,10 +368,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b22m2dkydyv2si55b1jzznzgxf2ycx2aarv1j5p25k861h2gsml";
|
||||
sha256 = "15sa3v3aaslympg9nmadmpxpbzykdiybzxn3navc7mf0iscb3q7s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.212.1";
|
||||
version = "2.212.2";
|
||||
};
|
||||
gh_inspector = {
|
||||
groups = ["default"];
|
||||
@@ -389,10 +389,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09almff2kzdkciai63365q18wy0dfjhj48h8wa7lk77pjbfxgqfp";
|
||||
sha256 = "0wzsrh3k07x2vxw649hwwylfij1pbmiivcm4ihiiizz778jrwhn4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.34.0";
|
||||
version = "0.39.0";
|
||||
};
|
||||
google-apis-core = {
|
||||
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
|
||||
@@ -422,10 +422,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kq1hfzg3i5i9fml7f6ffpihy340h23w2gcgqdkdhqgc5zd7nq0s";
|
||||
sha256 = "1mlgwiid5lgg41y7qk8ca9lzhwx5njs25hz5fbf1mdal0kwm37lm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
};
|
||||
google-apis-storage_v1 = {
|
||||
dependencies = ["google-apis-core"];
|
||||
@@ -465,10 +465,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jynh1s93nl8njm5l5wcy86pnjmv112cq6m0443s52f04hg6h2s5";
|
||||
sha256 = "0flpj7v196c3xsqx4yjb7rjcj8p0by4rhj6qf5zanw4p1i41ssf0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
};
|
||||
google-cloud-storage = {
|
||||
dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
|
||||
@@ -487,10 +487,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai";
|
||||
sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.5.2";
|
||||
};
|
||||
highline = {
|
||||
groups = ["default"];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluent-bit";
|
||||
version = "2.0.10";
|
||||
version = "2.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6bmtSsNjSy7+Q2MWJdrP+zaXKwV4CEiBjhdZju+RBLI=";
|
||||
sha256 = "sha256-/LkQnS3NMvZf0yP6X32sayXvUDd0et5VkCWvJe4GboI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
@@ -31,6 +31,17 @@ stdenv.mkDerivation rec {
|
||||
--replace "/bin/rm" "${coreutils}/bin/rm"
|
||||
'';
|
||||
|
||||
# AOT native-comp, mostly copied from pkgs/build-support/emacs/generic.nix
|
||||
postInstall = lib.optionalString (emacs.nativeComp or false) ''
|
||||
mkdir -p $out/share/emacs/native-lisp
|
||||
export EMACSLOADPATH=$out/share/emacs/site-lisp/mu4e:
|
||||
export EMACSNATIVELOADPATH=$out/share/emacs/native-lisp:
|
||||
|
||||
find $out/share/emacs -type f -name '*.el' -print0 \
|
||||
| xargs -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \
|
||||
"emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true"
|
||||
'';
|
||||
|
||||
buildInputs = [ emacs glib gmime3 texinfo xapian ];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{ lib
|
||||
, fetchFromGitea
|
||||
, rustPlatform
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wgautomesh";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.deuxfleurs.fr";
|
||||
owner = "Deuxfleurs";
|
||||
repo = "wgautomesh";
|
||||
rev = "v${version}";
|
||||
sha256 = "FiFEpYLSJg52EtBXaZ685ICbaIyY9URrDt0bS0HPi0Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DGDVjQ4fr4/F1RE0qVc5CWcXrrCEswCF7rQQwlKzMPA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple utility to help connect wireguard nodes together in a full mesh topology";
|
||||
homepage = "https://git.deuxfleurs.fr/Deuxfleurs/wgautomesh";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = [ maintainers.lx ];
|
||||
};
|
||||
}
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nix-update";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-4Hrumb4c0861Aorzfk0eM3++XiWkGopnMuIdb+MTKlo=";
|
||||
hash = "sha256-qWVlJJmjrN3inRJ7ukGVT5971CMmB1KWM4XwluqYuzU=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtest
|
||||
, pcsclite
|
||||
, pkg-config
|
||||
, qmake
|
||||
, qttranslations
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "web-eid-app";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "web-eid";
|
||||
repo = "web-eid-app";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TOzOcPY4m7OdCfaAXyc/joIHe2O2YbyDrXiNytPMKSk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtest # required during build of lib/libelectronic-id/lib/libpcsc-cpp
|
||||
pcsclite
|
||||
qttranslations
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "signing and authentication operations with smart cards for the Web eID browser extension";
|
||||
longDescription = ''
|
||||
The Web eID application performs cryptographic digital signing and
|
||||
authentication operations with electronic ID smart cards for the Web eID
|
||||
browser extension (it is the [native messaging host](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging)
|
||||
for the extension). Also works standalone without the extension in command-line
|
||||
mode.
|
||||
'';
|
||||
homepage = "https://github.com/web-eid/web-eid-app";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.flokli ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-audit";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slackhq";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iJm33IZ3kGWnGVDVbQCTvoo+dXBU5092YYXZG+Z7vi0=";
|
||||
sha256 = "sha256-Li/bMgl/wj9bHpXW5gwWvb7BvyBPzeLCP979J2kyRCM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sQBnnBZm7kM8IAfsFhSIBLo2LLdTimVAQw1ogWo/a4Y=";
|
||||
vendorHash = "sha256-JHimXGsUMAQqCutREsmtgDIf6Vda+it0IL3AfS86omU=";
|
||||
|
||||
# Tests need network access
|
||||
doCheck = false;
|
||||
|
||||
@@ -13466,6 +13466,8 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
wgautomesh = callPackage ../tools/networking/wgautomesh { };
|
||||
|
||||
woff2 = callPackage ../development/web/woff2 { };
|
||||
|
||||
woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { };
|
||||
@@ -13758,6 +13760,8 @@ with pkgs;
|
||||
|
||||
wdfs = callPackage ../tools/filesystems/wdfs { };
|
||||
|
||||
web-eid-app = libsForQt5.callPackage ../tools/security/web-eid-app { };
|
||||
|
||||
wdiff = callPackage ../tools/text/wdiff { };
|
||||
|
||||
wdisplays = callPackage ../tools/graphics/wdisplays { };
|
||||
|
||||
@@ -209,10 +209,14 @@ let
|
||||
|
||||
cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { };
|
||||
|
||||
cohttp-lwt-jsoo = callPackage ../development/ocaml-modules/cohttp/lwt-jsoo.nix { };
|
||||
|
||||
cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { };
|
||||
|
||||
cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { };
|
||||
|
||||
cohttp-top = callPackage ../development/ocaml-modules/cohttp/top.nix { };
|
||||
|
||||
coin = callPackage ../development/ocaml-modules/coin { };
|
||||
|
||||
color = callPackage ../development/ocaml-modules/color { };
|
||||
|
||||
Reference in New Issue
Block a user