Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-03-10 00:14:11 +00:00 committed by GitHub
commit bf7ad8aa57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
173 changed files with 10766 additions and 7321 deletions

View File

@ -21,6 +21,7 @@ let
isBool
isFunction
isList
isPath
isString
length
mapAttrs
@ -45,6 +46,9 @@ let
showOption
unknownModule
;
inherit (lib.strings)
isConvertibleWithToString
;
showDeclPrefix = loc: decl: prefix:
" - option(s) with prefix `${showOption (loc ++ [prefix])}' in module `${decl._file}'";
@ -403,7 +407,7 @@ rec {
key = module.key;
module = module;
modules = collectedImports.modules;
disabled = module.disabledModules ++ collectedImports.disabled;
disabled = (if module.disabledModules != [] then [{ file = module._file; disabled = module.disabledModules; }] else []) ++ collectedImports.disabled;
}) initialModules);
# filterModules :: String -> { disabled, modules } -> [ Module ]
@ -412,10 +416,30 @@ rec {
# modules recursively. It returns the final list of unique-by-key modules
filterModules = modulesPath: { disabled, modules }:
let
moduleKey = m: if isString m && (builtins.substring 0 1 m != "/")
then toString modulesPath + "/" + m
else toString m;
disabledKeys = map moduleKey disabled;
moduleKey = file: m:
if isString m
then
if builtins.substring 0 1 m == "/"
then m
else toString modulesPath + "/" + m
else if isConvertibleWithToString m
then
if m?key && m.key != toString m
then
throw "Module `${file}` contains a disabledModules item that is an attribute set that can be converted to a string (${toString m}) but also has a `.key` attribute (${m.key}) with a different value. This makes it ambiguous which module should be disabled."
else
toString m
else if m?key
then
m.key
else if isAttrs m
then throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute."
else throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${builtins.typeOf m}.";
disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabled;
keyFilter = filter (attrs: ! elem attrs.key disabledKeys);
in map (attrs: attrs.module) (builtins.genericClosure {
startSet = keyFilter modules;

View File

@ -140,6 +140,7 @@ rec {
qemuArch =
if final.isAarch32 then "arm"
else if final.isS390 && !final.isS390x then null
else if final.isx86_64 then "x86_64"
else if final.isx86 then "i386"
else final.uname.processor;
@ -193,7 +194,7 @@ rec {
then "${pkgs.runtimeShell} -c '\"$@\"' --"
else if final.isWindows
then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}"
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null
then "${qemu-user}/bin/qemu-${final.qemuArch}"
else if final.isWasi
then "${pkgs.wasmtime}/bin/wasmtime"

View File

@ -141,6 +141,14 @@ checkConfigError "The option .*enable.* does not exist. Definition values:\n\s*-
checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix
checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix
checkConfigOutput '^true$' 'config.positive.enable' ./disable-module-with-key.nix
checkConfigOutput '^false$' 'config.negative.enable' ./disable-module-with-key.nix
checkConfigError 'Module ..*disable-module-bad-key.nix. contains a disabledModules item that is an attribute set, presumably a module, that does not have a .key. attribute. .*' 'config.enable' ./disable-module-bad-key.nix
# Not sure if we want to keep supporting module keys that aren't strings, paths or v?key, but we shouldn't remove support accidentally.
checkConfigOutput '^true$' 'config.positive.enable' ./disable-module-with-toString-key.nix
checkConfigOutput '^false$' 'config.negative.enable' ./disable-module-with-toString-key.nix
# Check _module.args.
set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix
checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@"
@ -358,6 +366,10 @@ checkConfigOutput '^"The option `a\.b. defined in `.*/doRename-warnings\.nix. ha
config.result \
./doRename-warnings.nix
# Anonymous modules get deduplicated by key
checkConfigOutput '^"pear"$' config.once.raw ./merge-module-with-key.nix
checkConfigOutput '^"pear\\npear"$' config.twice.raw ./merge-module-with-key.nix
cat <<EOF
====== module tests ======
$pass Pass

View File

@ -0,0 +1,16 @@
{ lib, ... }:
let
inherit (lib) mkOption types;
moduleWithKey = { config, ... }: {
config = {
enable = true;
};
};
in
{
imports = [
./declare-enable.nix
];
disabledModules = [ { } ];
}

View File

@ -0,0 +1,34 @@
{ lib, ... }:
let
inherit (lib) mkOption types;
moduleWithKey = {
key = "disable-module-with-key.nix#moduleWithKey";
config = {
enable = true;
};
};
in
{
options = {
positive = mkOption {
type = types.submodule {
imports = [
./declare-enable.nix
moduleWithKey
];
};
default = {};
};
negative = mkOption {
type = types.submodule {
imports = [
./declare-enable.nix
moduleWithKey
];
disabledModules = [ moduleWithKey ];
};
default = {};
};
};
}

View File

@ -0,0 +1,34 @@
{ lib, ... }:
let
inherit (lib) mkOption types;
moduleWithKey = {
key = 123;
config = {
enable = true;
};
};
in
{
options = {
positive = mkOption {
type = types.submodule {
imports = [
./declare-enable.nix
moduleWithKey
];
};
default = {};
};
negative = mkOption {
type = types.submodule {
imports = [
./declare-enable.nix
moduleWithKey
];
disabledModules = [ 123 ];
};
default = {};
};
};
}

View File

@ -0,0 +1,49 @@
{ lib, ... }:
let
inherit (lib) mkOption types;
moduleWithoutKey = {
config = {
raw = "pear";
};
};
moduleWithKey = {
key = __curPos.file + "#moduleWithKey";
config = {
raw = "pear";
};
};
decl = {
options = {
raw = mkOption {
type = types.lines;
};
};
};
in
{
options = {
once = mkOption {
type = types.submodule {
imports = [
decl
moduleWithKey
moduleWithKey
];
};
default = {};
};
twice = mkOption {
type = types.submodule {
imports = [
decl
moduleWithoutKey
moduleWithoutKey
];
};
default = {};
};
};
}

View File

@ -8948,7 +8948,8 @@
githubId = 13547699;
name = "Corin Hoad";
keys = [{
fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492";
# fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; # old key, superseded
fingerprint = "6E69 6A19 4BD8 BFAE 7362 ACDB 6437 4619 95CA 7F16";
}];
};
lux = {
@ -9270,6 +9271,12 @@
githubId = 854770;
name = "Matej Cotman";
};
mateodd25 = {
email = "mateodd@icloud.com";
github = "mateodd25";
githubId = 854770;
name = "Mateo Diaz";
};
mathnerd314 = {
email = "mathnerd314.gph+hs@gmail.com";
github = "Mathnerd314";
@ -10722,12 +10729,6 @@
fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35";
}];
};
nichtsfrei = {
email = "philipp.eder@posteo.net";
github = "nichtsfrei";
githubId = 1665818;
name = "Philipp Eder";
};
nickcao = {
name = "Nick Cao";
email = "nickcao@nichi.co";

View File

@ -8,8 +8,15 @@ the system on a stable release.
`disabledModules` is a top level attribute like `imports`, `options` and
`config`. It contains a list of modules that will be disabled. This can
either be the full path to the module or a string with the filename
relative to the modules path (eg. \<nixpkgs/nixos/modules> for nixos).
either be:
- the full path to the module,
- or a string with the filename relative to the modules path (eg. \<nixpkgs/nixos/modules> for nixos),
- or an attribute set containing a specific `key` attribute.
The latter allows some modules to be disabled, despite them being distributed
via attributes instead of file paths. The `key` should be globally unique, so
it is recommended to include a file path in it, or rely on a framework to do it
for you.
This example will replace the existing postgresql module with the
version defined in the nixos-unstable channel while keeping the rest of

View File

@ -61,7 +61,7 @@ with lib;
pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
qt5 = super.qt5.overrideScope' (const (super': {
qt5 = super.qt5.overrideScope (const (super': {
qtbase = super'.qtbase.override { withGtk3 = false; };
}));
stoken = super.stoken.override { withGTK3 = false; };

View File

@ -1129,6 +1129,7 @@
./services/web-apps/baget.nix
./services/web-apps/bookstack.nix
./services/web-apps/calibre-web.nix
./services/web-apps/coder.nix
./services/web-apps/changedetection-io.nix
./services/web-apps/cloudlog.nix
./services/web-apps/code-server.nix

View File

@ -398,7 +398,7 @@ in
systemd.services.hydra-evaluator =
{ wantedBy = [ "multi-user.target" ];
requires = [ "hydra-init.service" ];
after = [ "hydra-init.service" "network.target" ];
after = [ "hydra-init.service" "network.target" "network-online.target" ];
path = with pkgs; [ hydra-package nettools jq ];
restartTriggers = [ hydraConf ];
environment = env // {

View File

@ -0,0 +1,217 @@
{ config, lib, options, pkgs, ... }:
with lib;
let
cfg = config.services.coder;
name = "coder";
in {
options = {
services.coder = {
enable = mkEnableOption (lib.mdDoc "Coder service");
user = mkOption {
type = types.str;
default = "coder";
description = lib.mdDoc ''
User under which the coder service runs.
::: {.note}
If left as the default value this user will automatically be created
on system activation, otherwise it needs to be configured manually.
:::
'';
};
group = mkOption {
type = types.str;
default = "coder";
description = lib.mdDoc ''
Group under which the coder service runs.
::: {.note}
If left as the default value this group will automatically be created
on system activation, otherwise it needs to be configured manually.
:::
'';
};
package = mkOption {
type = types.package;
default = pkgs.coder;
description = lib.mdDoc ''
Package to use for the service.
'';
defaultText = literalExpression "pkgs.coder";
};
homeDir = mkOption {
type = types.str;
description = lib.mdDoc ''
Home directory for coder user.
'';
default = "/var/lib/coder";
};
listenAddress = mkOption {
type = types.str;
description = lib.mdDoc ''
Listen address.
'';
default = "127.0.0.1:3000";
};
accessUrl = mkOption {
type = types.nullOr types.str;
description = lib.mdDoc ''
Access URL should be a external IP address or domain with DNS records pointing to Coder.
'';
default = null;
example = "https://coder.example.com";
};
wildcardAccessUrl = mkOption {
type = types.nullOr types.str;
description = lib.mdDoc ''
If you are providing TLS certificates directly to the Coder server, you must use a single certificate for the root and wildcard domains.
'';
default = null;
example = "*.coder.example.com";
};
database = {
createLocally = mkOption {
type = types.bool;
default = true;
description = lib.mdDoc ''
Create the database and database user locally.
'';
};
host = mkOption {
type = types.str;
default = "/run/postgresql";
description = lib.mdDoc ''
Hostname hosting the database.
'';
};
database = mkOption {
type = types.str;
default = "coder";
description = lib.mdDoc ''
Name of database.
'';
};
username = mkOption {
type = types.str;
default = "coder";
description = lib.mdDoc ''
Username for accessing the database.
'';
};
password = mkOption {
type = types.nullOr types.str;
default = null;
description = lib.mdDoc ''
Password for accessing the database.
'';
};
sslmode = mkOption {
type = types.nullOr types.str;
default = "disable";
description = lib.mdDoc ''
Password for accessing the database.
'';
};
};
tlsCert = mkOption {
type = types.nullOr types.path;
description = lib.mdDoc ''
The path to the TLS certificate.
'';
default = null;
};
tlsKey = mkOption {
type = types.nullOr types.path;
description = lib.mdDoc ''
The path to the TLS key.
'';
default = null;
};
};
};
config = mkIf cfg.enable {
assertions = [
{ assertion = cfg.database.createLocally -> cfg.database.username == name;
message = "services.coder.database.username must be set to ${user} if services.coder.database.createLocally is set true";
}
];
systemd.services.coder = {
description = "Coder - Self-hosted developer workspaces on your infra";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
CODER_ACCESS_URL = cfg.accessUrl;
CODER_WILDCARD_ACCESS_URL = cfg.wildcardAccessUrl;
CODER_PG_CONNECTION_URL = "user=${cfg.database.username} ${optionalString (cfg.database.password != null) "password=${cfg.database.password}"} database=${cfg.database.database} host=${cfg.database.host} ${optionalString (cfg.database.sslmode != null) "sslmode=${cfg.database.sslmode}"}";
CODER_ADDRESS = cfg.listenAddress;
CODER_TLS_ENABLE = optionalString (cfg.tlsCert != null) "1";
CODER_TLS_CERT_FILE = cfg.tlsCert;
CODER_TLS_KEY_FILE = cfg.tlsKey;
};
serviceConfig = {
ProtectSystem = "full";
PrivateTmp = "yes";
PrivateDevices = "yes";
SecureBits = "keep-caps";
AmbientCapabilities = "CAP_IPC_LOCK CAP_NET_BIND_SERVICE";
CacheDirectory = "coder";
CapabilityBoundingSet = "CAP_SYSLOG CAP_IPC_LOCK CAP_NET_BIND_SERVICE";
KillSignal = "SIGINT";
KillMode = "mixed";
NoNewPrivileges = "yes";
Restart = "on-failure";
ExecStart = "${cfg.package}/bin/coder server";
User = cfg.user;
Group = cfg.group;
};
};
services.postgresql = lib.mkIf cfg.database.createLocally {
enable = true;
ensureDatabases = [
cfg.database.database
];
ensureUsers = [{
name = cfg.database.username;
ensurePermissions = {
"DATABASE \"${cfg.database.database}\"" = "ALL PRIVILEGES";
};
}
];
};
users.groups = optionalAttrs (cfg.group == name) {
"${cfg.group}" = {};
};
users.users = optionalAttrs (cfg.user == name) {
${name} = {
description = "Coder service user";
group = cfg.group;
home = cfg.homeDir;
createHome = true;
isSystemUser = true;
};
};
};
}

View File

@ -614,7 +614,7 @@ in
# Avoid potentially degraded system state due to
# "Userspace Out-Of-Memory (OOM) Killer was skipped because of a failed condition check (ConditionControlGroupController=v2)."
systemd.services.systemd-oomd.enable = mkIf (!cfg.enableUnifiedCgroupHierarchy) false;
systemd.oomd.enable = mkIf (!cfg.enableUnifiedCgroupHierarchy) false;
services.logrotate.settings = {
"/var/log/btmp" = mapAttrs (_: mkDefault) {

View File

@ -895,7 +895,7 @@ in
${optionalString cfg.writableStore ''
echo "mounting overlay filesystem on /nix/store..."
mkdir -p 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store
mkdir -p -m 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store
mount -t overlay overlay $targetRoot/nix/store \
-o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail
''}
@ -1097,7 +1097,7 @@ in
unitConfig.DefaultDependencies = false;
serviceConfig = {
Type = "oneshot";
ExecStart = "/bin/mkdir -p 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store";
ExecStart = "/bin/mkdir -p -m 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store";
};
};
};

View File

@ -137,6 +137,7 @@ in {
cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {};
cockpit = handleTest ./cockpit.nix {};
cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {};
coder = handleTest ./coder.nix {};
collectd = handleTest ./collectd.nix {};
connman = handleTest ./connman.nix {};
consul = handleTest ./consul.nix {};

24
nixos/tests/coder.nix Normal file
View File

@ -0,0 +1,24 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "coder";
meta = with pkgs.lib.maintainers; {
maintainers = [ shyim ghuntley ];
};
nodes.machine =
{ pkgs, ... }:
{
services.coder = {
enable = true;
accessUrl = "http://localhost:3000";
};
};
testScript = ''
machine.start()
machine.wait_for_unit("postgresql.service")
machine.wait_for_unit("coder.service")
machine.wait_for_open_port(3000)
machine.succeed("curl --fail http://localhost:3000")
'';
})

View File

@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.75";
version = "6.77";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = {
x86_64-linux = "sha256-wtXClHL+SeuLxMROaZKZOwYnLo6MXC7lAiwCj80X0Ck=";
aarch64-linux = "sha256-xCkAbKzXH7E1Ud6iGsnzgZT/2Sy6qpRItYUHFF6ggpQ=";
x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc=";
aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60=";
}.${stdenv.hostPlatform.system};
};

View File

@ -366,21 +366,6 @@
license = lib.licenses.free;
};
}) {};
beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "beframe";
ename = "beframe";
version = "0.1.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/beframe-0.1.11.tar";
sha256 = "1r5wlg2xaih197fi3jk0qmnhpy7mc6xrwraxfnygsjwr63dxhnq2";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/beframe.html";
license = lib.licenses.free;
};
}) {};
bind-key = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "bind-key";
@ -1674,16 +1659,16 @@
license = lib.licenses.free;
};
}) {};
erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "erc";
ename = "erc";
version = "5.5";
version = "5.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/erc-5.5.tar";
sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp";
url = "https://elpa.gnu.org/packages/erc-5.4.1.tar";
sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a";
};
packageRequires = [ compat emacs ];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/erc.html";
license = lib.licenses.free;
@ -2627,10 +2612,10 @@
elpaBuild {
pname = "kind-icon";
ename = "kind-icon";
version = "0.2.0";
version = "0.1.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/kind-icon-0.2.0.tar";
sha256 = "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r";
url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar";
sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli";
};
packageRequires = [ emacs svg-lib ];
meta = {
@ -3062,10 +3047,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
version = "4.1.1";
version = "3.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-themes-4.1.1.tar";
sha256 = "06lp7mpazby7iiwzw4naym983plg9r63ba9vmaszh3609d2gm0s9";
url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar";
sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs";
};
packageRequires = [ emacs ];
meta = {
@ -3746,10 +3731,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.42";
version = "0.4.39";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.42.tar";
sha256 = "040wrmz9wl0x86vdgzyfdwxdciscd94v9nfgfz0ir2ghwhw6j9x3";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar";
sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i";
};
packageRequires = [ emacs ];
meta = {
@ -3836,10 +3821,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
version = "1.4.0";
version = "1.3.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/posframe-1.4.0.tar";
sha256 = "0pqy7scdi3qxj518xm0bbr3979byfxqxxh64wny37xzhd4apsw5j";
url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar";
sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b";
};
packageRequires = [ emacs ];
meta = {
@ -4437,10 +4422,10 @@
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.4.2";
version = "2.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
sha256 = "1ldvil6hjs8c7wpdwx0jwaar867dil5qh6vy2k27i1alffr9nnqm";
url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar";
sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i";
};
packageRequires = [ emacs ];
meta = {
@ -4911,10 +4896,10 @@
elpaBuild {
pname = "taxy-magit-section";
ename = "taxy-magit-section";
version = "0.12.2";
version = "0.12.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar";
sha256 = "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1";
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar";
sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg";
};
packageRequires = [ emacs magit-section taxy ];
meta = {
@ -5050,10 +5035,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.6.0.2";
version = "2.6.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.6.0.2.tar";
sha256 = "0pfrsgci1rqrykkfyxm9wsn7f0l3rzc2vj1fas27w925l0k0lrci";
url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar";
sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8";
};
packageRequires = [ emacs ];
meta = {
@ -5155,10 +5140,10 @@
elpaBuild {
pname = "triples";
ename = "triples";
version = "0.2.6";
version = "0.2.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/triples-0.2.6.tar";
sha256 = "09vr8r78vpycpxglacbgy2fy01khmvhh42panilwz2n9nhjy6xzm";
url = "https://elpa.gnu.org/packages/triples-0.2.3.tar";
sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39";
};
packageRequires = [ emacs seq ];
meta = {
@ -5426,10 +5411,10 @@
elpaBuild {
pname = "vertico-posframe";
ename = "vertico-posframe";
version = "0.7.2";
version = "0.7.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.2.tar";
sha256 = "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny";
url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar";
sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a";
};
packageRequires = [ emacs posframe vertico ];
meta = {

View File

@ -9,6 +9,8 @@ in
agda2-mode = callPackage ./manual-packages/agda2-mode { };
bqn-mode = callPackage ./manual-packages/bqn-mode { };
cask = callPackage ./manual-packages/cask { };
control-lock = callPackage ./manual-packages/control-lock { };

View File

@ -0,0 +1,22 @@
{ lib
, trivialBuild
, fetchFromGitHub
}:
trivialBuild {
pname = "bqn-mode";
version = "0.pre+date=2022-09-14";
src = fetchFromGitHub {
owner = "museoa";
repo = "bqn-mode";
rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013";
hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a";
};
meta = with lib; {
description = "Emacs mode for BQN programming language";
license = licenses.gpl3Only;
maintainers = with maintainers; [ sternenseemann AndersonTorres ];
};
}

View File

@ -3182,10 +3182,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "22.12.20230301220803";
version = "22.9.20230207171612";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.12.20230301220803.tar";
sha256 = "0m1wyhxqsih7777hchjk4v742ar16frdjvxyspa72az881yinv5g";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar";
sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b";
};
packageRequires = [ emacs ];
meta = {

View File

@ -7644,6 +7644,18 @@ final: prev:
meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
};
smartyank-nvim = buildVimPluginFrom2Nix {
pname = "smartyank.nvim";
version = "2023-02-25";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "smartyank.nvim";
rev = "7e3905578f646503525b2f7018b8afd17861018c";
sha256 = "19lp8cpnp3ynr6vc5si3gsfpdw78xs8krmaqlbjsx478ig316y7z";
};
meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/";
};
snap = buildVimPluginFrom2Nix {
pname = "snap";
version = "2022-08-03";

View File

@ -642,6 +642,7 @@ https://github.com/mopp/sky-color-clock.vim/,,
https://github.com/kovisoft/slimv/,,
https://github.com/mrjones2014/smart-splits.nvim/,,
https://github.com/gorkunov/smartpairs.vim/,,
https://github.com/ibhagwan/smartyank.nvim/,,
https://github.com/camspiers/snap/,,
https://github.com/norcalli/snippets.nvim/,,
https://github.com/shaunsingh/solarized.nvim/,HEAD,

View File

@ -1,20 +1,23 @@
{
"name": "rust-analyzer",
"version": "0.3.1059",
"version": "0.3.1426",
"dependencies": {
"d3": "^7.3.0",
"d3-graphviz": "^4.1.0",
"vscode-languageclient": "8.0.0-next.14",
"@types/node": "~14.17.5",
"anser": "^2.1.1",
"d3": "^7.6.1",
"d3-graphviz": "^5.0.2",
"vscode-languageclient": "^8.0.2",
"@types/node": "~16.11.7",
"@types/vscode": "~1.66.0",
"@typescript-eslint/eslint-plugin": "^5.16.0",
"@typescript-eslint/parser": "^5.16.0",
"@vscode/test-electron": "^2.1.3",
"@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.30.5",
"@vscode/test-electron": "^2.1.5",
"cross-env": "^7.0.3",
"eslint": "^8.11.0",
"tslib": "^2.3.0",
"typescript": "^4.6.3",
"typescript-formatter": "^7.2.2",
"vsce": "^2.7.0"
"eslint": "^8.19.0",
"eslint-config-prettier": "^8.5.0",
"ovsx": "^0.5.2",
"prettier": "^2.7.1",
"tslib": "^2.4.0",
"typescript": "^4.7.4",
"vsce": "^2.9.2"
}
}

View File

@ -20,13 +20,13 @@ let
# Use the plugin version as in vscode marketplace, updated by update script.
inherit (vsix) version;
releaseTag = "2022-05-17";
releaseTag = "2023-03-06";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = releaseTag;
sha256 = "sha256-vrVpgQYUuJPgK1NMb1nxlCdxjoYo40YkUbZpH2Z2mwM=";
sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY=";
};
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps";

View File

@ -48,4 +48,4 @@ else
./"$node_packages"/generate.sh
fi
echo "Remember to also update the revisionTag and hash in default.nix!"
echo "Remember to also update the releaseTag and hash in default.nix!"

View File

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1qayw19mb7f0gcgcvl57gpacrqsyx2jvc6s63vzbx8jmf5qnk71a";
x86_64-darwin = "02z9026kp66lx6pll46xx790jj7c7wh2ca7xim373x90k8hm4kwz";
aarch64-linux = "1izqhzvv46p05k1z2yg380ddwmar4w2pbrd0dyvkdysvp166y931";
aarch64-darwin = "1zcr653ssck4nc3vf04l6bilnjdsiqscw62g1wzbyk6s50133cx8";
armv7l-linux = "0n914rcfn2m9zsbnkd82cmw88qbpssv6jk3g8ig3wqlircbgrw0h";
x86_64-linux = "11w2gzhp0vlpygk93cksxhkimc9y8w862gn9450xkzi1jsps5lj4";
x86_64-darwin = "0ya17adx2vbi800ws5sfqq03lrjjk6kbclrfrc2zfij2ha05xl8z";
aarch64-linux = "15kzjs1ha5x2hcq28nkbb0rim1v694jj6p9sz226rai3bmq9airg";
aarch64-darwin = "1cggppblr42jzpcz3g8052w5y1b9392iizpvg6y7001kw66ndp3n";
armv7l-linux = "01qqhhl5ffvba1pk4jj3q7sbahq7cvy81wvmgng1cmaj5b8m8dgp";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.75.0.23033";
version = "1.76.0.23062";
pname = "vscodium";
executableName = "codium";

View File

@ -27,13 +27,13 @@
stdenv.mkDerivation (self: {
pname = "xemu";
version = "0.7.84";
version = "0.7.85";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
rev = "v${self.version}";
hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY=";
hash = "sha256-sVUkB2KegdKlHlqMvSwB1nLdJGun2x2x9HxtNHnpp1s=";
fetchSubmodules = true;
};

View File

@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.0-62";
version = "7.1.1-0";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-K74BWxGTpkaE+KBrdOCVd+m/2MJP6YUkB2CFh/YEHyI=";
hash = "sha256-FaoiB8qnzgREaslEXRituToIbU9tK3FnvC5ptFkctjA=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

View File

@ -15,12 +15,12 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
version = "4906";
version = "4907";
src = fetchsvn {
url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
rev = version;
sha256 = "sha256-N1VU5XOENCQiUnDCFpotx+8Pr3VFuWLu1ABcbm0feOM=";
sha256 = "sha256-2DwIH6GNsK2XwaVxzPvN1qt4XRSi5fCQDwltBCBg4gI=";
};
patches = [

View File

@ -15,17 +15,19 @@
, zlib
, icu
, freetype
, pugixml
, nix-update-script
}:
mkDerivation rec {
pname = "organicmaps";
version = "2023.01.25-3";
version = "2023.03.05-5";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
sha256 = "sha256-4nlD/GFOoBOCXVWtC7i6SUquEbob5++GyagZOTznygU=";
sha256 = "sha256-PfudozmrL8jNS/99nxSn0B3E53W34m4/ZN0y2ucB2WI=";
fetchSubmodules = true;
};
@ -55,6 +57,7 @@ mkDerivation rec {
zlib
icu
freetype
pugixml
];
# Yes, this is PRE configure. The configure phase uses cmake
@ -62,6 +65,13 @@ mkDerivation rec {
bash ./configure.sh
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
extraArgs = [ "-vr" "(.*)-android" ];
};
};
meta = with lib; {
# darwin: "invalid application of 'sizeof' to a function type"
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;

View File

@ -40,8 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Describe your shell commands in natural language";
homepage = "https://github.com/dylanjcastillo/shell-genie";
# https://github.com/dylanjcastillo/shell-genie/issues/3
license = licenses.unfree;
license = licenses.mit;
maintainers = with maintainers; [ onny ];
};
}

View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "avalanchego";
version = "1.9.10";
version = "1.9.11";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-lzobtncxL/7Lf/+kVzIdyP0dTzerMJRAoT7OBFdeEgc=";
hash = "sha256-fgjuLQNw5Em+wEJSmote6TuFH8dUVDtkQTgCcGhh2ro=";
};
vendorHash = "sha256-IxPJBpOSqcramegQ+M/U9p6ls6dStOi0OUdddDj11d0=";

View File

@ -1,5 +1,4 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_14
, llvmPackages_15
, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
@ -19,7 +18,7 @@
}:
let
llvmPackages = llvmPackages_14;
llvmPackages = llvmPackages_15;
stdenv = llvmPackages.stdenv;
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
@ -54,9 +53,6 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
} // lib.optionalAttrs (chromiumVersionAtLeast "111") rec {
llvmPackages = llvmPackages_15;
stdenv = llvmPackages_15.stdenv;
});
browser = callPackage ./browser.nix {

View File

@ -19,22 +19,9 @@
}
},
"beta": {
"version": "111.0.5563.64",
"sha256": "0x20zqwq051a5j76q1c3m0ddf1hhcm6fgz3b7rqrfamjppia0p3x",
"sha256bin64": "1cl7zbsl0ndp5x1g0p1q511mn72iy72sqxycmlrccs9j8jmaiqgw",
"deps": {
"gn": {
"version": "2022-12-12",
"url": "https://gn.googlesource.com/gn",
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
}
}
},
"dev": {
"version": "112.0.5615.12",
"sha256": "1kkpfaqr3rzxlj7kn2l8gchvq17w03mcf3aajqv193jazcb083ci",
"sha256bin64": "1ci3vmr6q665rp8h7b1y7gmkv4zczjw5ryf0yycwfcll087ym6g6",
"version": "112.0.5615.20",
"sha256": "0qxifnc2xk2zkmpzc1pzd95ym3i829qzgzd83qh7ah9p64c76f9y",
"sha256bin64": "11c7k87fnfhaynhpp2rjzpzydrl096fjx3gw589nvq1lckbg9nsd",
"deps": {
"gn": {
"version": "2023-02-17",
@ -44,10 +31,23 @@
}
}
},
"dev": {
"version": "113.0.5638.0",
"sha256": "0v4hminx765swv0iakg5qw7rk6zc67cn5p9x625jaizz50ahpfib",
"sha256bin64": "07snjlizj30mzcm5fbsg6ibd4jqmcwiykdwrpqmdqq902c3gwc3r",
"deps": {
"gn": {
"version": "2023-02-24",
"url": "https://gn.googlesource.com/gn",
"rev": "fe330c0ae1ec29db30b6f830e50771a335e071fb",
"sha256": "0fj8kfck53hbfz30m8p0mfcqbjs9cjrlfzi03l3h7n7yd88js8i4"
}
}
},
"ungoogled-chromium": {
"version": "110.0.5481.177",
"sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv",
"sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2",
"version": "111.0.5563.65",
"sha256": "1wg84pd50zi5268snkiahnp5191c66bqkbvdz2z8azivm95lwqwp",
"sha256bin64": null,
"deps": {
"gn": {
"version": "2022-12-12",
@ -56,8 +56,8 @@
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
},
"ungoogled-patches": {
"rev": "110.0.5481.177-1",
"sha256": "0rsvkbsrnfkdp3iw4s54kddw8r771h14hf1ivgahmn42yjafkk3n"
"rev": "111.0.5563.65-1",
"sha256": "06mfm2gaz1nbwqhn2jp34pm52rw1q99i9fq7wh19m0qasdpidis9"
}
}
}

View File

@ -3,6 +3,7 @@
{ stdenv
, fetchurl
, lib
, makeWrapper
, binutils-unwrapped
, xz
@ -62,6 +63,10 @@ stdenv.mkDerivation rec {
inherit sha256;
};
nativeBuildInputs = [
makeWrapper
];
unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -";
sourceRoot = ".";
@ -170,7 +175,7 @@ stdenv.mkDerivation rec {
--replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}
substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \
--replace "''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \
--replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \
--replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \
--replace /usr/bin/file ${file}/bin/file
@ -178,8 +183,13 @@ stdenv.mkDerivation rec {
--replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}
substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \
--replace "''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \
--replace "''${XDG_CONFIG_DIRS:-/etc/xdg}" "''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}"
--replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \
--replace "\''${XDG_CONFIG_DIRS:-/etc/xdg}" "\''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}"
'';
postFixup = ''
wrapProgram "$out/bin/${longName}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}"
'';
meta = with lib; {

View File

@ -219,13 +219,13 @@
"vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M="
},
"cloudflare": {
"hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=",
"hash": "sha256-LBMFszTXxiK1ZvqP6VjSCWk06/IVbJV9yEGkn6olM6k=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.0.0",
"rev": "v4.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo="
"vendorHash": "sha256-ofuLOrJSztgwtohDoZdgd9DMJSK77z93L2NlqO5bmCM="
},
"cloudfoundry": {
"hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=",
@ -684,13 +684,13 @@
"vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw="
},
"local": {
"hash": "sha256-7P6p23lQ/2Ko/RKETVe7oSZUDwKeGdznUSvbxPWds+Y=",
"hash": "sha256-LN9mYtFNPPlG3Wdz0ggS57zYMO2chf6JipRmn+OKCnw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/local",
"owner": "hashicorp",
"repo": "terraform-provider-local",
"rev": "v2.3.0",
"rev": "v2.4.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug="
"vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ="
},
"lxd": {
"hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=",
@ -811,11 +811,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-PsTlJY9Y4o7qmA2h+jbIARB9N7+Qku8CaOAYkQ2CKBU=",
"hash": "sha256-ZERJIZ1nsvvMhZe9hjcZt5F1lFNFV4TP0ifNin+MC5M=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.110.0",
"rev": "v4.111.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -964,11 +964,11 @@
"vendorHash": null
},
"scaleway": {
"hash": "sha256-gscuuaohIOIdDAAUWKg82fm9iY51ZxoN4EeAxAzTvjI=",
"hash": "sha256-4xHPQFmOAqEpqfJ6ng5z3wcuNZF8jNqu+4ZNJNxaBaI=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.12.1",
"rev": "v2.13.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-kh1wv7cuWCC1rP0WBQW95pFg53gZTakqGoMIDMDSmt0="
},
@ -1045,13 +1045,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
"hash": "sha256-bUFX6Ok7cYyaoYHElUIcEwl6DRGK8q+opKBCABo8CVM=",
"hash": "sha256-OroABl6G5nCatoyPxHZkM9I7qidxwMlgFjWC9Ljshik=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.103.0",
"rev": "v1.104.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-IlztpEAI/Z7DUQ5pMaGSQnXWPedAIJlS773nxsRMCYg="
"vendorHash": "sha256-juso8uzTjqf/vxUmpiv/07WkqMJRS1CqHQhu6pHf7QY="
},
"stackpath": {
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@ -1099,11 +1099,11 @@
"vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI="
},
"tencentcloud": {
"hash": "sha256-91efifPY9ErjqtNPzm3+XSy1Jy+eQs2znxYzez74J/0=",
"hash": "sha256-+VzUyIDQcDyoMVH113cMd6jCUIsAIw/Ir1wM+/YIefM=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.79.13",
"rev": "v1.79.14",
"spdx": "MPL-2.0",
"vendorHash": null
},

View File

@ -4,7 +4,7 @@ with ocamlPackages;
buildDunePackage rec {
pname = "jackline";
version = "unstable-2022-05-27";
version = "unstable-2023-02-24";
minimalOCamlVersion = "4.08";
@ -13,8 +13,8 @@ buildDunePackage rec {
src = fetchFromGitHub {
owner = "hannesm";
repo = "jackline";
rev = "d8f7c504027a0dd51966b2b7304d6daad155a05b";
hash = "sha256-6SWYl2mB0g8JNVHBeTnZEbzOaTmVbsRMMEs+3j/ewwk=";
rev = "846be4e7fcddf45e66e0ff5b29fb5a212d6ee8c3";
hash = "sha256-/j3VJRx/w9HQUnfoq/4gMWV5oVdRiPGddrgbCDk5y8c=";
};
nativeBuildInpts = [

View File

@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "5.13.7.15481";
versions.x86_64-darwin = "5.13.7.15481";
versions.x86_64-linux = "5.13.10.1208";
versions.aarch64-darwin = "5.13.11.16405";
versions.x86_64-darwin = "5.13.11.16405";
versions.x86_64-linux = "5.13.11.1288";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-lCg8xCEuZSWnd4fieug9xjudE9q6pNICRsbvA4ATVK8=";
hash = "sha256-YjERJ6B06/uloHRQVyZDLyf/2Gae0P7xdk4Db9aqROs=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-jmMpkqUga/KQJfXFbGURcWQudnCKlIi5NGY6LuekjKw=";
hash = "sha256-g6n4SKdord7gRwBaYUle3+yi1eB0T36ilScTaCcU8us=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-GmDWb7HRpf5khA5DAGOD5lx5zSzOdDfTvmcOU/LwN+A=";
hash = "sha256-BdI3HEQVe9A3D6KJ45wHWsrfb+dhTZAp/xlcr9X92EU=";
};
};

View File

@ -15,6 +15,7 @@
, enableOpenvpn ? true
, openvpn-mullvad
, shadowsocks-rust
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "mullvad";
@ -44,6 +45,7 @@ rustPlatform.buildRustPackage rec {
protobuf
makeWrapper
git
installShellFiles
];
buildInputs = [
@ -59,6 +61,17 @@ rustPlatform.buildRustPackage rec {
ln -s ${libwg}/lib/libwg.a $dest
'';
postInstall = ''
compdir=$(mktemp -d)
for shell in bash zsh fish; do
$out/bin/mullvad shell-completions $shell $compdir
done
installShellCompletion --cmd mullvad \
--bash $compdir/mullvad.bash \
--zsh $compdir/_mullvad \
--fish $compdir/mullvad.fish
'';
postFixup =
# Place all binaries in the 'mullvad-' namespace, even though these
# specific binaries aren't used in the lifetime of the program.

View File

@ -1,6 +1,7 @@
{ stdenv
, fetchurl
, lib
, substituteAll
, pam
, python3
, libxslt
@ -88,7 +89,6 @@
, gdb
, commonsLogging
, librdf_rasqal
, wrapGAppsHook
, gnome
, glib
, ncurses
@ -102,15 +102,32 @@
, mkDerivation ? null
, qtbase ? null
, qtx11extras ? null
, qtwayland ? null
, ki18n ? null
, kconfig ? null
, kcoreaddons ? null
, kio ? null
, kwindowsystem ? null
, wrapQtAppsHook ? null
, variant ? "fresh"
, symlinkJoin
, postgresql
# The rest are used only in passthru, for the wrapper
, kauth ? null
, kcompletion ? null
, kconfigwidgets ? null
, kglobalaccel ? null
, kitemviews ? null
, knotifications ? null
, ktextwidgets ? null
, kwidgetsaddons ? null
, kxmlgui ? null
, phonon ? null
, qtdeclarative ? null
, qtquickcontrols ? null
, qtsvg ? null
, qttools ? null
, solid ? null
, sonnet ? null
} @ args:
assert builtins.elem variant [ "fresh" "still" ];
@ -354,33 +371,24 @@ in
# It installs only things to $out/lib/libreoffice
postInstall = ''
mkdir -p $out/bin $out/share/desktop
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
done
ln -s $out/bin/soffice $out/bin/libreoffice
mkdir -p $out/share
ln -s $out/lib/libreoffice/share/xdg $out/share/applications
for f in $out/share/applications/*.desktop; do
substituteInPlace "$f" \
--replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
done
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
# Install dolphin templates, like debian does
install -D extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source"
cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop
cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop
cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop
cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop
mkdir -p $dev
cp -r include $dev
'' + optionalString kdeIntegration ''
for prog in $out/bin/*; do
wrapQtApp $prog
done
'';
# Wrapping is done in ./wrapper.nix
dontWrapQtApps = true;
configureFlags = [
@ -464,8 +472,7 @@ in
jdk17
libtool
pkg-config
]
++ [ (if kdeIntegration then wrapQtAppsHook else wrapGAppsHook) ];
];
buildInputs = with xorg; [
ArchiveZip
@ -557,20 +564,56 @@ in
zip
zlib
]
++ (with gst_all_1; [
gst-libav
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
])
++ passthru.gst_packages
++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]
++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ];
passthru = {
inherit srcs;
jdk = jre';
inherit kdeIntegration;
# For the wrapper.nix
inherit gtk3;
# Although present in qtPackages, we need qtbase.qtPluginPrefix and
# qtbase.qtQmlPrefix
inherit qtbase;
gst_packages = with gst_all_1; [
gst-libav
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
];
qmlPackages = [
ki18n
knotifications
qtdeclarative
qtquickcontrols
qtwayland
solid
sonnet
];
qtPackages = [
kauth
kcompletion
kconfigwidgets
kglobalaccel
ki18n
kio
kitemviews
ktextwidgets
kwidgetsaddons
kwindowsystem
kxmlgui
phonon
qtbase
qtdeclarative
qtsvg
qttools
qtwayland
sonnet
];
};
requiredSystemFeatures = [ "big-parallel" ];

View File

@ -1,33 +1,101 @@
{ lib, runCommand
, libreoffice, dbus, bash, substituteAll
, coreutils, gnugrep
, dolphinTemplates ? true
{ lib
, stdenv
# The unwrapped libreoffice derivation
, unwrapped
, makeWrapper
, runCommand
, substituteAll
# For Emulating wrapGAppsHook
, gsettings-desktop-schemas
, hicolor-icon-theme
, dconf
, librsvg
, gdk-pixbuf
# Configuration options for the wrapper
, extraMakeWrapperArgs ? []
, dbusVerify ? stdenv.isLinux
, dbus
}:
runCommand libreoffice.name {
inherit (libreoffice) jdk meta;
inherit coreutils dbus gnugrep libreoffice bash;
let
makeWrapperArgs = builtins.concatStringsSep " " ([
"--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache"
"--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules"
"--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk3}/share/gsettings-schemas/${unwrapped.gtk3.name}"
"--prefix" "XDG_DATA_DIRS" ":" "$out/share"
"--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
"--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share"
"--prefix" "GST_PLUGIN_SYSTEM_PATH_1_0" ":"
"${lib.makeSearchPath "lib/girepository-1.0" unwrapped.gst_packages}"
] ++ lib.optionals unwrapped.kdeIntegration [
"--prefix" "QT_PLUGIN_PATH" ":" "${
lib.makeSearchPath
unwrapped.qtbase.qtPluginPrefix
(builtins.map lib.getBin unwrapped.qtPackages)
}"
"--prefix" "QML2_IMPORT_PATH" ":" "${
lib.makeSearchPath unwrapped.qtbase.qtQmlPrefix
(builtins.map lib.getBin unwrapped.qmlPackages)
}"
] ++ [
# Add dictionaries from all NIX_PROFILES
"--run" (lib.escapeShellArg ''
for PROFILE in $NIX_PROFILES; do
HDIR="$PROFILE/share/hunspell"
if [ -d "$HDIR" ]; then
export DICPATH=$DICPATH''${DICPATH:+:}$HDIR
fi
done
'')
] ++ lib.optionals dbusVerify [
# If no dbus is running, start a dedicated dbus daemon
"--run" (lib.escapeShellArg ''
if ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
mkdir -p "$dbus_tmp_dir"
fi
if ! test -d "$dbus_tmp_dir"; then
dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus"
mkdir -p "$dbus_tmp_dir"
fi
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
"${dbus}"/bin/dbus-daemon \
--nopidfile \
--nofork \
--config-file "${dbus}"/share/dbus-1/session.conf \
--address "unix:path=$dbus_socket_dir/session" &> /dev/null &
dbus_pid=$!
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
fi
'')
] ++ [
"--chdir" "${unwrapped}/lib/libreoffice/program"
"--inherit-argv0"
] ++ extraMakeWrapperArgs
);
in runCommand "${unwrapped.name}-wrapped" {
inherit (unwrapped) meta;
paths = [ unwrapped ];
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit unwrapped;
# For backwards compatibility:
libreoffice = lib.warn "libreoffice: Use the unwrapped attributed, using libreoffice.libreoffice is deprecated." unwrapped;
inherit (unwrapped) kdeIntegration;
};
} (''
mkdir -p "$out/bin"
substituteAll "${./wrapper.sh}" "$out/bin/soffice"
chmod a+x "$out/bin/soffice"
for i in $(ls "${libreoffice}/bin/"); do
test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"
ln -s ${unwrapped}/share $out/share
ln -s ${unwrapped}/lib $out/lib
for i in sbase scalc sdraw smath swriter simpress soffice unopkg; do
makeWrapper ${unwrapped}/lib/libreoffice/program/$i $out/bin/$i ${makeWrapperArgs}
'' + lib.optionalString dbusVerify ''
# Delete the dbus socket directory after libreoffice quits
sed -i 's/^exec -a "$0" //g' $out/bin/"$i"
echo 'code="$?"' >> $out/bin/$i
echo 'test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }' >> $out/bin/$i
echo 'exit "$code"' >> $out/bin/$i
'' + ''
done
mkdir -p "$out/share"
ln -s "${libreoffice}/share"/* $out/share
'' + lib.optionalString dolphinTemplates ''
# Add templates to dolphin "Create new" menu - taken from debian
# We need to unpack the core source since the necessary files aren't available in the libreoffice output
unpackFile "${libreoffice.src}"
install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source"
cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop
cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop
cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop
cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop
'')

View File

@ -1,32 +0,0 @@
#!@bash@/bin/bash
export JAVA_HOME="${JAVA_HOME:-@jdk@}"
#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
if "@coreutils@"/bin/uname | "@gnugrep@"/bin/grep Linux > /dev/null &&
! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
mkdir -p "$dbus_tmp_dir"
fi
if ! test -d "$dbus_tmp_dir"; then
dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus"
mkdir -p "$dbus_tmp_dir"
fi
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null &
dbus_pid=$!
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
fi
for PROFILE in $NIX_PROFILES; do
HDIR="$PROFILE/share/hunspell"
if [ -d "$HDIR" ]; then
export DICPATH=$DICPATH''${DICPATH:+:}$HDIR
fi
done
"@libreoffice@/bin/$("@coreutils@"/bin/basename "$0")" "$@"
code="$?"
test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }
exit "$code"

View File

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "pdfmixtool";
version = "1.1";
version = "1.1.1";
src = fetchFromGitLab {
owner = "scarpetta";
repo = pname;
rev = "v${version}";
hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc=";
hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8=";
};
nativeBuildInputs = [
@ -36,12 +36,11 @@ mkDerivation rec {
];
patches = [
# fix incompatibility with qpdf11
# fix incompatibility with qpdf11.3.0 usage of c++17 - delete this patch when we reach pdfmixtool version > v1.1.1
(fetchpatch {
url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff";
hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g=";
url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/bd5f78c3a4d977d9b0c74302ce2521c737189b43.diff";
hash = "sha256-h2g5toFqgEEnObd2TYQms1a1WFTgN7VsIHyy0Uyq4/I=";
})
];
meta = with lib; {

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
version = "2.24.0";
version = "2.24.3";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
hash = "sha256-5ccvdm0BQZ0+yccB+TjlVt5ZAPxKuEInOed2D9AzMjc=";
hash = "sha256-Z0Z8mMTk1uAgegL4swJswCJ3D5Zi7DMTai9oQXH+2WM=";
};
vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY=";

View File

@ -7,19 +7,32 @@
python3.pkgs.buildPythonApplication rec {
pname = "gitlint";
version = "0.18.0";
version = "0.19.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "jorisroovers";
repo = "gitlint";
rev = "v${version}";
sha256 = "sha256-MmXzrooN+C9MUaAz4+IEGkGJWHbgvPMSLHgssM0wyN8=";
sha256 = "sha256-w4v6mcjCX0V3Mj1K23ErpXdyEKQcA4vykns7UwNBEZ4=";
};
patches = [
# otherwise hatch tries to run git to collect some metadata about the build
./dont-try-to-use-git.diff
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
# Upstream splitted the project into gitlint and gitlint-core to
# simplify the dependency handling
sourceRoot = "source/gitlint-core";
nativeBuildInputs = with python3.pkgs; [
hatch-vcs
hatchling
];
propagatedBuildInputs = with python3.pkgs; [
arrow
click
@ -31,12 +44,6 @@ python3.pkgs.buildPythonApplication rec {
pytestCheckHook
];
postPatch = ''
# We don't need gitlint-core
substituteInPlace setup.py \
--replace "'gitlint-core[trusted-deps]==' + version," ""
'';
pythonImportsCheck = [
"gitlint"
];

View File

@ -0,0 +1,14 @@
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,10 +63,3 @@ include = [
exclude = [
"/gitlint/tests", #
]
-
-[tool.hatch.metadata.hooks.vcs.urls]
-Homepage = "https://jorisroovers.github.io/gitlint"
-Documentation = "https://jorisroovers.github.io/gitlint"
-Source = "https://github.com/jorisroovers/gitlint/tree/main/gitlint-core"
-Changelog = "https://github.com/jorisroovers/gitlint/blob/main/CHANGELOG.md"
-'Source Commit' = "https://github.com/jorisroovers/gitlint/tree/{commit_hash}/gitlint-core"
\ No newline at end of file

View File

@ -60,14 +60,14 @@ GEM
xpath (~> 3.2)
childprocess (3.0.0)
chunky_png (1.4.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
crass (1.0.6)
css_parser (1.12.0)
css_parser (1.14.0)
addressable
csv (3.1.9)
docile (1.4.0)
erubi (1.11.0)
globalid (1.0.0)
erubi (1.12.0)
globalid (1.1.0)
activesupport (>= 5.0)
htmlentities (4.3.4)
i18n (1.8.11)
@ -81,11 +81,11 @@ GEM
method_source (1.0.0)
mini_magick (4.11.0)
mini_mime (1.0.3)
mini_portile2 (2.8.0)
minitest (5.16.3)
mini_portile2 (2.8.1)
minitest (5.18.0)
mocha (2.0.2)
ruby2_keywords (>= 0.0.5)
mysql2 (0.5.4)
mysql2 (0.5.5)
net-ldap (0.17.1)
nio4r (2.5.8)
nokogiri (1.13.10)
@ -94,14 +94,14 @@ GEM
nokogiri (1.13.10-x86_64-linux)
racc (~> 1.4)
parallel (1.22.1)
parser (3.1.3.0)
parser (3.2.1.1)
ast (~> 2.4.1)
pg (1.2.3)
public_suffix (5.0.1)
puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.1)
rack (2.2.4)
racc (1.6.2)
rack (2.2.6.3)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
@ -123,7 +123,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.4)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (5.2.8.1)
actionpack (= 5.2.8.1)
@ -163,8 +163,8 @@ GEM
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.24.0)
parser (>= 3.1.1.0)
rubocop-ast (1.27.0)
parser (>= 3.2.1.0)
rubocop-performance (1.10.2)
rubocop (>= 0.90.0, < 2.0)
rubocop-ast (>= 0.4.0)
@ -173,7 +173,7 @@ GEM
rack (>= 1.1)
rubocop (>= 0.90.0, < 2.0)
ruby-openid (2.9.2)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
selenium-webdriver (3.142.7)
@ -183,18 +183,18 @@ GEM
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.3)
sprockets (4.1.1)
sprockets (4.2.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
thor (1.2.1)
thread_safe (0.3.6)
tzinfo (1.2.10)
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode-display_width (2.3.0)
unicode-display_width (2.4.2)
webdrivers (4.7.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
@ -251,7 +251,7 @@ DEPENDENCIES
yard
RUBY VERSION
ruby 2.7.6p219
ruby 2.7.7p221
BUNDLED WITH
2.3.26

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }:
let
version = "4.2.9";
version = "4.2.10";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@ -16,7 +16,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-04dBNF9u/RDAeYmAk7JZ2NxNzY5B38T2RkloWueoyx4=";
sha256 = "sha256-byY4jCOJKWJVLKSR1e/tq9QtrIiGHdnYC8M0WPZb4ek=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -186,10 +186,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
version = "1.1.10";
version = "1.2.2";
};
crass = {
groups = ["default"];
@ -207,10 +207,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b";
sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj";
type = "gem";
};
version = "1.12.0";
version = "1.14.0";
};
csv = {
groups = ["default"];
@ -237,10 +237,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx";
sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
type = "gem";
};
version = "1.11.0";
version = "1.12.0";
};
globalid = {
dependencies = ["activesupport"];
@ -248,10 +248,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj";
sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk";
type = "gem";
};
version = "1.0.0";
version = "1.1.0";
};
htmlentities = {
groups = ["default"];
@ -341,20 +341,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
type = "gem";
};
version = "2.8.0";
version = "2.8.1";
};
minitest = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
type = "gem";
};
version = "5.16.3";
version = "5.18.0";
};
mocha = {
dependencies = ["ruby2_keywords"];
@ -380,10 +380,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1";
sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn";
type = "gem";
};
version = "0.5.4";
version = "0.5.5";
};
net-ldap = {
groups = ["ldap"];
@ -432,10 +432,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5";
sha256 = "1a2v5f8fw7nxm41xp422p1pbr41hafy62bp95m7vg42cqp5y4grc";
type = "gem";
};
version = "3.1.3.0";
version = "3.2.1.1";
};
pg = {
groups = ["default"];
@ -481,20 +481,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8";
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
type = "gem";
};
version = "1.6.1";
version = "1.6.2";
};
rack = {
groups = ["default" "openid" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2";
type = "gem";
};
version = "2.2.4";
version = "2.2.6.3";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
@ -546,10 +546,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9";
sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz";
type = "gem";
};
version = "1.4.4";
version = "1.5.0";
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
@ -724,10 +724,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sqkg84npyq9z4d3z46w59zyr1r1rbd1mrrlglws9ksw04wdq5x9";
sha256 = "16iabkwqhzqh3cd4pcrp0nqv4ks2whcz84csawi78ynfk12vd20a";
type = "gem";
};
version = "1.24.0";
version = "1.27.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@ -766,10 +766,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
type = "gem";
};
version = "1.11.0";
version = "1.13.0";
};
ruby2_keywords = {
groups = ["default" "test"];
@ -829,10 +829,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qj82dcfkk6c4zw357k5r05s5iwvyddh57bpwj0a1hjgaw70pcb8";
sha256 = "0k0236g4h3ax7v6vp9k0l2fa0w6f1wqp7dn060zm4isw4n3k89sw";
type = "gem";
};
version = "4.1.1";
version = "4.2.0";
};
sprockets-rails = {
dependencies = ["actionpack" "activesupport" "sprockets"];
@ -871,20 +871,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rw89y3zj0wcybcyiazgcprg6hi42k8ipp1n2lbl95z1dmpgmly6";
sha256 = "1dk1cfnhgl14l580b650qyp8m5xpqb3zg0wb251h5jkm46hzc0b5";
type = "gem";
};
version = "1.2.10";
version = "1.2.11";
};
unicode-display_width = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7";
sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a";
type = "gem";
};
version = "2.3.0";
version = "2.4.2";
};
webdrivers = {
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];

View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.26.1";
version = "1.26.2";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-7tbnnERV+dYtEXzloHgWeSFpe8Dl18tiNWoAhIALWjE=";
sha256 = "sha256-Wo6COdbqRWuGP4qXjiCehDm8FlVjz1nZRouMOxlKocw=";
};
vendorSha256 = null;

View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, pkg-config
, meson
, cmake
, ninja
, libxkbcommon
, wayland
@ -12,29 +13,34 @@
, pixman
, udev
, libGL
, libxml2
, mesa
}:
stdenv.mkDerivation rec {
pname = "waybox";
version = "unstable-2021-04-07";
version = "0.2.0";
src = fetchFromGitHub {
owner = "wizbright";
repo = pname;
rev = "309ccd2faf08079e698104b19eff32b3a255b947";
hash = "sha256-G32cGmOwmnuVlj1hCq9NRti6plJbkAktfzM4aYzQ+k8=";
rev = version;
hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8=";
};
nativeBuildInputs = [
pkg-config
meson
cmake
ninja
wayland-scanner
];
dontUseCmakeConfigure = true;
buildInputs = [
libxkbcommon
libxml2
wayland
wayland-protocols
wlroots
@ -44,6 +50,8 @@ stdenv.mkDerivation rec {
mesa # for libEGL
];
passthru.providedSessions = [ "waybox" ];
meta = with lib; {
homepage = "https://github.com/wizbright/waybox";
description = "An openbox clone on Wayland";

View File

@ -1,15 +1,25 @@
{ stdenv, lib, fetchFromGitHub }:
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
pname = "monocraft";
version = "1.4";
src = fetchFromGitHub {
owner = "IdreesInc";
repo = "Monocraft";
rev = "v${version}";
sha256 = "sha256-YF0uPCc+dajJtG6mh/JpoSr6GirAhif5L5sp6hFmKLE=";
let
version = "2.4";
relArtifact = name: hash: fetchurl {
inherit name hash;
url = "https://github.com/IdreesInc/Monocraft/releases/download/v${version}/${name}";
};
in
stdenv.mkDerivation {
pname = "monocraft";
inherit version;
srcs = [
(relArtifact "Monocraft.otf" "sha256-PA1W+gOUStGw7cDmtEbG+B6M+sAYr8cft+Ckxj5LciU=")
(relArtifact "Monocraft.ttf" "sha256-S4j5v2bTJbhujT3Bt8daNN1YGYYP8zVPf9XXjuR64+o=")
(relArtifact "Monocraft-no-ligatures.ttf" "sha256-MuHfoP+dsXe+ODN4vWFIj50jwOxYyIiS0dd1tzVxHts=")
(relArtifact "Monocraft-nerd-fonts-patched.ttf" "sha256-QxMp8UwcRjWySNHWoNeX2sX9teZ4+tCFj+DG41azsXw=")
];
sourceRoot = ".";
unpackCmd = ''cp "$curSrc" $(basename $curSrc)'';
dontConfigure = true;
dontBuild = true;
@ -17,6 +27,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -Dm644 -t $out/share/fonts/opentype *.otf
install -Dm644 -t $out/share/fonts/truetype *.ttf
runHook postInstall
'';

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "23.02.28";
version = "23.03.04";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-dSD5mjWH7ho+1LiZgzVjDkAIbj4XubC3ZKamyMokkds=";
sha256 = "sha256-2do/8NKO47zj3+V5+P79el41jy7q6aXdhYXVRRoVusI=";
};
nativeBuildInputs = [ gtk3 ];

View File

@ -8,6 +8,7 @@ with builtins; with lib; let
{ case = "8.14"; out = { version = "1.13.7"; };}
{ case = "8.15"; out = { version = "1.15.0"; };}
{ case = "8.16"; out = { version = "1.16.5"; };}
{ case = "8.17"; out = { version = "1.16.5"; };}
] {} );
in mkCoqDerivation {
pname = "elpi";
@ -15,6 +16,7 @@ in mkCoqDerivation {
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.17"; out = "1.17.0"; }
{ case = "8.16"; out = "1.15.6"; }
{ case = "8.15"; out = "1.14.0"; }
{ case = "8.14"; out = "1.11.2"; }
@ -22,6 +24,7 @@ in mkCoqDerivation {
{ case = "8.12"; out = "1.8.3_8.12"; }
{ case = "8.11"; out = "1.6.3_8.11"; }
] null;
release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM=";
release."1.15.6".sha256 = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno=";
release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg=";
release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp";

View File

@ -8,7 +8,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.13" "8.16") (isGe "1.13.0") ]; out = "1.1.1"; }
{ cases = [ (range "8.13" "8.17") (isGe "1.13.0") ]; out = "1.1.1"; }
{ cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; }
{ cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }
{ cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }

View File

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

View File

@ -7,10 +7,12 @@ mkCoqDerivation {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.14" "8.17"; out = "4.1.1"; }
{ case = range "8.14" "8.16"; out = "4.1.0"; }
{ case = range "8.7" "8.15"; out = "3.4.3"; }
{ case = range "8.5" "8.8"; out = "2.6.1"; }
] null;
release."4.1.1".sha256 = "sha256-FbClxlV0ZaxITe7s9SlNbpeMNDJli+Dfh2TMrjaMtHo=";
release."4.1.0".sha256 = "sha256:09rak9cha7q11yfqracbcq75mhmir84331h1218xcawza48rbjik";
release."3.4.3".sha256 = "sha256-YTdWlEmFJjCcHkl47jSOgrGqdXoApJY4u618ofCaCZE=";
release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw";

View File

@ -1,19 +1,21 @@
{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup
, hierarchy-builder, version ? null }:
, fourcolor, hierarchy-builder, version ? null }:
mkCoqDerivation {
pname = "graph-theory";
release."0.9".sha256 = "sha256-Hl3JS9YERD8QQziXqZ9DqLHKp63RKI9HxoFYWSkJQZI=";
release."0.9.1".sha256 = "sha256-lRRY+501x+DqNeItBnbwYIqWLDksinWIY4x/iojRNYU=";
releaseRev = v: "v${v}";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.13" "8.16"; out = "0.9"; }
{ case = range "8.14" "8.16"; out = "0.9.1"; }
{ case = range "8.12" "8.12"; out = "0.9"; }
] null;
propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ];
propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup fourcolor hierarchy-builder ];
meta = with lib; {
description = "Library of formalized graph theory results in Coq";

View File

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

View File

@ -7,12 +7,14 @@ mkCoqDerivation rec {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.17"; out = "4.6.1"; }
{ case = range "8.12" "8.16"; out = "4.6.0"; }
{ case = range "8.8" "8.16"; out = "4.5.2"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; }
] null;
release."4.6.1".sha256 = "sha256-ZZSxt8ksz0g6dl/LEido5qJXgsaxHrVLqkGUHu90+e0=";
release."4.6.0".sha256 = "sha256-n9ECKnV0L6XYcIcbYyOJKwlbisz/RRbNW5YESHo07X0=";
release."4.5.2".sha256 = "sha256-r0yE9pkC4EYlqsimxkdlCXevRcwKa3HGFZiUH+ueUY8=";
release."4.5.1".sha256 = "sha256-5OxbSPdw/1FFENubulKSk6fEIEYSPCxfvMMgtgN6j6s=";

View File

@ -26,10 +26,10 @@ let
defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.6.1"; }
{ cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; }
{ cases = [ (isGe "8.13") (range "1.13" "1.14") ]; out = "0.5.1"; }
{ cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; }
{ cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; }
{ cases = [ (range "8.11" "8.14") (isGe "1.12.0") ]; out = "0.3.10"; }
{ cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; }
{ cases = [ (range "8.11" "8.14") (range "1.12" "1.13") ]; out = "0.3.10"; }
{ cases = [ (range "8.11" "8.12") "1.11.0" ]; out = "0.3.4"; }
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; }
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; }
{ cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; }

View File

@ -12,7 +12,7 @@ mkCoqDerivation {
};
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.10" "8.16"; out = "1.0.1"; }
{ case = range "8.10" "8.17"; out = "1.0.1"; }
{ case = range "8.5" "8.14"; out = "1.0.0"; }
] null;

View File

@ -7,7 +7,7 @@ mkCoqDerivation {
owner = "math-comp";
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.5.2"; }
{ cases = [ (range "8.13" "8.17") (isGe "1.12") ]; out = "1.5.2"; }
{ cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; }
{ cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; }
{ cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; }

View File

@ -8,6 +8,7 @@ mkCoqDerivation {
owner = "math-comp";
inherit version;
release = {
"1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4=";
"1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7";
"1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn";
"1.1.1".sha256 = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b";
@ -18,6 +19,7 @@ mkCoqDerivation {
};
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.13") (isGe "1.13.0") ]; out = "1.1.4"; }
{ cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; }
{ cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; }
{ cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; }

View File

@ -9,11 +9,13 @@ mkCoqDerivation rec {
defaultVersion = with lib.versions;
lib.switch [ coq.coq-version mathcomp-algebra.version ] [
{ cases = [ (range "8.13" "8.17") (isGe "1.12") ]; out = "1.3.0+1.12+8.13"; }
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; }
] null;
release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k";
release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr";
release."1.3.0+1.12+8.13".sha256 = "sha256-ebfY8HatP4te44M6o84DSLpDCkMu4IroPCy+HqzOnTE=";
propagatedBuildInputs = [ mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup ];

View File

@ -19,6 +19,7 @@ let
owner = "math-comp";
withDoc = single && (args.withDoc or false);
defaultVersion = with versions; lib.switch coq.coq-version [
{ case = range "8.13" "8.17"; out = "1.16.0"; }
{ case = range "8.14" "8.16"; out = "1.15.0"; }
{ case = range "8.11" "8.15"; out = "1.14.0"; }
{ case = range "8.11" "8.15"; out = "1.13.0"; }
@ -31,6 +32,7 @@ let
{ case = range "8.5" "8.7"; out = "1.6.4"; }
] null;
release = {
"1.16.0".sha256 = "sha256-gXTKhRgSGeRBUnwdDezMsMKbOvxdffT+kViZ9e1gEz0=";
"1.15.0".sha256 = "1bp0jxl35ms54s0mdqky15w9af03f3i0n06qk12k4gw1xzvwqv21";
"1.14.0".sha256 = "07yamlp1c0g5nahkd2gpfhammcca74ga2s6qr7a3wm6y6j5pivk9";
"1.13.0".sha256 = "0j4cz2y1r1aw79snkcf1pmicgzf8swbaf9ippz0vg99a572zqzri";

View File

@ -9,7 +9,8 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.5.5"; }
{ cases = [ (isGe "8.10") (isGe "1.13.0") ]; out = "1.5.6"; }
{ cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; }
{ cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; }
{ cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; }
{ cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; }
@ -17,6 +18,7 @@
{ cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; }
] null;
release = {
"1.5.6".sha256 = "sha256-cMixgc34T9Ic6v+tYmL49QUNpZpPV5ofaNuHqblX6oY=";
"1.5.5".sha256 = "sha256-VdXA51vr7DZl/wT/15YYMywdD7Gh91dMP9t7ij47qNQ=";
"1.5.4".sha256 = "0s4sbh4y88l125hdxahr56325hdhxxdmqmrz7vv8524llyv3fciq";
"1.5.3".sha256 = "1462x40y2qydjd2wcg8r6qr8cx3xv4ixzh2h8vp9h7arylkja1qd";

View File

@ -879,17 +879,17 @@ self: super: builtins.intersectAttrs super {
domaindriven-core = dontCheck super.domaindriven-core;
cachix = overrideCabal (drv: {
version = "1.3";
version = "1.3.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.3";
sha256 = "sha256-y0CqfFIWd2nl1o2XvskHfaQRg8qqRZf16BYLAqJ+Q2Q=";
rev = "v1.3.1";
sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU=";
};
buildDepends = [ self.conduit-concurrent-map ];
postUnpack = "sourceRoot=$sourceRoot/cachix";
postPatch = ''
sed -i 's/1.2/1.3/' cachix.cabal
sed -i 's/1.3/1.3.1/' cachix.cabal
'';
}) (super.cachix.override {
nix = self.hercules-ci-cnix-store.passthru.nixPackage;
@ -897,12 +897,12 @@ self: super: builtins.intersectAttrs super {
hnix-store-core = super.hnix-store-core_0_6_1_0;
});
cachix-api = overrideCabal (drv: {
version = "1.3";
version = "1.3.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.3";
sha256 = "sha256-y0CqfFIWd2nl1o2XvskHfaQRg8qqRZf16BYLAqJ+Q2Q=";
rev = "v1.3.1";
sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
}) super.cachix-api;

View File

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.2.3";
sha256 = "peTH8hDOEuMq18exbFhtEMrQQEqg2FPkapfNnnEfTYE=";
version = "25.3";
sha256 = "UOBrDaXpvpeM79VN0PxVQ1XsYI+OYWBbaBfYE5lZXgE=";
}

View File

@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "6.0.0";
version = "6.0.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-wCM+axQy5gOHUAThmwPYMt9/HWuIpGcQjMT9TSLqWbk=";
hash = "sha256-vVdvj3Q3weK+yohSaEDaagqWWZkA+KV4gRRbcE3UiPQ=";
fetchSubmodules = true;
};
cargoHash = "sha256-0RsTE6pcbbUFn7PWg1tNOlvix6TIB5DZxiJQVKU+lKg=";
cargoHash = "sha256-7FYXKEN17I7sLQid2JGTxFHMhGPka2coEMS6y4HvwPU=";
cargoBuildFlags = [
"--package wasmtime-cli"

View File

@ -8,13 +8,13 @@
, ncurses
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (self: {
pname = "yabasic";
version = "2.90.2";
version = "2.90.3";
src = fetchurl {
url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz";
hash = "sha256-ff5j0cJ1i2HWIsYjwzx5FFtZfchWsGRF2AZtbDXrNJw=";
url = "http://www.yabasic.de/download/yabasic-${self.version}.tar.gz";
hash = "sha256-ItmlkraNUE0qlq1RghUJcDq4MHb6HRKNoIRylugjboA=";
};
buildInputs = [
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
ncurses
];
meta = with lib; {
meta = {
homepage = "http://2484.de/yabasic/";
description = "Yet another BASIC";
longDescription = ''
@ -36,8 +36,9 @@ stdenv.mkDerivation rec {
and has a comprehensive documentation; it is small, simple, open-source
and free.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
changelog = "https://2484.de/yabasic/whatsnew.html";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
}
})

View File

@ -1,13 +1,17 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (self: {
pname = "cgreen";
version = "1.6.2";
src = fetchFromGitHub {
owner = "cgreen-devs";
repo = "cgreen";
rev = version;
rev = self.version;
sha256 = "sha256-beaCoyDCERb/bdKcKS7dRQHlI0auLOStu3cZr1dhubg=";
};
@ -19,11 +23,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
meta = with lib; {
meta = {
homepage = "https://github.com/cgreen-devs/cgreen";
description = "The Modern Unit Test and Mocking Framework for C and C++";
license = licenses.isc;
maintainers = [ maintainers.nichtsfrei ];
platforms = platforms.unix;
license = lib.licenses.isc;
maintainers = [ lib.maintainers.AndersonTorres ];
platforms = lib.platforms.unix;
};
}
})

View File

@ -34,7 +34,7 @@
, withCaca ? withFullDeps # Textual display (ASCII art)
, withCelt ? withFullDeps # CELT decoder
, withCrystalhd ? withFullDeps
, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !isAarch64))
, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch))
, withCudaLLVM ? withFullDeps
, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness)
, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394)
@ -57,8 +57,8 @@
, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support
, withMp3lame ? withHeadlessDeps # LAME MP3 encoder
, withMysofa ? withFullDeps # HRTF support via SOFAlizer
, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform
, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform
, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32
, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32
, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora
, withOpenal ? withFullDeps # OpenAL 1.1 capture support
, withOpencl ? withFullDeps

View File

@ -29,14 +29,14 @@ let
{ shortName, shortDescription, dictFileName }:
mkDict rec {
inherit dictFileName;
version = "2.2";
version = "2.5";
pname = "hunspell-dict-${shortName}-rla";
readmeFile = "README.txt";
src = fetchFromGitHub {
owner = "sbosio";
repo = "rla-es";
rev = "v${version}";
sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8";
sha256 = "sha256-oGnxOGHzDogzUMZESydIxRTbq9Dmd03flwHx16AK1yk=";
};
meta = with lib; {
description = "Hunspell dictionary for ${shortDescription} from rla";
@ -46,13 +46,13 @@ let
platforms = platforms.all;
};
nativeBuildInputs = [ bash coreutils which zip unzip ];
patchPhase = ''
postPatch = ''
substituteInPlace ortograf/herramientas/make_dict.sh \
--replace /bin/bash bash \
--replace /bin/bash ${bash}/bin/bash \
--replace /dev/stderr stderr.log
substituteInPlace ortograf/herramientas/remover_comentarios.sh \
--replace /bin/bash bash \
--replace /bin/bash ${bash}/bin/bash \
'';
buildPhase = ''
cd ortograf/herramientas
@ -442,7 +442,7 @@ rec {
es_CR = es-cr;
es-cr = mkDictFromRla {
shortName = "es-cr";
shortDescription = "Spanish (Costra Rica)";
shortDescription = "Spanish (Costa Rica)";
dictFileName = "es_CR";
};

View File

@ -6,11 +6,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lightning";
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "mirror://gnu/lightning/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
hash = "sha256-TjmE/xzPC6MKmFIR1A/FwGsl8BTr3z2A0P49DIDdfA4=";
hash = "sha256-mGcWgdVoR3DMsGoH+juPAypFS9tW6vwY5vqwRFnqPKo=";
};
nativeCheckInputs = [ libopcodes ];

View File

@ -7,7 +7,7 @@ Check for any minor version changes.
*/
{ newScope
{ makeScopeWithSplicing, generateSplicesForMkScope
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl, python3
, gstreamer, gst-plugins-base, gtk3, dconf
@ -119,6 +119,9 @@ let
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
in {
# remove before 23.11
overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith =
@ -225,4 +228,4 @@ let
} ../hooks/wrap-qt-apps-hook.sh;
};
in lib.makeScope newScope addPackages
in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages

View File

@ -530,12 +530,15 @@ let
then
ln -s $out/lib/node_modules/.bin $out/bin
# Patch the shebang lines of all the executables
# Fixup all executables
ls $out/bin/* | while read i
do
file="$(readlink -f "$i")"
chmod u+rwx "$file"
patchShebangs "$file"
if isScript "$file"
then
sed -i 's/\r$//' "$file" # convert crlf to lf
fi
done
fi

File diff suppressed because it is too large Load Diff

View File

@ -340,14 +340,22 @@ final: prev: {
};
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = let
# Needed to fix Node.js 16+ - PR svanderburg/node2nix#302
npmPatch = fetchpatch {
name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch";
url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch";
hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8=";
};
patches = [
# Needed to fix Node.js 16+ - PR svanderburg/node2nix#302
(fetchpatch {
name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch";
url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch";
hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8=";
})
# Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314
(fetchpatch {
name = "convert-crlf-for-script-bin-files.patch";
url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch";
hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU=";
})
];
in ''
patch -d $out/lib/node_modules/node2nix -p1 < ${npmPatch}
${lib.concatStringsSep "\n" (map (patch: "patch -d $out/lib/node_modules/node2nix -p1 < ${patch}") patches)}
wrapProgram "$out/bin/node2nix" --prefix PATH : ${lib.makeBinPath [ pkgs.nix ]}
'';
};

View File

@ -8,14 +8,14 @@
buildDunePackage rec {
pname = "awa";
version = "0.1.1";
version = "0.1.2";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz";
hash = "sha256-ae1gTx3Emmkof/2Gnhq0d5RyfkFx21hHkVEVgyPdXuo=";
hash = "sha256-HfIqvmvmdizPSfSHthj2syszVZXVhju7tI8yNEetc38=";
};
propagatedBuildInputs = [

View File

@ -5,14 +5,14 @@
buildDunePackage rec {
pname = "conduit";
version = "6.1.0";
version = "6.2.0";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
sha256 = "sha256-ouKQiGMLvvksGpAhkqCVSKtKaz91p+7mciQm7KHvwF8=";
sha256 = "sha256-PtRAsO3aGyEt12K9skgx85TcoFmF3RtKxPlFgdFFI5Q=";
};
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];

View File

@ -1,7 +1,7 @@
{ buildDunePackage, conduit-lwt
, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow
, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
, dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
, dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
, tcpip, ca-certs-nss
}:
@ -16,7 +16,7 @@ buildDunePackage {
propagatedBuildInputs = [
sexplib uri cstruct mirage-clock mirage-flow
mirage-flow-combinators mirage-random mirage-time
dns-client conduit-lwt vchan xenstore tls tls-mirage
dns-client-mirage conduit-lwt vchan xenstore tls tls-mirage
ipaddr ipaddr-sexp tcpip ca-certs-nss
];

View File

@ -1,4 +1,4 @@
{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify, dnssec
{ buildDunePackage, dns, dns-tsig, dns-client-lwt, dns-server, dns-certify, dnssec
, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
, mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
, randomconv, alcotest
@ -17,7 +17,7 @@ buildDunePackage {
buildInputs = [
dns
dns-tsig
dns-client
dns-client-lwt
dns-server
dns-certify
dnssec

View File

@ -0,0 +1,30 @@
{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time
, mirage-random, mirage-crypto-rng, mtime, randomconv
, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
, ca-certs, ca-certs-nss
, happy-eyeballs
, tcpip
, tls-lwt
}:
buildDunePackage {
pname = "dns-client-lwt";
inherit (dns) src version;
duneVersion = "3";
propagatedBuildInputs = [
dns
dns-client
ipaddr
lwt
ca-certs
happy-eyeballs
tls-lwt
mtime
mirage-crypto-rng
];
checkInputs = [ alcotest ];
doCheck = true;
meta = dns-client.meta;
}

View File

@ -0,0 +1,32 @@
{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time
, mirage-random, mirage-crypto-rng, mtime, randomconv
, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
, ca-certs, ca-certs-nss
, happy-eyeballs
, tcpip
, tls, tls-mirage
}:
buildDunePackage {
pname = "dns-client-mirage";
inherit (dns) src version;
duneVersion = "3";
propagatedBuildInputs = [
dns-client
domain-name
ipaddr
lwt
mirage-random
mirage-time
mirage-clock
ca-certs-nss
happy-eyeballs
tcpip
tls
tls-mirage
];
doCheck = true;
meta = dns-client.meta;
}

View File

@ -13,23 +13,9 @@ buildDunePackage {
duneVersion = "3";
propagatedBuildInputs = [
cstruct
fmt
logs
dns
randomconv
domain-name
ipaddr
lwt
mirage-random
mirage-time
mirage-clock
ca-certs
ca-certs-nss
happy-eyeballs
tcpip
tls
tls-mirage
mtime
mirage-crypto-rng
];

View File

@ -17,14 +17,14 @@
buildDunePackage rec {
pname = "dns";
version = "6.4.1";
version = "7.0.1";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
hash = "sha256-omG0fKZAHGc+4ERC8cyK47jeEkiBZkB+1fz46j6SDno=";
hash = "sha256-vDe1U1NbbIPcD1AmMG265ke7651C64mds7KcFHUN4fU=";
};
propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];

View File

@ -1,4 +1,4 @@
{ buildDunePackage, dns, dns-client, dns-mirage, dns-resolver, dns-tsig
{ buildDunePackage, dns, dns-client-mirage, dns-mirage, dns-resolver, dns-tsig
, dns-server, duration, randomconv, lwt, mirage-time, mirage-clock
, mirage-random, tcpip, metrics
}:
@ -11,7 +11,7 @@ buildDunePackage {
propagatedBuildInputs = [
dns
dns-client
dns-client-mirage
dns-mirage
dns-resolver
dns-tsig

View File

@ -1,4 +1,4 @@
{ buildDunePackage, git
{ buildDunePackage, fetchpatch, git
, rresult, result, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
@ -14,6 +14,13 @@ buildDunePackage {
pname = "git-unix";
inherit (git) version src;
patches = [
(fetchpatch {
url = "https://github.com/mirage/ocaml-git/commit/b708db8319cc456a5640618210d740a1e00468e9.patch";
hash = "sha256-Fe+eDhU/beZT/8br8XmOhHYJowaVEha16eGqyuu2Zr4=";
})
];
minimalOCamlVersion = "4.08";
duneVersion = "3";

View File

@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "happy-eyeballs";
version = "0.4.0";
version = "0.5.0";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz";
hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ=";
hash = "sha256-T4BOFlSj3xfUFhP9v8UaCHgmhvGrMyeqNUQf79bdBh4=";
};
propagatedBuildInputs = [

View File

@ -1,7 +1,7 @@
{ buildDunePackage
, happy-eyeballs
, cmdliner
, dns-client
, dns-client-lwt
, duration
, domain-name
, ipaddr
@ -29,7 +29,7 @@ buildDunePackage {
];
propagatedBuildInputs = [
dns-client
dns-client-lwt
happy-eyeballs
logs
lwt

View File

@ -1,7 +1,7 @@
{ buildDunePackage
, happy-eyeballs
, duration
, dns-client
, dns-client-mirage
, domain-name
, ipaddr
, fmt
@ -32,7 +32,7 @@ buildDunePackage {
];
propagatedBuildInputs = [
dns-client
dns-client-mirage
happy-eyeballs
logs
lwt

View File

@ -21,11 +21,11 @@
buildDunePackage rec {
pname = "letsencrypt";
version = "0.4.1";
version = "0.5.0";
src = fetchurl {
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";
hash = "sha256-+Qh19cm9yrTIvl7H6+nqdjAw+nCOAoVzAJlrsW58IHA=";
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz";
hash = "sha256-XGroZiNyP0ItOMrXK07nrVqT4Yz9RKXYvZuRkDp089M=";
};
minimalOCamlVersion = "4.08";

View File

@ -7,11 +7,11 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08";
pname = "mirage-crypto";
version = "0.10.7";
version = "0.11.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw=";
sha256 = "sha256-A5SCuVmcIJo3dL0Tu//fQqEV0v3FuCxuANWnBo7hUeQ=";
};
doCheck = true;

View File

@ -0,0 +1,15 @@
{ buildDunePackage, mirage-crypto, mirage-crypto-rng, dune-configurator
, duration, logs, mtime, ocaml_lwt }:
buildDunePackage rec {
pname = "mirage-crypto-rng-lwt";
inherit (mirage-crypto) version src;
doCheck = true;
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng duration logs mtime ocaml_lwt ];
meta = mirage-crypto-rng.meta;
}

View File

@ -10,7 +10,7 @@ buildDunePackage rec {
checkInputs = [ ounit2 randomconv ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ];
propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ];
strictDeps = true;

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