Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
abd82bc57d
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
name: Missing or incorrect documentation
|
||||
about:
|
||||
about: Help us improve the Nixpkgs and NixOS reference manuals
|
||||
title: ''
|
||||
labels: '9.needs: documentation'
|
||||
assignees: ''
|
||||
|
|
|
|||
|
|
@ -1206,4 +1206,57 @@ runTests {
|
|||
expr = strings.levenshteinAtMost 3 "hello" "Holla";
|
||||
expected = true;
|
||||
};
|
||||
|
||||
testTypeDescriptionInt = {
|
||||
expr = (with types; int).description;
|
||||
expected = "signed integer";
|
||||
};
|
||||
testTypeDescriptionListOfInt = {
|
||||
expr = (with types; listOf int).description;
|
||||
expected = "list of signed integer";
|
||||
};
|
||||
testTypeDescriptionListOfListOfInt = {
|
||||
expr = (with types; listOf (listOf int)).description;
|
||||
expected = "list of list of signed integer";
|
||||
};
|
||||
testTypeDescriptionListOfEitherStrOrBool = {
|
||||
expr = (with types; listOf (either str bool)).description;
|
||||
expected = "list of (string or boolean)";
|
||||
};
|
||||
testTypeDescriptionEitherListOfStrOrBool = {
|
||||
expr = (with types; either (listOf bool) str).description;
|
||||
expected = "(list of boolean) or string";
|
||||
};
|
||||
testTypeDescriptionEitherStrOrListOfBool = {
|
||||
expr = (with types; either str (listOf bool)).description;
|
||||
expected = "string or list of boolean";
|
||||
};
|
||||
testTypeDescriptionOneOfListOfStrOrBool = {
|
||||
expr = (with types; oneOf [ (listOf bool) str ]).description;
|
||||
expected = "(list of boolean) or string";
|
||||
};
|
||||
testTypeDescriptionOneOfListOfStrOrBoolOrNumber = {
|
||||
expr = (with types; oneOf [ (listOf bool) str number ]).description;
|
||||
expected = "(list of boolean) or string or signed integer or floating point number";
|
||||
};
|
||||
testTypeDescriptionEitherListOfBoolOrEitherStringOrNumber = {
|
||||
expr = (with types; either (listOf bool) (either str number)).description;
|
||||
expected = "(list of boolean) or string or signed integer or floating point number";
|
||||
};
|
||||
testTypeDescriptionEitherEitherListOfBoolOrStringOrNumber = {
|
||||
expr = (with types; either (either (listOf bool) str) number).description;
|
||||
expected = "(list of boolean) or string or signed integer or floating point number";
|
||||
};
|
||||
testTypeDescriptionEitherNullOrBoolOrString = {
|
||||
expr = (with types; either (nullOr bool) str).description;
|
||||
expected = "null or boolean or string";
|
||||
};
|
||||
testTypeDescriptionEitherListOfEitherBoolOrStrOrInt = {
|
||||
expr = (with types; either (listOf (either bool str)) int).description;
|
||||
expected = "(list of (boolean or string)) or signed integer";
|
||||
};
|
||||
testTypeDescriptionEitherIntOrListOrEitherBoolOrStr = {
|
||||
expr = (with types; either int (listOf (either bool str))).description;
|
||||
expected = "signed integer or list of (boolean or string)";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,6 +113,12 @@ rec {
|
|||
name
|
||||
, # Description of the type, defined recursively by embedding the wrapped type if any.
|
||||
description ? null
|
||||
# A hint for whether or not this description needs parentheses. Possible values:
|
||||
# - "noun": a simple noun phrase such as "positive integer"
|
||||
# - "conjunction": a phrase with a potentially ambiguous "or" connective.
|
||||
# - "composite": a phrase with an "of" connective
|
||||
# See the `optionDescriptionPhrase` function.
|
||||
, descriptionClass ? null
|
||||
, # Function applied to each definition that should return true if
|
||||
# its type-correct, false otherwise.
|
||||
check ? (x: true)
|
||||
|
|
@ -158,10 +164,36 @@ rec {
|
|||
nestedTypes ? {}
|
||||
}:
|
||||
{ _type = "option-type";
|
||||
inherit name check merge emptyValue getSubOptions getSubModules substSubModules typeMerge functor deprecationMessage nestedTypes;
|
||||
inherit
|
||||
name check merge emptyValue getSubOptions getSubModules substSubModules
|
||||
typeMerge functor deprecationMessage nestedTypes descriptionClass;
|
||||
description = if description == null then name else description;
|
||||
};
|
||||
|
||||
# optionDescriptionPhrase :: (str -> bool) -> optionType -> str
|
||||
#
|
||||
# Helper function for producing unambiguous but readable natural language
|
||||
# descriptions of types.
|
||||
#
|
||||
# Parameters
|
||||
#
|
||||
# optionDescriptionPhase unparenthesize optionType
|
||||
#
|
||||
# `unparenthesize`: A function from descriptionClass string to boolean.
|
||||
# It must return true when the class of phrase will fit unambiguously into
|
||||
# the description of the caller.
|
||||
#
|
||||
# `optionType`: The option type to parenthesize or not.
|
||||
# The option whose description we're returning.
|
||||
#
|
||||
# Return value
|
||||
#
|
||||
# The description of the `optionType`, with parentheses if there may be an
|
||||
# ambiguity.
|
||||
optionDescriptionPhrase = unparenthesize: t:
|
||||
if unparenthesize (t.descriptionClass or null)
|
||||
then t.description
|
||||
else "(${t.description})";
|
||||
|
||||
# When adding new types don't forget to document them in
|
||||
# nixos/doc/manual/development/option-types.xml!
|
||||
|
|
@ -170,6 +202,7 @@ rec {
|
|||
raw = mkOptionType rec {
|
||||
name = "raw";
|
||||
description = "raw value";
|
||||
descriptionClass = "noun";
|
||||
check = value: true;
|
||||
merge = mergeOneOption;
|
||||
};
|
||||
|
|
@ -177,6 +210,7 @@ rec {
|
|||
anything = mkOptionType {
|
||||
name = "anything";
|
||||
description = "anything";
|
||||
descriptionClass = "noun";
|
||||
check = value: true;
|
||||
merge = loc: defs:
|
||||
let
|
||||
|
|
@ -216,12 +250,14 @@ rec {
|
|||
};
|
||||
|
||||
unspecified = mkOptionType {
|
||||
name = "unspecified";
|
||||
name = "unspecified value";
|
||||
descriptionClass = "noun";
|
||||
};
|
||||
|
||||
bool = mkOptionType {
|
||||
name = "bool";
|
||||
description = "boolean";
|
||||
descriptionClass = "noun";
|
||||
check = isBool;
|
||||
merge = mergeEqualOption;
|
||||
};
|
||||
|
|
@ -229,6 +265,7 @@ rec {
|
|||
int = mkOptionType {
|
||||
name = "int";
|
||||
description = "signed integer";
|
||||
descriptionClass = "noun";
|
||||
check = isInt;
|
||||
merge = mergeEqualOption;
|
||||
};
|
||||
|
|
@ -294,6 +331,7 @@ rec {
|
|||
float = mkOptionType {
|
||||
name = "float";
|
||||
description = "floating point number";
|
||||
descriptionClass = "noun";
|
||||
check = isFloat;
|
||||
merge = mergeEqualOption;
|
||||
};
|
||||
|
|
@ -325,6 +363,7 @@ rec {
|
|||
str = mkOptionType {
|
||||
name = "str";
|
||||
description = "string";
|
||||
descriptionClass = "noun";
|
||||
check = isString;
|
||||
merge = mergeEqualOption;
|
||||
};
|
||||
|
|
@ -332,6 +371,7 @@ rec {
|
|||
nonEmptyStr = mkOptionType {
|
||||
name = "nonEmptyStr";
|
||||
description = "non-empty string";
|
||||
descriptionClass = "noun";
|
||||
check = x: str.check x && builtins.match "[ \t\n]*" x == null;
|
||||
inherit (str) merge;
|
||||
};
|
||||
|
|
@ -344,6 +384,7 @@ rec {
|
|||
mkOptionType {
|
||||
name = "singleLineStr";
|
||||
description = "(optionally newline-terminated) single-line string";
|
||||
descriptionClass = "noun";
|
||||
inherit check;
|
||||
merge = loc: defs:
|
||||
lib.removeSuffix "\n" (merge loc defs);
|
||||
|
|
@ -352,6 +393,7 @@ rec {
|
|||
strMatching = pattern: mkOptionType {
|
||||
name = "strMatching ${escapeNixString pattern}";
|
||||
description = "string matching the pattern ${pattern}";
|
||||
descriptionClass = "noun";
|
||||
check = x: str.check x && builtins.match pattern x != null;
|
||||
inherit (str) merge;
|
||||
};
|
||||
|
|
@ -364,6 +406,7 @@ rec {
|
|||
then "Concatenated string" # for types.string.
|
||||
else "strings concatenated with ${builtins.toJSON sep}"
|
||||
;
|
||||
descriptionClass = "noun";
|
||||
check = isString;
|
||||
merge = loc: defs: concatStringsSep sep (getValues defs);
|
||||
functor = (defaultFunctor name) // {
|
||||
|
|
@ -387,7 +430,7 @@ rec {
|
|||
|
||||
passwdEntry = entryType: addCheck entryType (str: !(hasInfix ":" str || hasInfix "\n" str)) // {
|
||||
name = "passwdEntry ${entryType.name}";
|
||||
description = "${entryType.description}, not containing newlines or colons";
|
||||
description = "${optionDescriptionPhrase (class: class == "noun") entryType}, not containing newlines or colons";
|
||||
};
|
||||
|
||||
attrs = mkOptionType {
|
||||
|
|
@ -407,6 +450,7 @@ rec {
|
|||
# ("/nix/store/hash-foo"). These get a context added to them using builtins.storePath.
|
||||
package = mkOptionType {
|
||||
name = "package";
|
||||
descriptionClass = "noun";
|
||||
check = x: isDerivation x || isStorePath x;
|
||||
merge = loc: defs:
|
||||
let res = mergeOneOption loc defs;
|
||||
|
|
@ -427,7 +471,8 @@ rec {
|
|||
|
||||
listOf = elemType: mkOptionType rec {
|
||||
name = "listOf";
|
||||
description = "list of ${elemType.description}";
|
||||
description = "list of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
|
||||
descriptionClass = "composite";
|
||||
check = isList;
|
||||
merge = loc: defs:
|
||||
map (x: x.value) (filter (x: x ? value) (concatLists (imap1 (n: def:
|
||||
|
|
@ -450,13 +495,14 @@ rec {
|
|||
nonEmptyListOf = elemType:
|
||||
let list = addCheck (types.listOf elemType) (l: l != []);
|
||||
in list // {
|
||||
description = "non-empty " + list.description;
|
||||
description = "non-empty ${optionDescriptionPhrase (class: class == "noun") list}";
|
||||
emptyValue = { }; # no .value attr, meaning unset
|
||||
};
|
||||
|
||||
attrsOf = elemType: mkOptionType rec {
|
||||
name = "attrsOf";
|
||||
description = "attribute set of ${elemType.description}";
|
||||
description = "attribute set of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
|
||||
descriptionClass = "composite";
|
||||
check = isAttrs;
|
||||
merge = loc: defs:
|
||||
mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs:
|
||||
|
|
@ -479,7 +525,8 @@ rec {
|
|||
# error that it's not defined. Use only if conditional definitions don't make sense.
|
||||
lazyAttrsOf = elemType: mkOptionType rec {
|
||||
name = "lazyAttrsOf";
|
||||
description = "lazy attribute set of ${elemType.description}";
|
||||
description = "lazy attribute set of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
|
||||
descriptionClass = "composite";
|
||||
check = isAttrs;
|
||||
merge = loc: defs:
|
||||
zipAttrsWith (name: defs:
|
||||
|
|
@ -509,7 +556,7 @@ rec {
|
|||
# Value of given type but with no merging (i.e. `uniq list`s are not concatenated).
|
||||
uniq = elemType: mkOptionType rec {
|
||||
name = "uniq";
|
||||
inherit (elemType) description check;
|
||||
inherit (elemType) description descriptionClass check;
|
||||
merge = mergeOneOption;
|
||||
emptyValue = elemType.emptyValue;
|
||||
getSubOptions = elemType.getSubOptions;
|
||||
|
|
@ -521,7 +568,7 @@ rec {
|
|||
|
||||
unique = { message }: type: mkOptionType rec {
|
||||
name = "unique";
|
||||
inherit (type) description check;
|
||||
inherit (type) description descriptionClass check;
|
||||
merge = mergeUniqueOption { inherit message; };
|
||||
emptyValue = type.emptyValue;
|
||||
getSubOptions = type.getSubOptions;
|
||||
|
|
@ -534,7 +581,8 @@ rec {
|
|||
# Null or value of ...
|
||||
nullOr = elemType: mkOptionType rec {
|
||||
name = "nullOr";
|
||||
description = "null or ${elemType.description}";
|
||||
description = "null or ${optionDescriptionPhrase (class: class == "noun" || class == "conjunction") elemType}";
|
||||
descriptionClass = "conjunction";
|
||||
check = x: x == null || elemType.check x;
|
||||
merge = loc: defs:
|
||||
let nrNulls = count (def: def.value == null) defs; in
|
||||
|
|
@ -552,7 +600,8 @@ rec {
|
|||
|
||||
functionTo = elemType: mkOptionType {
|
||||
name = "functionTo";
|
||||
description = "function that evaluates to a(n) ${elemType.description}";
|
||||
description = "function that evaluates to a(n) ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
|
||||
descriptionClass = "composite";
|
||||
check = isFunction;
|
||||
merge = loc: defs:
|
||||
fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue;
|
||||
|
|
@ -578,6 +627,7 @@ rec {
|
|||
deferredModuleWith = attrs@{ staticModules ? [] }: mkOptionType {
|
||||
name = "deferredModule";
|
||||
description = "module";
|
||||
descriptionClass = "noun";
|
||||
check = x: isAttrs x || isFunction x || path.check x;
|
||||
merge = loc: defs: {
|
||||
imports = staticModules ++ map (def: lib.setDefaultModuleLocation "${def.file}, via option ${showOption loc}" def.value) defs;
|
||||
|
|
@ -603,6 +653,7 @@ rec {
|
|||
optionType = mkOptionType {
|
||||
name = "optionType";
|
||||
description = "optionType";
|
||||
descriptionClass = "noun";
|
||||
check = value: value._type or null == "option-type";
|
||||
merge = loc: defs:
|
||||
if length defs == 1
|
||||
|
|
@ -749,6 +800,10 @@ rec {
|
|||
"value ${show (builtins.head values)} (singular enum)"
|
||||
else
|
||||
"one of ${concatMapStringsSep ", " show values}";
|
||||
descriptionClass =
|
||||
if builtins.length values < 2
|
||||
then "noun"
|
||||
else "conjunction";
|
||||
check = flip elem values;
|
||||
merge = mergeEqualOption;
|
||||
functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); };
|
||||
|
|
@ -757,7 +812,8 @@ rec {
|
|||
# Either value of type `t1` or `t2`.
|
||||
either = t1: t2: mkOptionType rec {
|
||||
name = "either";
|
||||
description = "${t1.description} or ${t2.description}";
|
||||
description = "${optionDescriptionPhrase (class: class == "noun" || class == "conjunction") t1} or ${optionDescriptionPhrase (class: class == "noun" || class == "conjunction" || class == "composite") t2}";
|
||||
descriptionClass = "conjunction";
|
||||
check = x: t1.check x || t2.check x;
|
||||
merge = loc: defs:
|
||||
let
|
||||
|
|
@ -795,7 +851,7 @@ rec {
|
|||
coercedType.description})";
|
||||
mkOptionType rec {
|
||||
name = "coercedTo";
|
||||
description = "${finalType.description} or ${coercedType.description} convertible to it";
|
||||
description = "${optionDescriptionPhrase (class: class == "noun") finalType} or ${optionDescriptionPhrase (class: class == "noun") coercedType} convertible to it";
|
||||
check = x: (coercedType.check x && finalType.check (coerceFunc x)) || finalType.check x;
|
||||
merge = loc: defs:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -15369,14 +15369,19 @@
|
|||
githubId = 31394095;
|
||||
};
|
||||
cafkafk = {
|
||||
email = "cafkafk@cafkafk.com";
|
||||
email = "christina@cafkafk.com";
|
||||
matrix = "@cafkafk:matrix.cafkafk.com";
|
||||
name = "Christina Sørensen";
|
||||
github = "cafkafk";
|
||||
githubId = 89321978;
|
||||
keys = [{
|
||||
fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8";
|
||||
}];
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8";
|
||||
}
|
||||
{
|
||||
fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED";
|
||||
}
|
||||
];
|
||||
};
|
||||
rb = {
|
||||
email = "maintainers@cloudposse.com";
|
||||
|
|
|
|||
|
|
@ -484,6 +484,14 @@
|
|||
<literal>services.datadog-agent</literal> module.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
lemmy module option
|
||||
<literal>services.lemmy.settings.database.createLocally</literal>
|
||||
moved to
|
||||
<literal>services.lemmy.database.createLocally</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
virtlyst package and <literal>services.virtlyst</literal>
|
||||
|
|
|
|||
|
|
@ -166,6 +166,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module.
|
||||
|
||||
- lemmy module option `services.lemmy.settings.database.createLocally`
|
||||
moved to `services.lemmy.database.createLocally`.
|
||||
|
||||
- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers.
|
||||
|
||||
- The `services.graphite.api` and `services.graphite.beacon` NixOS options, and
|
||||
|
|
|
|||
|
|
@ -34,10 +34,6 @@ in
|
|||
|
||||
services.udev.packages = [ pkgs.usbrelayd ];
|
||||
systemd.packages = [ pkgs.usbrelayd ];
|
||||
users.users.usbrelay = {
|
||||
isSystemUser = true;
|
||||
group = "usbrelay";
|
||||
};
|
||||
users.groups.usbrelay = { };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ in
|
|||
|
||||
caddy.enable = mkEnableOption (lib.mdDoc "exposing lemmy with the caddy reverse proxy");
|
||||
|
||||
database.createLocally = mkEnableOption (lib.mdDoc "creation of database on the instance");
|
||||
|
||||
settings = mkOption {
|
||||
default = { };
|
||||
description = lib.mdDoc "Lemmy configuration";
|
||||
|
|
@ -63,9 +65,6 @@ in
|
|||
description = lib.mdDoc "The difficultly of the captcha to solve.";
|
||||
};
|
||||
};
|
||||
|
||||
options.database.createLocally = mkEnableOption (lib.mdDoc "creation of database on the instance");
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -142,7 +141,7 @@ in
|
|||
};
|
||||
|
||||
assertions = [{
|
||||
assertion = cfg.settings.database.createLocally -> localPostgres;
|
||||
assertion = cfg.database.createLocally -> localPostgres;
|
||||
message = "if you want to create the database locally, you need to use a local database";
|
||||
}];
|
||||
|
||||
|
|
@ -163,9 +162,9 @@ in
|
|||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
after = [ "pict-rs.service" ] ++ lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ];
|
||||
after = [ "pict-rs.service" ] ++ lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ];
|
||||
|
||||
requires = lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ];
|
||||
requires = lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ];
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
|
|
@ -203,7 +202,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
systemd.services.lemmy-postgresql = mkIf cfg.settings.database.createLocally {
|
||||
systemd.services.lemmy-postgresql = mkIf cfg.database.createLocally {
|
||||
description = "Lemmy postgresql db";
|
||||
after = [ "postgresql.service" ];
|
||||
partOf = [ "lemmy.service" ];
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ let
|
|||
"final.target"
|
||||
"kexec.target"
|
||||
"systemd-kexec.service"
|
||||
] ++ lib.optional (cfg.package.withUtmp or true) "systemd-update-utmp.service" ++ [
|
||||
] ++ lib.optional cfg.package.withUtmp "systemd-update-utmp.service" ++ [
|
||||
|
||||
# Password entry.
|
||||
"systemd-ask-password-console.path"
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ in
|
|||
services.lemmy = {
|
||||
enable = true;
|
||||
ui.port = uiPort;
|
||||
database.createLocally = true;
|
||||
settings = {
|
||||
hostname = "http://${lemmyNodeName}";
|
||||
port = backendPort;
|
||||
database.createLocally = true;
|
||||
# Without setup, the /feeds/* and /nodeinfo/* API endpoints won't return 200
|
||||
setup = {
|
||||
admin_username = "mightyiam";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.8.9.26";
|
||||
version = "0.8.9.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-RuQAbmzB8s+YmJLSbzJTQtpiYLr1oFtrxKF8P+MlHeU=";
|
||||
sha256 = "sha256-KqSpyDiRhp7DdbFsPor+munMQg+0vv0qF2VI3gkR04Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.170.5";
|
||||
version = "1.171.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-B7t8Vg318ZMcodYEV/DpKEer4AsmAonHbE7cbK34kp0=";
|
||||
hash = "sha256-+NTxZ5UkmaFDcTYliNi/5c8xGztVu6P8C7Ga99MHSFM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,18 +11,18 @@
|
|||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.09.03",
|
||||
"hash": "sha256-YxGCV6oIWZ0a7rRyCq1YjOfyO17mHcxJXgBJ2esvm1U="
|
||||
"rev": "2022.09.18",
|
||||
"hash": "sha256-4d27eW4gpJHwGlRZ4iPzuKIw/o/J4utxXbEhglk31Bw="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.09.11",
|
||||
"hash": "sha256-lzGOcYRfaHernLGMTOe8BazpMYa41p42bjjNEmuxU/c="
|
||||
"rev": "2022.09.18",
|
||||
"hash": "sha256-HjW4V7MctQoHbDYIlMv7VS0nS7FFG6Qir0sCju+isI0="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.09.01",
|
||||
"hash": "sha256-Xnh6hWzy4lTDxlNvEOsGl2YalzKgt51bDrUcMVOvtTg="
|
||||
"rev": "2022.09.18",
|
||||
"hash": "sha256-yIbIRo4hpwbCdH+3fIhjnQPtdvuFmfJSqloKjWqKEuY="
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
@ -41,8 +41,8 @@
|
|||
},
|
||||
"Emmet-Pascal": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.08.28",
|
||||
"hash": "sha256-u8+qUagpy2tKppkjTrEVvXAHQkF8AGDDNtWCNJHnKbs="
|
||||
"rev": "2022.09.18",
|
||||
"hash": "sha256-Kutl4Jh/+KptGbqakzPJnIYlFtytXVlzKWulKt4Z+/g="
|
||||
},
|
||||
"CudaText-lexers": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp
|
||||
index 1186f3a..58e8cc7 100644
|
||||
--- a/src/cpp/core/libclang/LibClang.cpp
|
||||
+++ b/src/cpp/core/libclang/LibClang.cpp
|
||||
@@ -58,7 +58,7 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version)
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
// we need to add in the associated libclang headers as
|
||||
// they are not discovered / used by default during compilation
|
||||
|
|
@ -11,7 +9,7 @@ index 1186f3a..58e8cc7 100644
|
|||
boost::format fmt("%1%/lib/clang/%2%/include");
|
||||
fmt % llvmPath.getAbsolutePath() % version.asString();
|
||||
std::string includePath = fmt.str();
|
||||
@@ -70,46 +70,7 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version)
|
||||
@@ -74,47 +74,7 @@
|
||||
|
||||
std::vector<std::string> systemClangVersions()
|
||||
{
|
||||
|
|
@ -55,7 +53,9 @@ index 1186f3a..58e8cc7 100644
|
|||
- }
|
||||
-#endif
|
||||
-
|
||||
+ std::vector<std::string> clangVersions = { "@libclang.so@" };
|
||||
return clangVersions;
|
||||
- return clangVersions;
|
||||
+ return std::vector<std::string> { "@libclang.so@" };
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -39,17 +39,17 @@
|
|||
|
||||
let
|
||||
pname = "RStudio";
|
||||
version = "2022.02.3+492";
|
||||
version = "2022.07.1+554";
|
||||
RSTUDIO_VERSION_MAJOR = "2022";
|
||||
RSTUDIO_VERSION_MINOR = "02";
|
||||
RSTUDIO_VERSION_PATCH = "3";
|
||||
RSTUDIO_VERSION_SUFFIX = "+492";
|
||||
RSTUDIO_VERSION_MINOR = "07";
|
||||
RSTUDIO_VERSION_PATCH = "1";
|
||||
RSTUDIO_VERSION_SUFFIX = "+554";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rstudio";
|
||||
repo = "rstudio";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pgbk5rpy47h9ihdrplbfhfc49hrc6242j9099bclq7rqif049wi";
|
||||
sha256 = "0rmdqxizxqg2vgr3lv066cjmlpjrxjlgi0m97wbh6iyhkfm2rrj1";
|
||||
};
|
||||
|
||||
mathJaxSrc = fetchurl {
|
||||
|
|
@ -129,6 +129,8 @@ in
|
|||
./use-system-node.patch
|
||||
./fix-resources-path.patch
|
||||
./pandoc-nix-path.patch
|
||||
./remove-quarto-from-generator.patch
|
||||
./do-not-install-pandoc.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -196,7 +198,6 @@ in
|
|||
done
|
||||
|
||||
rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
|
||||
rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
--- a/src/cpp/session/CMakeLists.txt
|
||||
+++ b/src/cpp/session/CMakeLists.txt
|
||||
@@ -60,8 +60,7 @@
|
||||
|
||||
# validate our dependencies exist
|
||||
foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
|
||||
- RSTUDIO_DEPENDENCIES_MATHJAX_DIR
|
||||
- RSTUDIO_DEPENDENCIES_PANDOC_DIR)
|
||||
+ RSTUDIO_DEPENDENCIES_MATHJAX_DIR)
|
||||
|
||||
# validate existence
|
||||
if(NOT EXISTS "${${VAR}}")
|
||||
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
--- a/src/cpp/session/CMakeLists.txt
|
||||
+++ b/src/cpp/session/CMakeLists.txt
|
||||
@@ -43,12 +43,6 @@
|
||||
set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27")
|
||||
endif()
|
||||
|
||||
- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto")
|
||||
- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto")
|
||||
- else()
|
||||
- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto")
|
||||
- endif()
|
||||
-
|
||||
endif()
|
||||
|
||||
|
||||
@@ -67,14 +61,7 @@
|
||||
# validate our dependencies exist
|
||||
foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
|
||||
RSTUDIO_DEPENDENCIES_MATHJAX_DIR
|
||||
- RSTUDIO_DEPENDENCIES_PANDOC_DIR
|
||||
- RSTUDIO_DEPENDENCIES_QUARTO_DIR)
|
||||
-
|
||||
-
|
||||
- # skip quarto if not enabled
|
||||
- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
|
||||
- continue()
|
||||
- endif()
|
||||
+ RSTUDIO_DEPENDENCIES_PANDOC_DIR)
|
||||
|
||||
# validate existence
|
||||
if(NOT EXISTS "${${VAR}}")
|
||||
|
||||
|
|
@ -1,11 +1,12 @@
|
|||
--- a/src/gwt/build.xml
|
||||
+++ b/src/gwt/build.xml
|
||||
@@ -84,23 +84,7 @@
|
||||
@@ -83,24 +83,7 @@
|
||||
<echo>Concatenated acesupport files to 'acesupport.js'</echo>
|
||||
</target>
|
||||
|
||||
<!-- panmirror typescript library -->
|
||||
|
||||
- <!-- panmirror typescript library -->
|
||||
- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
|
||||
- <property name="node.version" value="14.17.5"/>
|
||||
- <property name="node.version" value="16.14.0"/>
|
||||
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
|
||||
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
|
||||
- <not>
|
||||
|
|
@ -21,8 +22,8 @@
|
|||
- property="node.bin"
|
||||
- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"
|
||||
- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/>
|
||||
+ <property name="node.bin" value="@node@/bin/node"/>
|
||||
|
||||
+ <property name="node.bin" value="@node@/bin/node"/>
|
||||
|
||||
<property name="panmirror.dir" value="./panmirror/src/editor"/>
|
||||
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sameboy";
|
||||
version = "0.15.5";
|
||||
version = "0.15.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LIJI32";
|
||||
repo = "SameBoy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R93ZIc1Ics3diJJDdGUBCEGRDW25YnC1ZY0DyJjpyVM=";
|
||||
sha256 = "sha256-WsZuOKq/Dfk2zgYFXSwZPUuPrJQJ3y3mJHL6s61mTig=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, freexl
|
||||
, geos
|
||||
, expat
|
||||
, librttopo
|
||||
|
|
@ -11,6 +12,8 @@
|
|||
, proj
|
||||
, readosm
|
||||
, sqlite
|
||||
, testers
|
||||
, spatialite_tools
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -18,14 +21,15 @@ stdenv.mkDerivation rec {
|
|||
version = "5.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-lgTCBeh/A3eJvFIwLGbM0TccPpjHTo7E4psHUt41Fxw=";
|
||||
url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-${version}.tar.gz";
|
||||
hash = "sha256-lgTCBeh/A3eJvFIwLGbM0TccPpjHTo7E4psHUt41Fxw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
freexl
|
||||
geos
|
||||
librttopo
|
||||
libspatialite
|
||||
|
|
@ -36,17 +40,20 @@ stdenv.mkDerivation rec {
|
|||
sqlite
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-freexl" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_LDFLAGS = "-lsqlite3";
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = spatialite_tools;
|
||||
command = "! spatialite_tool --version";
|
||||
version = "${libspatialite.version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A complete sqlite3-compatible CLI front-end for libspatialite";
|
||||
homepage = "https://www.gaia-gis.it/fossil/spatialite-tools";
|
||||
license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
mainProgram = "spatialite_tool";
|
||||
};
|
||||
}
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg=";
|
||||
};
|
||||
|
||||
mvnSha256 = "KVE+AYYEWN9bjAWop4mpiPq8yU3GdSGqOTmLG4pdflQ=";
|
||||
mvnSha256 = "HdIhENml6W4U+gM7ODxXinbex5o1X4YhWGTct5rpL5c=";
|
||||
mvnParameters = "-P desktop,all-platforms";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
24
pkgs/applications/misc/grb/default.nix
Normal file
24
pkgs/applications/misc/grb/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grb";
|
||||
version = "unstable-2022-07-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LukeSmithxyz";
|
||||
repo = pname;
|
||||
rev = "35a5353ab147b930c39e1ccd369791cc4c27f0df";
|
||||
sha256 = "sha256-hQ21DXnkBJVCgGXQKDR+DjaDC3RXS2pNmSLDoHvHA4E=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cli-accessible Greek Bible with the Septuagint, SBL and Apocrypha";
|
||||
homepage = "https://github.com/LukeSmithxyz/grb";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = [ maintainers.cafkafk ];
|
||||
};
|
||||
}
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation {
|
|||
description = "The Bible, King James Version";
|
||||
homepage = "https://github.com/bontibon/kjv";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ jtobin ];
|
||||
maintainers = with maintainers; [ jtobin cafkafk ];
|
||||
mainProgram = "kjv";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,38 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, madonctl }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "madonctl";
|
||||
version = "1.1.0";
|
||||
|
||||
goPackagePath = "github.com/McKael/madonctl";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "McKael";
|
||||
repo = "madonctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dnc1xaafhwhhf5afhb0wc2wbqq0s1r7qzj5k0xzc58my541gadc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8=";
|
||||
};
|
||||
|
||||
# How to update:
|
||||
# go get -u github.com/McKael/madonctl
|
||||
# cd $GOPATH/src/github.com/McKael/madonctl
|
||||
# git checkout v<version-number>
|
||||
# go2nix save
|
||||
vendorSha256 = null;
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd madonctl \
|
||||
--bash <($out/bin/madonctl completion bash) \
|
||||
--zsh <($out/bin/madonctl completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = madonctl;
|
||||
command = "madonctl version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI for the Mastodon social network API";
|
||||
homepage = "https://github.com/McKael/madonctl";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
228
pkgs/applications/misc/madonctl/deps.nix
generated
228
pkgs/applications/misc/madonctl/deps.nix
generated
|
|
@ -1,228 +0,0 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/McKael/madon";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/McKael/madon";
|
||||
rev = "e580cd41ac42bbb0b2ea5b3843b3f1f854db357c";
|
||||
sha256 = "0jvvfkf3wlzisvcq54xv3jxncx178ks5wxd6cx8k8215437b3hra";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/fsnotify/fsnotify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fsnotify/fsnotify";
|
||||
rev = "4da3e2cfbabc9f751898f250b49f2439785783a1";
|
||||
sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ghodss/yaml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ghodss/yaml";
|
||||
rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
|
||||
sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/websocket";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/websocket";
|
||||
rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";
|
||||
sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/hcl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/hcl";
|
||||
rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
|
||||
sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kr/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/text";
|
||||
rev = "7cafcd837844e784b526369c9bce262804aebc60";
|
||||
sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/m0t0k1ch1/gomif";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/m0t0k1ch1/gomif";
|
||||
rev = "f5864f63e1ed5a138f015cc2cb71a2e99c148d21";
|
||||
sha256 = "0djg8chax1g0m02xz84ic19758jzv5m50b7vpwjkpjk3181j5z9k";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/magiconair/properties";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/magiconair/properties";
|
||||
rev = "51463bfca2576e06c62a8504b5c0f06d61312647";
|
||||
sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-isatty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-isatty";
|
||||
rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe";
|
||||
sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/mapstructure";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/mapstructure";
|
||||
rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
|
||||
sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pelletier/go-buffruneio";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-buffruneio";
|
||||
rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
|
||||
sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pelletier/go-toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-toml";
|
||||
rev = "5c26a6ff6fd178719e15decac1c8196da0d7d6d1";
|
||||
sha256 = "0f4l7mq0nb2p2vjfjqx251s6jzkl646n1vw45chykwvv1sbad8nq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pkg/errors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/errors";
|
||||
rev = "c605e284fe17294bda444b34710735b29d1a9d90";
|
||||
sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sendgrid/rest";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sendgrid/rest";
|
||||
rev = "14de1ac72d9ae5c3c0d7c02164c52ebd3b951a4e";
|
||||
sha256 = "0wrggvgnqdmhscim52hvhg77jhksprxp52sc4ipd69kasd32b5dm";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/afero";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/afero";
|
||||
rev = "9be650865eab0c12963d8753212f4f9c66cdcf12";
|
||||
sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/cast";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cast";
|
||||
rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4";
|
||||
sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/cobra";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cobra";
|
||||
rev = "ca5710c94eabe15aa1f74490b8e5976dc652e8c6";
|
||||
sha256 = "1z5fxh9akwn95av6ra8p6804nhyxjc63m0s6abxi3l424n30b08i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/jwalterweatherman";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/jwalterweatherman";
|
||||
rev = "8f07c835e5cc1450c082fe3a439cf87b0cbb2d99";
|
||||
sha256 = "1dhl6kdbyczhnsgiyc8mcb7kmxd9garx8gy3q2gx5mmv96xxzxx7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/pflag";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/pflag";
|
||||
rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
|
||||
sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/viper";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/viper";
|
||||
rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2";
|
||||
sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "513929065c19401a1c7b76ecd942f9f86a0c061b";
|
||||
sha256 = "19ziin0k3n45nccjbk094f61hr198wzqnas93cmcxdja8f8fz27q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/oauth2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/oauth2";
|
||||
rev = "f047394b6d14284165300fd82dad67edb3a4d7f6";
|
||||
sha256 = "1l1a2iz1nmfmzzbjj1h8066prag4jvjqh13iv1jdlh05fgv6769i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "a2e06a18b0d52d8cb2010e04b372a1965d8e3439";
|
||||
sha256 = "0m0r2w2qk8jkdk21h52n66g4yqckmzpx3mph73cilkhvdfgwfd21";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "19e51611da83d6be54ddafce4a4af510cb3e9ea4";
|
||||
sha256 = "09pcfzx7nrma0gjv93jx57c28farf8m1qm4x07vk5505wlcgvvfl";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
|
||||
sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vul";
|
||||
version = "unstable-2020-02-15";
|
||||
version = "unstable-2022-07-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LukeSmithxyz";
|
||||
repo = pname;
|
||||
rev = "f6ebd8f6b6fb8a111e7b59470d6748fcbe71c559";
|
||||
sha256 = "aUl4f82sGOWkEvTDNILDszj5hztDRvYpHVovFl4oOCc=";
|
||||
rev = "97efaedb79c9de62b6a19b04649fd8c00b85973f";
|
||||
sha256 = "sha256-NwRUx7WVvexrCdPtckq4Szf5ISy7NVBHX8uAsRtbE+0=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Latin Vulgate Bible on the Command Line";
|
||||
homepage = "https://github.com/LukeSmithxyz/vul";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = [ maintainers.j0hax ];
|
||||
maintainers = [ maintainers.j0hax maintainers.cafkafk ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,26 +1,23 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, openssl
|
||||
, CoreServices
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zine";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zineland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Pd/UAg6O9bOvrdvbY46Vf8cxFzjonEwcwPaaW59vH6E=";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-savwRdIO48gCwqW2Wz/nWZuI1TxW/F0OR9jhNzHF+us=";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./Cargo.lock.patch ]; # Repo does not provide Cargo.lock
|
||||
|
||||
cargoSha256 = "sha256-qpzBDyNSZblmdimnnL4T/wS+6EXpduJ1U2+bfxM7piM=";
|
||||
cargoSha256 = "sha256-U+pzT3V4rHiU+Hrax1EUXGQgdjrdfd3G07luaDSam3g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -33,6 +30,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A simple and opinionated tool to build your own magazine";
|
||||
homepage = "https://github.com/zineland/zine";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with maintainers; [ dit7ya figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.173";
|
||||
version = "1.2.174";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jbV2pQSFq/E++eOyQwB0ssG2R9mm3sprlm5mFfHJsBA=";
|
||||
hash = "sha256-8TuAreXWKCXThyiWwiSi5kDVHJKeMB8lpltWbVqGY34=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NHRPl38/R7yS8Hht118mBc+OBPwfYiHOaGIwryNK8Mo=";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.3.26";
|
||||
version = "3.3.27";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5THgUOQv9gPUh9emWiBs/tSNsOX4ZVh+jvKEpWsy05w=";
|
||||
hash = "sha256-0FHhYsm2Uwag0e2i7ip32EWjS4Fx6vA9eW1ojSBB5Hc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gmailctl";
|
||||
version = "0.10.4";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrt";
|
||||
repo = "gmailctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tAYFuxB8LSyFHraAQxCj8Q09mS/9RYcinVm5whpRh04=";
|
||||
sha256 = "sha256-H1Nuu/T55e5zWUmofKoyVSA4TaJBdK+JeZtw+G/sC54=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-IFxKczPrqCM9NOoOJayfbrsJIMf3eoI9zXSFns0/i8o=";
|
||||
vendorSha256 = "sha256-ivkTtcvoH+i58iQM9T0xio0YUeMhNzDcmrCSuGFljEI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bluejeans";
|
||||
version = "2.30.0.89";
|
||||
version = "2.30.1.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
|
||||
sha256 = "sha256-ALydB6bTxaYsBk0BrTKG8Yan4n/jvxT8T7fSMFel+CQ=";
|
||||
sha256 = "sha256-V/3nmindkuTmUsuAuc0UxldAQe7jfeXWSZWPTXTyLq8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rpmextract makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, withOpenASAR ? false }:
|
||||
{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, withOpenASAR ? false }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src meta;
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
nativeBuildInputs = [ undmg makeWrapper ];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
|
|
@ -13,6 +13,10 @@ stdenv.mkDerivation {
|
|||
mkdir -p $out/Applications
|
||||
cp -r "${desktopName}.app" $out/Applications
|
||||
|
||||
# wrap executable to $out/bin
|
||||
mkdir -p $out/bin
|
||||
makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -80,12 +80,12 @@ let
|
|||
};
|
||||
ptb = rec {
|
||||
pname = "discord-ptb";
|
||||
binaryName = "DiscordPTB";
|
||||
binaryName = if stdenv.isLinux then "DiscordPTB" else desktopName;
|
||||
desktopName = "Discord PTB";
|
||||
};
|
||||
canary = rec {
|
||||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName;
|
||||
desktopName = "Discord Canary";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Modern IRC client written in GTK";
|
||||
homepage = "https://srain.im";
|
||||
homepage = "https://srain.silverrainz.me";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ rewine ];
|
||||
|
|
|
|||
597
pkgs/applications/networking/n8n/node-packages.nix
generated
597
pkgs/applications/networking/n8n/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,38 +1,65 @@
|
|||
{ lib, buildGoModule, fetchFromSourcehut, installShellFiles, scdoc }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromSourcehut
|
||||
, installShellFiles
|
||||
, scdoc
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "soju";
|
||||
version = "0.4.0";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~emersion";
|
||||
repo = "soju";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4ixPEnSa1m52Hu1dzxMG8c0bkqGN04vRlIzvdZ/ES4A=";
|
||||
hash = "sha256-lpLWqaSFx/RJg73n5XNN/qUXHfZsBkbABoYcgxpK3rU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UVFi/QK2zwzhBkPXEJLYc5WSu3OOvWTVVGkMhrrufyc=";
|
||||
vendorHash = "sha256-n1wwi7I2hDLOe08RkJOiopDUGI6uhipNpBdeOLARIoU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/soju"
|
||||
"cmd/sojuctl"
|
||||
"contrib/znc-import.go"
|
||||
"contrib/migrate-db"
|
||||
"contrib/znc-import"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
scdoc
|
||||
installShellFiles
|
||||
scdoc
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postBuild = ''
|
||||
make doc/soju.1
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
scdoc < doc/soju.1.scd > doc/soju.1
|
||||
installManPage doc/soju.1
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Test all targets.
|
||||
unset subPackages
|
||||
|
||||
# Disable a test that requires an additional service.
|
||||
rm database/postgres_test.go
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A user-friendly IRC bouncer";
|
||||
longDescription = ''
|
||||
soju is a user-friendly IRC bouncer. soju connects to upstream IRC servers
|
||||
on behalf of the user to provide extra functionality. soju supports many
|
||||
features such as multiple users, numerous IRCv3 extensions, chat history
|
||||
playback and detached channels. It is well-suited for both small and large
|
||||
deployments.
|
||||
'';
|
||||
homepage = "https://soju.im";
|
||||
changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
maintainers = with maintainers; [ azahi malvo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "MAVProxy";
|
||||
version = "1.8.55";
|
||||
version = "1.8.56";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RS3/U52n1Gs3cJtlZeE5z5q1EmC8NrPFt0mHhvIWVTA=";
|
||||
sha256 = "sha256-wyY9oYWABkXNhlZW4RFuyZy/HEnv7cGFVbXVoEnIF1Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ to support their use in yadm.
|
|||
|
||||
resholve.mkDerivation rec {
|
||||
pname = "yadm";
|
||||
version = "3.1.1";
|
||||
version = "3.2.1";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ resholve.mkDerivation rec {
|
|||
owner = "TheLocehiliosan";
|
||||
repo = "yadm";
|
||||
rev = version;
|
||||
hash = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk=";
|
||||
hash = "sha256:0h3gxhdf32g21xx9si0lv0sa4ipb1k0n5qpln0w2vipvfgakn5mn";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
|||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
|
||||
USER=homeless-shelter \
|
||||
bazel \
|
||||
--batch \
|
||||
--output_base="$bazelOut" \
|
||||
--output_user_root="$bazelUserRoot" \
|
||||
${if fetchConfigured then "build --nobuild" else "fetch"} \
|
||||
|
|
@ -211,6 +212,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
|||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
|
||||
USER=homeless-shelter \
|
||||
bazel \
|
||||
--batch \
|
||||
--output_base="$bazelOut" \
|
||||
--output_user_root="$bazelUserRoot" \
|
||||
build \
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unifont";
|
||||
version = "14.0.04";
|
||||
version = "15.0.01";
|
||||
|
||||
ttf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
|
||||
hash = "sha256-IR0d3dxWZRHbJUx0bYPfd7ShubJUnN/+Cj6QHkbu/qg=";
|
||||
hash = "sha256-KZRZvDTpFbHBjdOGd3OfQdCyptebk/SAzRV+8k2mdas=";
|
||||
};
|
||||
|
||||
pcf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
|
||||
hash = "sha256-Q5lR7hX4+P+Q9fVDjw9GtLGqUIslsKOWnn8je85fH+0=";
|
||||
hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchurl }:
|
||||
|
||||
let
|
||||
version = "14.0.04";
|
||||
version = "15.0.01";
|
||||
in fetchurl rec {
|
||||
name = "unifont_upper-${version}";
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ in fetchurl rec {
|
|||
|
||||
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
|
||||
|
||||
hash = "sha256-cNw+3Y/6h2TD6ZSaGO32NNyiTwCUSJsA3Q5W5/m+eLE=";
|
||||
hash = "sha256-cGX9umTGRfrQT3gwPgNqxPHB7Un3ZT3b7hPy4IP45Fk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unicode-character-database";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip";
|
||||
sha256 = "sha256-AzpSdrXXr4hEWJ+ONILzl3qDhecdEH03UFVGUXjCNgA=";
|
||||
sha256 = "sha256-X73kAPPmh9JcybCo0w12GedssvTD6Fup347BMSy2cYw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "14.0";
|
||||
version = "15.0";
|
||||
|
||||
fetchData = { file, sha256 }: fetchurl {
|
||||
url = "https://www.unicode.org/Public/emoji/${version}/${file}";
|
||||
|
|
@ -21,15 +21,15 @@ let
|
|||
srcs = {
|
||||
emoji-sequences = fetchData {
|
||||
file = "emoji-sequences.txt";
|
||||
sha256 = "sha256-4helD/0oe+UmNIuVxPx/P0R9V10EY/RccewdeemeGxE=";
|
||||
sha256 = "sha256-vRpXHAcdY3arTnFwBH3WUW3DOh8B3L9+sRcecLHZ2lg=";
|
||||
};
|
||||
emoji-test = fetchData {
|
||||
file = "emoji-test.txt";
|
||||
sha256 = "sha256-DDOVhnFzfvowINzBZ7dGYMZnL4khyRWVzrLL95djsUg=";
|
||||
sha256 = "sha256-3Rega6+ZJ5jXRhLFL/i/12V5IypEo5FaGG6Wf9Bj0UU=";
|
||||
};
|
||||
emoji-zwj-sequences = fetchData {
|
||||
file = "emoji-zwj-sequences.txt";
|
||||
sha256 = "sha256-owlGLICFkyEsIHz/DUZucxjBmgVO40A69BCJPbIYDA0=";
|
||||
sha256 = "sha256-9AqrpyUCiBcR/fafa4VaH0pT5o1YzEZDVySsX4ja1u8=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unihan-database";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.unicode.org/Public/zipped/${version}/Unihan.zip";
|
||||
hash = "sha256-KuRRmyuCzU0VN5wX5Xv7EsM8D1TaSXfeA7KwS88RhS0=";
|
||||
hash = "sha256-JLFUaR/JfLRCZ7kl1iBkKXCGs/iWtXqBgce21CcCoCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gucharmap";
|
||||
version = "14.0.3";
|
||||
version = "15.0.0";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "devdoc" ];
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xO34CR+SWxtHuP6G8m0jla0rivVp3ddrsODNo50MhHw=";
|
||||
sha256 = "sha256-ymEtiOKdmQ1XWrGk40csX5O5BiwxH3aCPboVekcUukQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
, python3
|
||||
, vala
|
||||
, wrapGAppsHook4
|
||||
, elementary-gtk-theme
|
||||
, elementary-icon-theme
|
||||
, glib
|
||||
, granite7
|
||||
, gst_all_1
|
||||
|
|
@ -33,6 +35,24 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/elementary/music/commit/97a437edc7652e0b85b7d3c6fd87089c14ec02e2.patch";
|
||||
sha256 = "sha256-VmK5dKfSKWAIxfaKXsC8tjg6Pqq1XSGxJDQOZWJX92w=";
|
||||
})
|
||||
# Skip invalid files instead of stopping playback
|
||||
# https://github.com/elementary/music/pull/711
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/music/commit/88f332197d2131daeff3306ec2a484a28fa4db21.patch";
|
||||
sha256 = "sha256-Zga0UmL1PAq4P58IjOuEiXGGn187a0/LHbXXze4sSpY=";
|
||||
})
|
||||
# Enable the NEXT button if repeat mode is set to ALL or ONE
|
||||
# https://github.com/elementary/music/pull/712
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/music/commit/3249e3ca247dfd5ff6b14f4feeeeed63b435bcb8.patch";
|
||||
sha256 = "sha256-nx/nlSSRxu4wy8QG5yYBi0BdRoUmnyry7mwzuk5NJxU=";
|
||||
})
|
||||
# Hard code GTK styles
|
||||
# https://github.com/elementary/music/pull/723
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/music/commit/4e22268d38574e56eb3b42ae201c99cc98b510db.patch";
|
||||
sha256 = "sha256-DZds7pg0vYL9vga+tP7KJHcjQTmdKHS+D+q/2aYfMmk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -45,6 +65,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
elementary-icon-theme
|
||||
glib
|
||||
granite7
|
||||
gtk4
|
||||
|
|
@ -61,6 +82,15 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# The GTK theme is hardcoded.
|
||||
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
|
||||
# The icon theme is hardcoded.
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ assert lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"];
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gavrasm";
|
||||
version = "5.1";
|
||||
version = "5.4";
|
||||
flatVersion = lib.strings.replaceStrings ["."] [""] version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://www.avr-asm-tutorial.net/gavrasm/v${flatVersion}/gavrasm_sources_lin_${flatVersion}.zip";
|
||||
sha256 = "0k94f8k4980wvhx3dpl1savpx4wqv9r5090l0skg2k8vlhsv58gf";
|
||||
sha256 = "sha256-uTalb8Wzn2RAoUKZx9RZFCX+V9HUEtUnJ4eSltFumh0=";
|
||||
stripRoot=false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,24 @@
|
|||
{ lib, openjdk11, fetchFromGitHub, jetbrains }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, jetbrains
|
||||
, openjdk17
|
||||
}:
|
||||
|
||||
openjdk11.overrideAttrs (oldAttrs: rec {
|
||||
openjdk17.overrideAttrs (oldAttrs: rec {
|
||||
pname = "jetbrains-jdk";
|
||||
version = "11_0_13-b1751.25";
|
||||
version = "17.0.3-b469.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JetBrains";
|
||||
repo = "JetBrainsRuntime";
|
||||
rev = "jb${version}";
|
||||
sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI=";
|
||||
hash =
|
||||
# Upstream issue: https://github.com/JetBrains/JetBrainsRuntime/issues/163
|
||||
if stdenv.isDarwin then "sha256-ExRvjs53rIuhUx4oCgAqu1Av3CNAgmE1ZlN0srEh3XM="
|
||||
else "sha256-O+OIDRJcIsb/vhO2+SYuYdUYWYTGkBcQ9cHTExLIFDE=";
|
||||
};
|
||||
patches = [];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OpenJDK fork to better support Jetbrains's products.";
|
||||
longDescription = ''
|
||||
|
|
@ -25,9 +33,12 @@ openjdk11.overrideAttrs (oldAttrs: rec {
|
|||
your own risk.
|
||||
'';
|
||||
homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
|
||||
inherit (openjdk11.meta) license platforms mainProgram;
|
||||
inherit (openjdk17.meta) license platforms mainProgram;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
passthru = oldAttrs.passthru // {
|
||||
home = "${jetbrains.jdk}/lib/openjdk";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
|
|||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||
sha256 = "sha256-MwVO5kfuik+1T8BREOB+C1PgRZH+U9Cky0x+16BekfE=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
|
||||
sha256 = "sha256-ugaDesKJlUe7t5mYnxFGT+zWeCImhxw7ekhhlIEEJnk=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -53,8 +57,8 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://julialang.org";
|
||||
# Bundled and linked with various GPL code, although Julia itself is MIT.
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ ninjin raskin ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ ninjin raskin nickcao ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
mainProgram = "julia";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
substituteInPlace bin/lfc \
|
||||
--replace 'base=`dirname $(dirname ''${abs_path})`' "base='$out'" \
|
||||
--replace "run_lfc_with_args" "${jdk17_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-${version}-SNAPSHOT-all.jar"
|
||||
--replace "run_lfc_with_args" "${jdk17_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-${version}-all.jar"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -41,9 +41,10 @@ stdenv.mkDerivation {
|
|||
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
|
||||
"-DCOMPILER_RT_BUILD_XRAY=OFF"
|
||||
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
|
||||
"-DCOMPILER_RT_BUILD_PROFILE=OFF"
|
||||
"-DCOMPILER_RT_BUILD_MEMPROF=OFF"
|
||||
"-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary
|
||||
] ++ lib.optionals (useLLVM || bareMetal) [
|
||||
"-DCOMPILER_RT_BUILD_PROFILE=OFF"
|
||||
] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [
|
||||
"-DCMAKE_C_COMPILER_WORKS=ON"
|
||||
"-DCMAKE_CXX_COMPILER_WORKS=ON"
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
];
|
||||
LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152";
|
||||
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
|
|||
owner = "QuickChick";
|
||||
inherit version;
|
||||
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
|
||||
{ cases = [ (range "8.13" "8.15") pred.true ]; out = "1.6.2"; }
|
||||
{ cases = [ (range "8.13" "8.16") pred.true ]; out = "1.6.4"; }
|
||||
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
|
||||
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
|
||||
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }
|
||||
|
|
@ -17,6 +17,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
|
|||
{ cases = [ "8.6" pred.true ]; out = "20171102"; }
|
||||
{ cases = [ "8.5" pred.true ]; out = "20170512"; }
|
||||
] null;
|
||||
release."1.6.4".sha256 = "sha256-C1060wPSU33yZAFLxGmZlAMXASnx98qz3oSLO8DO+mM=";
|
||||
release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0";
|
||||
release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw";
|
||||
release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@ let
|
|||
|
||||
pkg = buildGoModule rec {
|
||||
pname = "arduino-cli";
|
||||
version = "0.25.1";
|
||||
version = "0.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NuYPqJ/Fvt1P6KFXTIQaAvXYJgTwWrMspPags0Q06cE=";
|
||||
sha256 = "sha256-lwLzMUMHwheZHrjPttdk6TFsjt8SymHkBMtXTbr/nYE=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-u5YCwnciXlWgqQd9CXfXNipLLlNE3p8+bL6WaTvOkVA=";
|
||||
vendorSha256 = "sha256-kEM6eCWTI+XKs58cVhNfjJsIwC3r1ATy1sFbjtorgGY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/test/suite0009.janet b/test/suite0009.janet
|
||||
index 6095bc60..25360d60 100644
|
||||
--- a/test/suite0009.janet
|
||||
+++ b/test/suite0009.janet
|
||||
@@ -174,15 +174,6 @@
|
||||
(defer (:close stream)
|
||||
(check-matching-names stream)))
|
||||
|
||||
-# Test localname and peername
|
||||
-(repeat 20
|
||||
- (with [s (net/server "127.0.0.1" "8000" names-handler)]
|
||||
- (defn test-names []
|
||||
- (with [conn (net/connect "127.0.0.1" "8000")]
|
||||
- (check-matching-names conn)))
|
||||
- (repeat 20 (test-names)))
|
||||
- (gccollect))
|
||||
-
|
||||
# Create pipe
|
||||
|
||||
(var pipe-counter 0)
|
||||
|
|
@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-uGbaoWJAWbSQ7QkocU7gFZUiWb0GD8mtuO7V0sUXTv0=";
|
||||
};
|
||||
|
||||
# This release fails the test suite on darwin, remove when debugged.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/150618 for discussion.
|
||||
patches = lib.optionals stdenv.isDarwin ./darwin-remove-net-test.patch;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace janet.1 \
|
||||
--replace /usr/local/ $out/
|
||||
|
|
@ -29,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/janet --help
|
||||
$out/bin/janet -e '(+ 1 2 3)'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -38,7 +34,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andrewchambers peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
# Marked as broken when patch is applied, see comment above patch.
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,9 +92,8 @@ in rec {
|
|||
pythonCatchConflictsHook = callPackage ({ setuptools }:
|
||||
makeSetupHook {
|
||||
name = "python-catch-conflicts-hook";
|
||||
deps = [ setuptools ];
|
||||
substitutions = {
|
||||
inherit pythonInterpreter;
|
||||
inherit pythonInterpreter pythonSitePackages setuptools;
|
||||
catchConflicts=../catch_conflicts/catch_conflicts.py;
|
||||
};
|
||||
} ./python-catch-conflicts-hook.sh) {};
|
||||
|
|
@ -115,6 +114,11 @@ in rec {
|
|||
};
|
||||
} ./python-namespaces-hook.sh) {};
|
||||
|
||||
pythonOutputDistHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
name = "python-output-dist-hook";
|
||||
} ./python-output-dist-hook.sh ) {};
|
||||
|
||||
pythonRecompileBytecodeHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
name = "python-recompile-bytecode-hook";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
echo "Sourcing python-catch-conflicts-hook.sh"
|
||||
|
||||
pythonCatchConflictsPhase() {
|
||||
@pythonInterpreter@ @catchConflicts@
|
||||
PYTHONPATH="@setuptools@/@pythonSitePackages@:$PYTHONPATH" @pythonInterpreter@ @catchConflicts@
|
||||
}
|
||||
|
||||
if [ -z "${dontUsePythonCatchConflicts-}" ]; then
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
# Setup hook for storing dist folder (wheels/sdists) in a separate output
|
||||
echo "Sourcing python-catch-conflicts-hook.sh"
|
||||
|
||||
pythonOutputDistPhase() {
|
||||
echo "Executing pythonOutputDistPhase"
|
||||
mv "dist" "$dist"
|
||||
echo "Finished executing pythonOutputDistPhase"
|
||||
}
|
||||
|
||||
preFixupPhases+=" pythonOutputDistPhase"
|
||||
|
|
@ -17,6 +17,7 @@
|
|||
, pythonCatchConflictsHook
|
||||
, pythonImportsCheckHook
|
||||
, pythonNamespacesHook
|
||||
, pythonOutputDistHook
|
||||
, pythonRemoveBinBytecodeHook
|
||||
, pythonRemoveTestsDirHook
|
||||
, setuptoolsBuildHook
|
||||
|
|
@ -49,6 +50,8 @@
|
|||
# Enabled to detect some (native)BuildInputs mistakes
|
||||
, strictDeps ? true
|
||||
|
||||
, outputs ? [ "out" ]
|
||||
|
||||
# used to disable derivation, useful for specific python versions
|
||||
, disabled ? false
|
||||
|
||||
|
|
@ -106,11 +109,13 @@ else
|
|||
let
|
||||
inherit (python) stdenv;
|
||||
|
||||
withDistOutput = lib.elem format ["pyproject" "setuptools" "flit"];
|
||||
|
||||
name_ = name;
|
||||
|
||||
self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
|
||||
"disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
|
||||
"disabledTestPaths"
|
||||
"disabledTestPaths" "outputs"
|
||||
]) // {
|
||||
|
||||
name = namePrefix + name_;
|
||||
|
|
@ -121,7 +126,7 @@ let
|
|||
ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
|
||||
pythonRemoveTestsDirHook
|
||||
] ++ lib.optionals catchConflicts [
|
||||
setuptools pythonCatchConflictsHook
|
||||
pythonCatchConflictsHook
|
||||
] ++ lib.optionals removeBinBytecode [
|
||||
pythonRemoveBinBytecodeHook
|
||||
] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
|
||||
|
|
@ -144,6 +149,8 @@ let
|
|||
] ++ lib.optionals (python.pythonAtLeast "3.3") [
|
||||
# Optionally enforce PEP420 for python3
|
||||
pythonNamespacesHook
|
||||
] ++ lib.optionals withDistOutput [
|
||||
pythonOutputDistHook
|
||||
] ++ nativeBuildInputs;
|
||||
|
||||
buildInputs = buildInputs ++ pythonPath;
|
||||
|
|
@ -177,6 +184,8 @@ let
|
|||
# Python packages built through cross-compilation are always for the host platform.
|
||||
disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];
|
||||
|
||||
outputs = outputs ++ lib.optional withDistOutput "dist";
|
||||
|
||||
meta = {
|
||||
# default to python's platforms
|
||||
platforms = python.meta.platforms;
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
|
||||
# https://www.aquamaniac.de/rdm/projects/aqbanking/files
|
||||
aqbanking = {
|
||||
version = "6.5.0";
|
||||
hash = "sha256-TS076ghulq2ntoGSBtTrQWjOt+Mtzppo3Gxuq8yetj4=";
|
||||
releaseId = "435";
|
||||
version = "6.5.3";
|
||||
hash = "sha256-bGK/JqpC5psh4Yi1T2pdgl1to03hoUy8O2fYWpcFE24=";
|
||||
releaseId = "467";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmark-gfm";
|
||||
version = "0.29.0.gfm.5";
|
||||
version = "0.29.0.gfm.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "cmark-gfm";
|
||||
rev = version;
|
||||
sha256 = "sha256-HNFxp62xBNo2GbWiiYXco2NMgoOXsnZNdbXgTK1i1JU=";
|
||||
sha256 = "sha256-ekHY5EGSrJrQwlXNjKpyj7k0Bzq1dYPacRsfNZ8K+lk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
# tests load the library dynamically which for unknown reason failed
|
||||
doCheck = false;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# remove when https://github.com/github/cmark-gfm/pull/248 merged and released
|
||||
postInstall = ''
|
||||
|
|
|
|||
28
pkgs/development/libraries/freexl/default.nix
Normal file
28
pkgs/development/libraries/freexl/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, stdenv, fetchurl, validatePkgConfig, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freexl";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/freexl-${version}.tar.gz";
|
||||
hash = "sha256-Pei1ej0TDLKIHqUtOqnOH+7bG1e32qTrN/dRQE+Q/CI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ validatePkgConfig ];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library to extract valid data from within an Excel (.xls) spreadsheet";
|
||||
homepage = "https://www.gaia-gis.it/fossil/freexl";
|
||||
# They allow any of these
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.1.8";
|
||||
version = "22.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-l6FCFYdHQrH00phcncmeCGrFDs5lmyTRjQXH13nWZwg=";
|
||||
sha256 = "sha256-Wy2OroZI4bo+3OdKaa0e5N+QNKKgWVOJrK1Cdda8yDI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libheif";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "man" ];
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "strukturag";
|
||||
repo = "libheif";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RjGLaDSBO8T7ijRb5a16aUlkCy5vdFPs4O9caIJo4jI=";
|
||||
sha256 = "sha256-/w/I6dgyiAscUqVpPjw2z6LbZJ6IBTeE5lawLg0awTM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, fetchFromGitea
|
||||
, autoreconfHook
|
||||
, validatePkgConfig
|
||||
, geos
|
||||
}:
|
||||
|
||||
|
|
@ -19,14 +20,21 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0h7lzlkn9g4xky6h81ndy0aa6dxz8wb6rnl8v3987jy1i6pr072p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
validatePkgConfig
|
||||
geos # for geos-config
|
||||
];
|
||||
|
||||
buildInputs = [ geos ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "RT Topology Library";
|
||||
homepage = "https://git.osgeo.org/gitea/rttopo/librttopo";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, validatePkgConfig
|
||||
, freexl
|
||||
, geos
|
||||
, librttopo
|
||||
, libxml2
|
||||
|
|
@ -18,13 +20,18 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-7svJQxHHgBLQWevA+uhupe9u7LEzA+boKzdTwbNAnpg=";
|
||||
url = "https://www.gaia-gis.it/gaia-sins/libspatialite-${version}.tar.gz";
|
||||
hash = "sha256-7svJQxHHgBLQWevA+uhupe9u7LEzA+boKzdTwbNAnpg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
validatePkgConfig
|
||||
geos # for geos-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freexl
|
||||
geos
|
||||
librttopo
|
||||
libxml2
|
||||
|
|
@ -35,14 +42,22 @@ stdenv.mkDerivation rec {
|
|||
libiconv
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-freexl" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
ln -s $out/lib/mod_spatialite.{so,dylib}
|
||||
'';
|
||||
|
||||
# Failed tests (linux & darwin):
|
||||
# - check_virtualtable6
|
||||
# - check_drop_rename
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$(pwd)/src/.libs
|
||||
export DYLD_LIBRARY_PATH=$(pwd)/src/.libs
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extensible spatial index library in C++";
|
||||
homepage = "https://www.gaia-gis.it/fossil/libspatialite";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, cctools
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liquid-dsp";
|
||||
|
|
@ -11,10 +16,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ];
|
||||
nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ cctools ];
|
||||
|
||||
meta = {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://liquidsdr.org/";
|
||||
description = "Digital signal processing library for software-defined radios";
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
|
||||
import ./generic.nix {
|
||||
version = "3.82";
|
||||
hash = "sha256-Mr9nO3LC+ZU+07THAzq/WmytMChUokrliMV1plZ8FXM=";
|
||||
version = "3.83";
|
||||
hash = "sha256-qyPqZ/lkCQuLc8gKZ0CCVxw25fTrqSBXrGSMnB3vASg=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,12 +47,12 @@ in
|
|||
lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "11.0.2";
|
||||
version = "11.0.3";
|
||||
pname = "geant4";
|
||||
|
||||
src = fetchurl{
|
||||
url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz";
|
||||
hash = "sha256-/AONuDcxL3Tj+O/RC108qHqZnUg9TYlZxguKdJIh7GE=";
|
||||
hash = "sha256-cvi2h1EtbmMNxsZMXEG6cRIgRoVAEymZ0A5PzhkIrkg=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ let
|
|||
platforms = lib.platforms.unix;
|
||||
homepage = "https://developers.google.com/protocol-buffers/";
|
||||
maintainers = with lib.maintainers; [ jonringer ];
|
||||
mainProgram = "protoc";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,24 +1,26 @@
|
|||
{ lib, stdenv, fetchurl, expat, zlib, geos, libspatialite }:
|
||||
{ lib, stdenv, fetchurl, expat, zlib, validatePkgConfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "readosm";
|
||||
version = "1.1.0a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${pname}-${version}.tar.gz";
|
||||
sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v";
|
||||
url = "https://www.gaia-gis.it/gaia-sins/readosm-${version}.tar.gz";
|
||||
hash = "sha256-23wFHSVs7H7NTDd1q5vIINpaS/cv/U6fQLkR15dw8UU=";
|
||||
};
|
||||
|
||||
buildInputs = [ expat zlib geos libspatialite ];
|
||||
nativeBuildInputs = [ validatePkgConfig ];
|
||||
|
||||
configureFlags = [ "--disable-freexl" ];
|
||||
buildInputs = [ expat zlib ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source library to extract valid data from within an Open Street Map input file";
|
||||
homepage = "https://www.gaia-gis.it/fossil/readosm";
|
||||
license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlitecpp";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SRombauts";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1c2yyipiqswi5sf9xmpsgw6l1illzmcpkjm56agk6kl2hay23lgr";
|
||||
sha256 = "sha256-Z1c2lQZ0UltcIf9dTnumZPhke4uEmsjg/Ygppvx3kxY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vapoursynth";
|
||||
version = "59";
|
||||
version = "60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vapoursynth";
|
||||
repo = "vapoursynth";
|
||||
rev = "R${version}";
|
||||
sha256 = "sha256-6w7GSC5ZNIhLpulni4sKq0OvuxHlTJRilBFGH5PQW8U=";
|
||||
sha256 = "sha256-E1uHNcGxBrwg00tNnY3qH6BpvXtBEGkX7QFy0aMLSnA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,19 +7,22 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wolfssl";
|
||||
version = "5.4.0";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfSSL";
|
||||
repo = "wolfssl";
|
||||
rev = "v${version}-stable";
|
||||
sha256 = "sha256-5a83Mi+S+mASdZ6O2+0I+qulsF6yNUe80a3qZvWmXHw=";
|
||||
sha256 = "sha256-PqxwWPK5eBcS5d6e0CL4uZHybDye1K8pxniKU99YSAE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./scripts
|
||||
# ocsp tests require network access
|
||||
sed -i -e '/ocsp\.test/d' -e '/ocsp-stapling\.test/d' scripts/include.am
|
||||
# ensure test detects musl-based systems too
|
||||
substituteInPlace scripts/ocsp-stapling2.test \
|
||||
--replace '"linux-gnu"' '"linux-"'
|
||||
'';
|
||||
|
||||
# Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
coffee-script = "coffee";
|
||||
typescript = "tsc";
|
||||
vue-cli = "vue";
|
||||
"@withgraphite/graphite-cli" = "gt";
|
||||
|
||||
# Packages that provide a single executable whose name differs from the package's `name`.
|
||||
"@angular/cli" = "ng";
|
||||
|
|
|
|||
|
|
@ -387,6 +387,7 @@
|
|||
, "webpack-dev-server"
|
||||
, "copy-webpack-plugin"
|
||||
, "webtorrent-cli"
|
||||
, "@withgraphite/graphite-cli"
|
||||
, "wrangler"
|
||||
, "wring"
|
||||
, "write-good"
|
||||
|
|
|
|||
4014
pkgs/development/node-packages/node-packages.nix
generated
4014
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -167,6 +167,10 @@ final: prev: {
|
|||
meta = oldAttrs.meta // { broken = since "10"; };
|
||||
});
|
||||
|
||||
graphite-cli = prev."@withgraphite/graphite-cli".override {
|
||||
name = "graphite-cli";
|
||||
};
|
||||
|
||||
graphql-language-service-cli = prev.graphql-language-service-cli.override {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,27 +1,24 @@
|
|||
{ lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config
|
||||
, bigarray-compat, optint
|
||||
, optint
|
||||
, fmt, rresult, bos, fpath, astring, alcotest
|
||||
, withFreestanding ? false
|
||||
, ocaml-freestanding
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "0.3.2";
|
||||
version = "0.3.4";
|
||||
pname = "checkseum";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
minimalOCamlVersion = "4.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz";
|
||||
sha256 = "9cdd282ea1cfc424095d7284e39e4d0ad091de3c3f2580539d03f6966d45ccd5";
|
||||
url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-${version}.tbz";
|
||||
sha256 = "sha256-BL4BOwxXORrkOOba4QjRSetm8bF9JmlKHSFPq24+1zg=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = [
|
||||
bigarray-compat
|
||||
optint
|
||||
] ++ lib.optionals withFreestanding [
|
||||
ocaml-freestanding
|
||||
|
|
|
|||
|
|
@ -28,10 +28,9 @@ buildDunePackage rec {
|
|||
inherit (hpack)
|
||||
version
|
||||
src
|
||||
useDune2
|
||||
;
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
angstrom
|
||||
|
|
@ -42,7 +41,7 @@ buildDunePackage rec {
|
|||
httpaf
|
||||
];
|
||||
|
||||
# Tests fail with 4.06
|
||||
# Tests fail with ≤ 4.07
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
preCheck = ''
|
||||
ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case
|
||||
|
|
|
|||
26
pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
Normal file
26
pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ buildDunePackage
|
||||
, happy-eyeballs
|
||||
, cmdliner
|
||||
, dns-client
|
||||
, logs
|
||||
, lwt
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "happy-eyeballs-lwt";
|
||||
inherit (happy-eyeballs) src version;
|
||||
|
||||
buildInputs = [ cmdliner ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dns-client
|
||||
happy-eyeballs
|
||||
logs
|
||||
lwt
|
||||
];
|
||||
|
||||
meta = happy-eyeballs.meta // {
|
||||
description = "Connecting to a remote host via IP version 4 or 6 using Lwt_unix";
|
||||
};
|
||||
|
||||
}
|
||||
25
pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
Normal file
25
pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ buildDunePackage
|
||||
, happy-eyeballs
|
||||
, dns-client
|
||||
, logs
|
||||
, lwt
|
||||
, tcpip
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "happy-eyeballs-mirage";
|
||||
inherit (happy-eyeballs) src version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dns-client
|
||||
happy-eyeballs
|
||||
logs
|
||||
lwt
|
||||
tcpip
|
||||
];
|
||||
|
||||
meta = happy-eyeballs.meta // {
|
||||
description = "Connecting to a remote host via IP version 4 or 6 using Mirage";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -7,15 +7,14 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "hpack";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";
|
||||
sha256 = "0qcn3yvyz0h419fjg9nb20csfmwmh3ihz0zb0jfzdycf5w4mlry6";
|
||||
sha256 = "sha256-7gjRhJs2mufQbImAXiKFT9mZ1kHGSHHwjCVZM5f0C14=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.04";
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
angstrom
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ogg";
|
||||
version = "0.7.2";
|
||||
|
||||
useDune2 = true;
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-ogg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EY1iVtB5M8//KJPT9FMDYVeBrE/lT30fCqTjjKKnWZU=";
|
||||
sha256 = "sha256-D6tLKBSGfWBoMfQrWmamd8jo2AOphJV9xeSm+l06L5c=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ libogg ];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ buildDunePackage {
|
|||
inherit (paf)
|
||||
version
|
||||
src
|
||||
useDune2
|
||||
minimumOCamlVersion
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -34,7 +32,7 @@ buildDunePackage {
|
|||
ipaddr
|
||||
];
|
||||
|
||||
doCheck = false; # tests fail
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
alcotest-lwt
|
||||
fmt
|
||||
|
|
|
|||
|
|
@ -25,15 +25,14 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "paf";
|
||||
version = "0.0.8";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
|
||||
sha256 = "CyIIV11G7oUPPHuhov52LP4Ih4pY6bcUApD23/9q39k=";
|
||||
sha256 = "sha256-JIJjECEbajauowbXot19vtiDhTpGAQiSCBY0AHZOyZM=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mirage-stack
|
||||
|
|
@ -49,7 +48,7 @@ buildDunePackage rec {
|
|||
tcpip
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
lwt
|
||||
logs
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ buildDunePackage {
|
|||
inherit (paf)
|
||||
version
|
||||
src
|
||||
useDune2
|
||||
minimumOCamlVersion
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,20 +9,20 @@
|
|||
}:
|
||||
|
||||
let
|
||||
unicodeVersion = "14.0.0";
|
||||
unicodeVersion = "15.0.0";
|
||||
baseUrl = "https://www.unicode.org/Public/${unicodeVersion}";
|
||||
|
||||
DerivedCoreProperties = fetchurl {
|
||||
url = "${baseUrl}/ucd/DerivedCoreProperties.txt";
|
||||
sha256 = "sha256:1g77s8g9443dd92f82pbkim7rk51s7xdwa3mxpzb1lcw8ryxvvg3";
|
||||
sha256 = "sha256-02cpC8CGfmtITGg3BTC90aCLazJARgG4x6zK+D4FYo0=";
|
||||
};
|
||||
DerivedGeneralCategory = fetchurl {
|
||||
url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt";
|
||||
sha256 = "sha256:080l3bwwppm7gnyga1hzhd07b55viklimxpdsx0fsxhr8v47krnd";
|
||||
sha256 = "sha256-/imkXAiCUA5ZEUCqpcT1Bn5qXXRoBhSK80QAxIucBvk=";
|
||||
};
|
||||
PropList = fetchurl {
|
||||
url = "${baseUrl}/ucd/PropList.txt";
|
||||
sha256 = "sha256:08k75jzl7ws9l3sm1ywsj24qa4qvzn895wggdpp5nyj1a2wgvpbb";
|
||||
sha256 = "sha256-4FwKKBHRE9rkq9gyiEGZo+qNGH7huHLYJAp4ipZUC/0=";
|
||||
};
|
||||
in
|
||||
buildDunePackage rec {
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "tcpip";
|
||||
version = "7.1.0";
|
||||
version = "7.1.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "sha256-4nd2OVZa4w22I4bgglnS8lrNfjTk40PL5n6Oh6n+osw=";
|
||||
sha256 = "sha256-lraur6NfFD9yddG+y21jlHKt82gLgYBBbedltlgcRm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml-${pname}-${version}";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "sha256:0fc737v5gj3339jx4x9xr096lxrpwvp6vaiylhavcvsglcwbgm30";
|
||||
sha256 = "sha256-DksDi6Dfe/fNGBmeubwxv9dScTHPJRuaPrlX7M8QRrw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "uucp";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
minimumOCamlVersion = "4.03";
|
||||
doCheck = true;
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "sha256:1yx9nih3d9prb9zizq8fzmmqylf24a6yifhf81h33znrj5xn1mpj";
|
||||
sha256 = "sha256-rEeU9AWpCzuAtAOe7hJHBmJjP97BZsQsPFQQ8uZLUzA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner }:
|
||||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner
|
||||
, cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1"
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "uuseg";
|
||||
|
|
@ -8,20 +10,29 @@ in
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "sha256:1g9zyzjkhqxgbb9mh3cgaawscwdazv6y8kdqvmy6yhnimmfqv25p";
|
||||
sha256 = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
buildInputs = [ topkg cmdliner uutf ];
|
||||
buildInputs = [ topkg uutf ]
|
||||
++ lib.optional cmdlinerSupport cmdliner;
|
||||
propagatedBuildInputs = [ uucp ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
${topkg.run} build \
|
||||
--with-uutf true \
|
||||
--with-cmdliner ${lib.boolToString cmdlinerSupport}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
inherit (topkg) installPhase;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OCaml library for segmenting Unicode text";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.15";
|
||||
version = "9.2.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CXJ9UVTrJzXumDJ6wghDbxVfZo9ZC67qBpz8B5D0DLo=";
|
||||
hash = "sha256-9l1TlJwwmc51z+Dwl8uDNlUSOhGaI1bIMoqokaT/IFE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioaladdinconnect";
|
||||
version = "0.1.44";
|
||||
version = "0.1.45";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "AIOAladdinConnect";
|
||||
inherit version;
|
||||
hash = "sha256-TtqCbU3NYrRy4upBOZNSC3+TrcBg4ol7JXqeOI6+IhA=";
|
||||
hash = "sha256-Fc34DPhN27wzEGSkRSpynqi9EGw1r3Iwp5rtT4eMMBI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioimaplib";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
|
@ -43,9 +43,13 @@ buildPythonPackage rec {
|
|||
disabledTests = [
|
||||
# https://github.com/bamthomas/aioimaplib/issues/77
|
||||
"test_get_quotaroot"
|
||||
# asyncio.exceptions.TimeoutError
|
||||
"test_idle"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aioimaplib" ];
|
||||
pythonImportsCheck = [
|
||||
"aioimaplib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python asyncio IMAP4rev1 client library";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
|
||||
# native
|
||||
|
|
@ -17,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioitertools";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA=";
|
||||
hash = "sha256-QsaLjdOmnCv38iM7999LtYtVe8pSUqwC7VGHu8Z9aDE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -45,8 +44,8 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables";
|
||||
homepage = "https://aioitertools.omnilib.dev/";
|
||||
license = licenses.mit;
|
||||
homepage = "https://pypi.org/project/aioitertools/";
|
||||
maintainers = with maintainers; [ teh ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.15";
|
||||
version = "9.2.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -55,7 +55,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9KWk4uB7VlYsnQbDCRgnVkis0UAZfiI2xH9cAD1Dd7M=";
|
||||
hash = "sha256-wy+0VojvgRjIkiPxnJN+r3R4dkIqhHCP/jZqurf+1CY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.2.6";
|
||||
version = "9.2.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qaDAicmYZxLPTl17il61ij01prRv2H4xxe07Xg4KWhI=";
|
||||
hash = "sha256-wIPk7Cz7FSPviPFBSLrBjLr9M0o3pyoJM7wiAhHrg9Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue