Merge branch 'staging-next' into staging
This commit is contained in:
Vladimír Čunát
commit
59a68f487d
177 changed files with 3052 additions and 2506 deletions
|
|
@ -328,7 +328,7 @@ rec {
|
|||
escape ["(" ")"] "(foo)"
|
||||
=> "\\(foo\\)"
|
||||
*/
|
||||
escape = list: replaceChars list (map (c: "\\${c}") list);
|
||||
escape = list: replaceStrings list (map (c: "\\${c}") list);
|
||||
|
||||
/* Escape occurence of the element of `list` in `string` by
|
||||
converting to its ASCII value and prefixing it with \\x.
|
||||
|
|
@ -341,7 +341,7 @@ rec {
|
|||
=> "foo\\x20bar"
|
||||
|
||||
*/
|
||||
escapeC = list: replaceChars list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list);
|
||||
escapeC = list: replaceStrings list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list);
|
||||
|
||||
/* Quote string to be used safely within the Bourne shell.
|
||||
|
||||
|
|
@ -471,19 +471,8 @@ rec {
|
|||
["\"" "'" "<" ">" "&"]
|
||||
[""" "'" "<" ">" "&"];
|
||||
|
||||
# Obsolete - use replaceStrings instead.
|
||||
replaceChars = builtins.replaceStrings or (
|
||||
del: new: s:
|
||||
let
|
||||
substList = lib.zipLists del new;
|
||||
subst = c:
|
||||
let found = lib.findFirst (sub: sub.fst == c) null substList; in
|
||||
if found == null then
|
||||
c
|
||||
else
|
||||
found.snd;
|
||||
in
|
||||
stringAsChars subst s);
|
||||
# warning added 12-12-2022
|
||||
replaceChars = lib.warn "replaceChars is a deprecated alias of replaceStrings, replace usages of it with replaceStrings." builtins.replaceStrings;
|
||||
|
||||
# Case conversion utilities.
|
||||
lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
|
||||
|
|
@ -497,7 +486,7 @@ rec {
|
|||
toLower "HOME"
|
||||
=> "home"
|
||||
*/
|
||||
toLower = replaceChars upperChars lowerChars;
|
||||
toLower = replaceStrings upperChars lowerChars;
|
||||
|
||||
/* Converts an ASCII string to upper-case.
|
||||
|
||||
|
|
@ -507,7 +496,7 @@ rec {
|
|||
toUpper "home"
|
||||
=> "HOME"
|
||||
*/
|
||||
toUpper = replaceChars lowerChars upperChars;
|
||||
toUpper = replaceStrings lowerChars upperChars;
|
||||
|
||||
/* Appends string context from another string. This is an implementation
|
||||
detail of Nix and should be used carefully.
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ let
|
|||
systemd = cfg.package;
|
||||
in rec {
|
||||
|
||||
shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);
|
||||
shellEscape = s: (replaceStrings [ "\\" ] [ "\\\\" ] s);
|
||||
|
||||
mkPathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""];
|
||||
mkPathSafeName = lib.replaceStrings ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""];
|
||||
|
||||
# a type for options that take a unit name
|
||||
unitNameType = types.strMatching "[a-zA-Z0-9@%:_.\\-]+[.](service|socket|device|mount|automount|swap|target|path|timer|scope|slice)";
|
||||
|
|
@ -258,7 +258,7 @@ in rec {
|
|||
|
||||
makeJobScript = name: text:
|
||||
let
|
||||
scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name);
|
||||
scriptName = replaceStrings [ "\\" "@" ] [ "-" "_" ] (shellEscape name);
|
||||
out = (pkgs.writeShellScriptBin scriptName ''
|
||||
set -e
|
||||
${text}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ rec {
|
|||
trim = s: removeSuffix "/" (removePrefix "/" s);
|
||||
normalizedPath = strings.normalizePath s;
|
||||
in
|
||||
replaceChars ["/"] ["-"]
|
||||
replaceStrings ["/"] ["-"]
|
||||
(replacePrefix "." (strings.escapeC ["."] ".")
|
||||
(strings.escapeC (stringToCharacters " !\"#$%&'()*+,;<=>=@[\\]^`{|}~-")
|
||||
(if normalizedPath == "/" then normalizedPath else trim normalizedPath)));
|
||||
|
|
@ -67,7 +67,7 @@ rec {
|
|||
else if builtins.isInt arg || builtins.isFloat arg then toString arg
|
||||
else throw "escapeSystemdExecArg only allows strings, paths and numbers";
|
||||
in
|
||||
replaceChars [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s);
|
||||
replaceStrings [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s);
|
||||
|
||||
# Quotes a list of arguments into a single string for use in a Exec*
|
||||
# line.
|
||||
|
|
@ -112,7 +112,7 @@ rec {
|
|||
else if isAttrs item then
|
||||
map (name:
|
||||
let
|
||||
escapedName = ''"${replaceChars [''"'' "\\"] [''\"'' "\\\\"] name}"'';
|
||||
escapedName = ''"${replaceStrings [''"'' "\\"] [''\"'' "\\\\"] name}"'';
|
||||
in
|
||||
recurse (prefix + "." + escapedName) item.${name}) (attrNames item)
|
||||
else if isList item then
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ let
|
|||
config = rec {
|
||||
device = mkIf options.label.isDefined
|
||||
"/dev/disk/by-label/${config.label}";
|
||||
deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device);
|
||||
deviceName = lib.replaceStrings ["\\"] [""] (escapeSystemdPath config.device);
|
||||
realDevice = if config.randomEncryption.enable then "/dev/mapper/${deviceName}" else config.device;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ in
|
|||
'';
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ ((replaceChars [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ];
|
||||
after = [ ((replaceStrings [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ];
|
||||
|
||||
restartTriggers = [ config.environment.etc.projects.source ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,15 @@ in {
|
|||
services.surrealdb = {
|
||||
enable = mkEnableOption (lib.mdDoc "A scalable, distributed, collaborative, document-graph database, for the realtime web ");
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.surrealdb;
|
||||
defaultText = literalExpression "pkgs.surrealdb";
|
||||
type = types.package;
|
||||
description = lib.mdDoc ''
|
||||
Which surrealdb derivation to use.
|
||||
'';
|
||||
};
|
||||
|
||||
dbPath = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc ''
|
||||
|
|
@ -57,7 +66,7 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
|
||||
# Used to connect to the running service
|
||||
environment.systemPackages = [ pkgs.surrealdb ] ;
|
||||
environment.systemPackages = [ cfg.package ] ;
|
||||
|
||||
systemd.services.surrealdb = {
|
||||
description = "A scalable, distributed, collaborative, document-graph database, for the realtime web ";
|
||||
|
|
@ -65,7 +74,7 @@ in {
|
|||
after = [ "network.target" ];
|
||||
|
||||
script = ''
|
||||
${pkgs.surrealdb}/bin/surreal start \
|
||||
${cfg.package}/bin/surreal start \
|
||||
--user $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_USERNAME) \
|
||||
--pass $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_PASSWORD) \
|
||||
--bind ${cfg.host}:${toString cfg.port} \
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
# Escaping is done according to https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS
|
||||
setDatabaseOption = key: value:
|
||||
"UPDATE settings SET value = '${
|
||||
lib.replaceChars [ "'" ] [ "''" ] (builtins.toJSON value)
|
||||
lib.replaceStrings [ "'" ] [ "''" ] (builtins.toJSON value)
|
||||
}' WHERE key = '${key}';";
|
||||
updateDatabaseConfigSQL = pkgs.writeText "update-database-config.sql"
|
||||
(concatStringsSep "\n" (mapAttrsToList setDatabaseOption
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
json = pkgs.formats.json { };
|
||||
yaml = pkgs.formats.yaml { };
|
||||
cfg = config.services.prometheus;
|
||||
checkConfigEnabled =
|
||||
(lib.isBool cfg.checkConfig && cfg.checkConfig)
|
||||
|
|
@ -11,8 +11,6 @@ let
|
|||
|
||||
workingDir = "/var/lib/" + cfg.stateDir;
|
||||
|
||||
prometheusYmlOut = "${workingDir}/prometheus-substituted.yaml";
|
||||
|
||||
triggerReload = pkgs.writeShellScriptBin "trigger-reload-prometheus" ''
|
||||
PATH="${makeBinPath (with pkgs; [ systemd ])}"
|
||||
if systemctl -q is-active prometheus.service; then
|
||||
|
|
@ -38,7 +36,7 @@ let
|
|||
promtool ${what} $out
|
||||
'' else file;
|
||||
|
||||
generatedPrometheusYml = json.generate "prometheus.yml" promConfig;
|
||||
generatedPrometheusYml = yaml.generate "prometheus.yml" promConfig;
|
||||
|
||||
# This becomes the main config file for Prometheus
|
||||
promConfig = {
|
||||
|
|
@ -73,7 +71,8 @@ let
|
|||
"--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}"
|
||||
"--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
|
||||
] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"
|
||||
++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}";
|
||||
++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}"
|
||||
++ optional (cfg.webConfigFile != null) "--web.config.file=${cfg.webConfigFile}";
|
||||
|
||||
filterValidPrometheus = filterAttrsListRecursive (n: v: !(n == "_module" || v == null));
|
||||
filterAttrsListRecursive = pred: x:
|
||||
|
|
@ -1719,6 +1718,15 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
webConfigFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Specifies which file should be used as web.config.file and be passed on startup.
|
||||
See https://prometheus.io/docs/prometheus/latest/configuration/https/ for valid options.
|
||||
'';
|
||||
};
|
||||
|
||||
checkConfig = mkOption {
|
||||
type = with types; either bool (enum [ "syntax-only" ]);
|
||||
default = true;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ let
|
|||
serviceName = iface: "supplicant-${if (iface=="WLAN") then "wlan@" else (
|
||||
if (iface=="LAN") then "lan@" else (
|
||||
if (iface=="DBUS") then "dbus"
|
||||
else (replaceChars [" "] ["-"] iface)))}";
|
||||
else (replaceStrings [" "] ["-"] iface)))}";
|
||||
|
||||
# TODO: Use proper privilege separation for wpa_supplicant
|
||||
supplicantService = iface: suppl:
|
||||
|
|
@ -27,7 +27,7 @@ let
|
|||
driverArg = optionalString (suppl.driver != null) "-D${suppl.driver}";
|
||||
bridgeArg = optionalString (suppl.bridge!="") "-b${suppl.bridge}";
|
||||
confFileArg = optionalString (suppl.configFile.path!=null) "-c${suppl.configFile.path}";
|
||||
extraConfFile = pkgs.writeText "supplicant-extra-conf-${replaceChars [" "] ["-"] iface}" ''
|
||||
extraConfFile = pkgs.writeText "supplicant-extra-conf-${replaceStrings [" "] ["-"] iface}" ''
|
||||
${optionalString suppl.userControlled.enable "ctrl_interface=DIR=${suppl.userControlled.socketDir} GROUP=${suppl.userControlled.group}"}
|
||||
${optionalString suppl.configFile.writable "update_config=1"}
|
||||
${suppl.extraConf}
|
||||
|
|
@ -223,7 +223,7 @@ in
|
|||
text = ''
|
||||
${flip (concatMapStringsSep "\n") (filter (n: n!="WLAN" && n!="LAN" && n!="DBUS") (attrNames cfg)) (iface:
|
||||
flip (concatMapStringsSep "\n") (splitString " " iface) (i: ''
|
||||
ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="${i}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="supplicant-${replaceChars [" "] ["-"] iface}.service", TAG+="SUPPLICANT_ASSIGNED"''))}
|
||||
ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="${i}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="supplicant-${replaceStrings [" "] ["-"] iface}.service", TAG+="SUPPLICANT_ASSIGNED"''))}
|
||||
|
||||
${optionalString (hasAttr "WLAN" cfg) ''
|
||||
ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="/run/current-system/systemd/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-wlan@$result.service"
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ let
|
|||
|
||||
peerUnitServiceName = interfaceName: publicKey: dynamicRefreshEnabled:
|
||||
let
|
||||
keyToUnitName = replaceChars
|
||||
keyToUnitName = replaceStrings
|
||||
[ "/" "-" " " "+" "=" ]
|
||||
[ "-" "\\x2d" "\\x20" "\\x2b" "\\x3d" ];
|
||||
unitName = keyToUnitName publicKey;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ let
|
|||
grubConfig = args:
|
||||
let
|
||||
efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
|
||||
efiSysMountPoint' = replaceChars [ "/" ] [ "-" ] efiSysMountPoint;
|
||||
efiSysMountPoint' = replaceStrings [ "/" ] [ "-" ] efiSysMountPoint;
|
||||
in
|
||||
pkgs.writeText "grub-config.xml" (builtins.toXML
|
||||
{ splashImage = f cfg.splashImage;
|
||||
|
|
|
|||
|
|
@ -1377,12 +1377,12 @@ in
|
|||
# networkmanager falls back to "/proc/sys/net/ipv6/conf/default/use_tempaddr"
|
||||
"net.ipv6.conf.default.use_tempaddr" = tempaddrValues.${cfg.tempAddresses}.sysctl;
|
||||
} // listToAttrs (forEach interfaces
|
||||
(i: nameValuePair "net.ipv4.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" i.proxyARP))
|
||||
(i: nameValuePair "net.ipv4.conf.${replaceStrings ["."] ["/"] i.name}.proxy_arp" i.proxyARP))
|
||||
// listToAttrs (forEach interfaces
|
||||
(i: let
|
||||
opt = i.tempAddress;
|
||||
val = tempaddrValues.${opt}.sysctl;
|
||||
in nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" val));
|
||||
in nameValuePair "net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr" val));
|
||||
|
||||
security.wrappers = {
|
||||
ping = {
|
||||
|
|
@ -1495,7 +1495,7 @@ in
|
|||
in
|
||||
''
|
||||
# override to ${msg} for ${i.name}
|
||||
ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=${val}"
|
||||
ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr=${val}"
|
||||
'') (filter (i: i.tempAddress != cfg.tempAddresses) interfaces);
|
||||
})
|
||||
] ++ lib.optional (cfg.wlanInterfaces != {})
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ let
|
|||
|
||||
hardware.enableAllFirmware = lib.mkForce false;
|
||||
|
||||
${replaceChars ["\n"] ["\n "] extraConfig}
|
||||
${replaceStrings ["\n"] ["\n "] extraConfig}
|
||||
}
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
nodes.machine = { config, lib, pkgs, ... }: {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
additionalModules = [ pkgs.nginxModules.modsecurity-nginx ];
|
||||
additionalModules = [ pkgs.nginxModules.modsecurity ];
|
||||
virtualHosts.localhost =
|
||||
let modsecurity_conf = pkgs.writeText "modsecurity.conf" ''
|
||||
SecRuleEngine On
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
let
|
||||
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
|
||||
inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge
|
||||
removeSuffix replaceChars singleton splitString;
|
||||
removeSuffix replaceStrings singleton splitString;
|
||||
|
||||
/*
|
||||
* The attrset `exporterTests` contains one attribute
|
||||
|
|
@ -182,7 +182,7 @@ let
|
|||
enable = true;
|
||||
extraFlags = [ "--web.collectd-push-path /collectd" ];
|
||||
};
|
||||
exporterTest = let postData = replaceChars [ "\n" ] [ "" ] ''
|
||||
exporterTest = let postData = replaceStrings [ "\n" ] [ "" ] ''
|
||||
[{
|
||||
"values":[23],
|
||||
"dstypes":["gauge"],
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}";
|
||||
rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str;
|
||||
char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str;
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "mt32emu-qt";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str;
|
||||
char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mt32emu-smf2wav";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "rncbc";
|
||||
repo = "qjackctl";
|
||||
rev = "${pname}_${lib.replaceChars ["."] ["_"] version}";
|
||||
rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "sha256-PchW9cM5qEP51G9RXUZ3j/AvKqTkgNiw3esqSQqsy0M=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
version = "5.20.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh";
|
||||
url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceStrings [ "." ] [ "_" ] version}.sh";
|
||||
sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
|
|||
desktopItem = makeDesktopItem {
|
||||
name = pname;
|
||||
exec = pname;
|
||||
comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
|
||||
comment = lib.replaceStrings ["\n"] [" "] meta.longDescription;
|
||||
desktopName = product;
|
||||
genericName = meta.description;
|
||||
categories = [ "Development" ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, nix-update-script
|
||||
, rustPlatform
|
||||
, cmake
|
||||
, pkg-config
|
||||
|
|
@ -24,16 +24,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lapce";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lapce";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A0HeZB022GFrZFkdcSuzUmNBxxZHKCcqtTUh5MbGsEg=";
|
||||
sha256 = "sha256-WFFn1l7d70x5v6jo5m+Thq1WoZjY7f8Lvr3U473xx48=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-XracOWjkFZiv5bc3Xfm8sRta6CdO5rjrYAzRs3JT0rc=";
|
||||
cargoSha256 = "sha256-9e0pUztrIL5HGHrS2pHA1hkH2v24AEQ2RiogLRAxyeo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
@ -76,8 +76,8 @@ rustPlatform.buildRustPackage rec {
|
|||
categories = [ "Development" "Utility" "TextEditor" ];
|
||||
}) ];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -605,6 +605,21 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
bmewburn.vscode-intelephense-client = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-intelephense-client";
|
||||
publisher = "bmewburn";
|
||||
version = "1.8.2";
|
||||
sha256 = "OvWdDQfhprQNve017pNSksMuCK3Ccaar5Ko5Oegdiuo=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "PHP code intelligence for Visual Studio Code";
|
||||
license = licenses.mit;
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client";
|
||||
maintainers = with maintainers; [ drupol ];
|
||||
};
|
||||
};
|
||||
|
||||
catppuccin.catppuccin-vsc = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "catppuccin-vsc";
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ vscode-utils.buildVscodeExtension {
|
|||
name = "${pname}-${version}";
|
||||
src = "${vsix}/${pname}.zip";
|
||||
vscodeExtUniqueId = "${publisher}.${pname}";
|
||||
vscodeExtPublisher = publisher;
|
||||
vscodeExtName = pname;
|
||||
|
||||
nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ let
|
|||
version = "1.8.1";
|
||||
|
||||
vscodeExtUniqueId = "${publisher}.${pname}";
|
||||
vscodeExtPublisher = publisher;
|
||||
vscodeExtName = pname;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimcn";
|
||||
|
|
@ -52,7 +54,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "vscode-extension-${publisher}-${pname}";
|
||||
inherit src version vscodeExtUniqueId;
|
||||
inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName;
|
||||
|
||||
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ let
|
|||
src,
|
||||
# Same as "Unique Identifier" on the extension's web page.
|
||||
# For the moment, only serve as unique extension dir.
|
||||
vscodeExtPublisher,
|
||||
vscodeExtName,
|
||||
vscodeExtUniqueId,
|
||||
configurePhase ? ''
|
||||
runHook preConfigure
|
||||
|
|
@ -23,7 +25,10 @@ let
|
|||
|
||||
name = "vscode-extension-${name}";
|
||||
|
||||
inherit vscodeExtUniqueId;
|
||||
passthru = {
|
||||
inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
|
||||
};
|
||||
|
||||
inherit configurePhase buildPhase dontPatchELF dontStrip;
|
||||
|
||||
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
|
||||
|
|
@ -54,9 +59,12 @@ let
|
|||
}: assert "" == name; assert null == src;
|
||||
buildVscodeExtension ((removeAttrs a [ "mktplcRef" "vsix" ]) // {
|
||||
name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}";
|
||||
version = mktplcRef.version;
|
||||
src = if (vsix != null)
|
||||
then vsix
|
||||
else fetchVsixFromVscodeMarketplace mktplcRef;
|
||||
vscodeExtPublisher = mktplcRef.publisher;
|
||||
vscodeExtName = mktplcRef.name;
|
||||
vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}";
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -18,17 +18,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1m5mz6wdrivqrw699iivvh62bdn4yzm6hmph455sdyvk5icq59dq";
|
||||
x86_64-darwin = "1zn0h9p05kb3fcn816fpxh8asaglycjmpiwkrmxd0s8jwjq7m4gn";
|
||||
aarch64-linux = "1gs810iz08jxqfhcgi6ab41m46ib5h3m7i3pnyvlimxx99r5lirf";
|
||||
aarch64-darwin = "1dvasr1h28snxi33m6yx95pp3jd4irwy6yav4ilwrcl22cf6ybvi";
|
||||
armv7l-linux = "1j5vrpdaqihcr02pdsd5nz07zsk0027xmkfp30npnjy1gjrjvnim";
|
||||
x86_64-linux = "0f5l720gc47dygbk7mahx7pb088a8bfrnf69j3igvczbnfapx5sy";
|
||||
x86_64-darwin = "0qmji8bfnqvrxv4yk3rscvns1hk5wfwwdng8jblh5bilf657g1fc";
|
||||
aarch64-linux = "0qcmcsb97q303izhw8k4242nsb72my1vnf24hsfml4vr76f5qqbd";
|
||||
aarch64-darwin = "1cc8p5s8vr5bml715yx2lzkqa9q85rziswrhl1d11zagymvswjzn";
|
||||
armv7l-linux = "086c3wazjk30f8r8dgi0bjsvzcc6sa9d80cy4500pim7rb7s6ppn";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.73.1";
|
||||
version = "1.74.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "09ymqhg10flv3w38cb3fhrf5fvxz6aa12y75i009j01rjckvsymr";
|
||||
x86_64-darwin = "0kd9a8vk4ddp78m0y1fbzbpgpr5rwhxnfbg52wvky0grl58dh6v6";
|
||||
aarch64-linux = "17hwxwvvl3vy2s6wl1n2qkkdhlrf40z8wy0r5jhqrni79f6drkjz";
|
||||
aarch64-darwin = "1skgnn6rq0rkhj98q8y19cyyllk8xa1752lwn4qcgi568anap1lw";
|
||||
armv7l-linux = "0drz8kigjl82m3hfkpbqnmymy6fpgwmgbpkdwl2jkbl81iijvxvp";
|
||||
x86_64-linux = "07njvkgashg9mbkdf7cw40xdxh08qs8gbgh24gdznvs397bvk2jk";
|
||||
x86_64-darwin = "155f7rbyb413igvxddrrad0y1s7i9rfldm6d9fvbyz6p8nzyqfvh";
|
||||
aarch64-linux = "08wz44js381hjlnpssd09i2xz9min603n7a5v3x2sah4z9vi220d";
|
||||
aarch64-darwin = "0ikw0kcbvjwn6b0ac5zfp0shavay31yfhn000xrw9il3py741x7k";
|
||||
armv7l-linux = "1pvybhaf96ayjl832vz9c0y2m07mb5a16c2hr13l0vw52sbl30md";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
|
|
@ -29,7 +29,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.73.1.22314";
|
||||
version = "1.74.1.22349";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, runCommand, buildEnv, vscode, makeWrapper
|
||||
{ lib, stdenv, runCommand, buildEnv, vscode, makeWrapper, writeText
|
||||
, vscodeExtensions ? [] }:
|
||||
|
||||
/*
|
||||
|
|
@ -46,12 +46,47 @@ let
|
|||
wrappedPkgVersion = lib.getVersion vscode;
|
||||
wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name;
|
||||
|
||||
combinedExtensionsDrv = buildEnv {
|
||||
name = "vscode-extensions";
|
||||
paths = vscodeExtensions;
|
||||
toExtensionJsonEntry = drv: rec {
|
||||
identifier = {
|
||||
id = "${drv.vscodeExtPublisher}.${drv.vscodeExtName}";
|
||||
uuid = "";
|
||||
};
|
||||
|
||||
version = drv.version;
|
||||
|
||||
location = {
|
||||
"$mid" = 1;
|
||||
fsPath = drv.outPath + "/share/vscode/extensions/${drv.vscodeExtUniqueId}";
|
||||
path = location.fsPath;
|
||||
scheme = "file";
|
||||
};
|
||||
|
||||
metadata = {
|
||||
id = identifier.uuid;
|
||||
publisherId = "";
|
||||
publisherDisplayName = drv.vscodeExtPublisher;
|
||||
targetPlatform = "undefined";
|
||||
isApplicationScoped = false;
|
||||
updated = false;
|
||||
isPreReleaseVersion = false;
|
||||
installedTimestamp = 0;
|
||||
preRelease = false;
|
||||
};
|
||||
};
|
||||
|
||||
extensionsFlag = lib.optionalString (vscodeExtensions != []) ''
|
||||
extensionJson = builtins.toJSON (map toExtensionJsonEntry vscodeExtensions);
|
||||
extensionJsonFile = writeText "extensions.json" extensionJson;
|
||||
extensionJsonOutput = runCommand "vscode-extensions-json" {} ''
|
||||
mkdir -p $out/share/vscode/extensions
|
||||
cp ${extensionJsonFile} $out/share/vscode/extensions/extensions.json
|
||||
'';
|
||||
|
||||
combinedExtensionsDrv = buildEnv {
|
||||
name = "vscode-extensions";
|
||||
paths = vscodeExtensions ++ [ extensionJsonOutput ];
|
||||
};
|
||||
|
||||
extensionsFlag = ''
|
||||
--add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions"
|
||||
'';
|
||||
in
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "atari800";
|
||||
repo = "atari800";
|
||||
rev = "ATARI800_${replaceChars ["."] ["_"] version}";
|
||||
rev = "ATARI800_${replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "TASVideos";
|
||||
repo = "desmume";
|
||||
rev = "release_${lib.replaceChars ["."] ["_"] finalAttrs.version}";
|
||||
rev = "release_${lib.replaceStrings ["."] ["_"] finalAttrs.version}";
|
||||
hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
}@args:
|
||||
|
||||
let
|
||||
d2u = if normalizeCore then (lib.replaceChars [ "-" ] [ "_" ]) else (x: x);
|
||||
d2u = if normalizeCore then (lib.replaceStrings [ "-" ] [ "_" ]) else (x: x);
|
||||
coreDir = placeholder "out" + libretroCore;
|
||||
coreFilename = "${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
mainProgram = "retroarch-${core}";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
, fetchpatch
|
||||
, ffmpeg
|
||||
, gettext
|
||||
, wxGTK32
|
||||
, gtk3
|
||||
, libGLU, libGL
|
||||
, openal
|
||||
, pkg-config
|
||||
|
|
@ -16,12 +18,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "visualboyadvance-m";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "visualboyadvance-m";
|
||||
repo = "visualboyadvance-m";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kgpbvng3c12ws0dy92zc0azd94h0i3j4vm7b67zc8mi3pqsppdg";
|
||||
sha256 = "1sc3gdn7dqkipjsvlzchgd98mia9ic11169dw8v341vr9ppb1b6m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
@ -30,12 +32,15 @@ stdenv.mkDerivation rec {
|
|||
cairo
|
||||
ffmpeg
|
||||
gettext
|
||||
libGLU libGL
|
||||
libGLU
|
||||
libGL
|
||||
openal
|
||||
SDL2
|
||||
sfml
|
||||
zip
|
||||
zlib
|
||||
wxGTK32
|
||||
gtk3
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -43,23 +48,13 @@ stdenv.mkDerivation rec {
|
|||
"-DENABLE_FFMPEG='true'"
|
||||
"-DENABLE_LINK='true'"
|
||||
"-DSYSCONFDIR=etc"
|
||||
"-DENABLE_WX='false'"
|
||||
"-DENABLE_SDL='true'"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/visualboyadvance-m/visualboyadvance-m/pull/793
|
||||
name = "fix-build-SDL-2.0.14.patch";
|
||||
url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824.patch";
|
||||
sha256 = "099cbzgq4r9g83bvdra8a0swfl1vpfng120wf4q7h6vs0n102rk9";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A merge of the original Visual Boy Advance forks";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ lassulus ];
|
||||
maintainers = with maintainers; [ lassulus netali ];
|
||||
homepage = "https://vba-m.com/";
|
||||
platforms = lib.platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wc1hBHqVH/ooXqF97Ev/mVdbfS9JCrreq2n2PIg/pEs=";
|
||||
sha256 = "sha256-DHFQLC89ZNf6wk/L9cmEj1qSfQhqFAmQ9msYTRy0y00=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CraJexOepja1CJnp9ngCVBWiFy84rWXzDRTWa0sxQs0=";
|
||||
cargoSha256 = "sha256-9AC8muMKc0eU3g4uQvWscIULNetlgEs6ZVsMr4dpwqk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, fftw
|
||||
, flann
|
||||
, gettext
|
||||
, glew
|
||||
, glew-egl
|
||||
, ilmbase
|
||||
, lcms2
|
||||
, lensfun
|
||||
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
|||
fftw
|
||||
flann
|
||||
gettext
|
||||
glew
|
||||
glew-egl
|
||||
ilmbase
|
||||
lcms2
|
||||
lensfun
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ let
|
|||
nota = callPackage ./nota.nix { };
|
||||
pix = callPackage ./pix.nix { };
|
||||
shelf = callPackage ./shelf.nix { };
|
||||
station = callPackage ./station.nix { };
|
||||
vvave = callPackage ./vvave.nix { };
|
||||
};
|
||||
|
||||
|
|
|
|||
36
pkgs/applications/maui/station.nix
Normal file
36
pkgs/applications/maui/station.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, kcoreaddons
|
||||
, ki18n
|
||||
, kirigami2
|
||||
, mauikit
|
||||
, mauikit-filebrowsing
|
||||
, qmltermwidget
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "station";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kcoreaddons
|
||||
ki18n
|
||||
kirigami2
|
||||
mauikit
|
||||
mauikit-filebrowsing
|
||||
qmltermwidget
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convergent terminal emulator";
|
||||
homepage = "https://invent.kde.org/maui/station";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,35 +1,23 @@
|
|||
{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls_2 }:
|
||||
{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openrgb";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "CalcProgrammer1";
|
||||
repo = "OpenRGB";
|
||||
rev = "release_${version}";
|
||||
sha256 = "0xhfaz0b74nfnh7il2cz5c0338xlzay00g6hc2h3lsncarj8d5n7";
|
||||
sha256 = "sha256-46dL1D5oVlw6mNuFDCbbrUDmq42yFXV/qFJ1JnPT5/s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
buildInputs = [ libusb1 hidapi mbedtls_2 ];
|
||||
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||
buildInputs = [ libusb1 hidapi mbedtls_2 qtbase qttools ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp openrgb $out/bin
|
||||
|
||||
substituteInPlace 60-openrgb.rules \
|
||||
postPatch = ''
|
||||
patchShebangs scripts/build-udev-rules.sh
|
||||
substituteInPlace scripts/build-udev-rules.sh \
|
||||
--replace /bin/chmod "${coreutils}/bin/chmod"
|
||||
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp 60-openrgb.rules $out/etc/udev/rules.d
|
||||
|
||||
install -Dm444 -t "$out/share/applications" qt/OpenRGB.desktop
|
||||
install -Dm444 -t "$out/share/icons/hicolor/128x128/apps" qt/OpenRGB.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
d2u = lib.replaceChars ["."] ["_"];
|
||||
d2u = lib.replaceStrings ["."] ["_"];
|
||||
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ let
|
|||
|
||||
};
|
||||
|
||||
d2u = lib.replaceChars ["."] ["_"];
|
||||
d2u = lib.replaceStrings ["."] ["_"];
|
||||
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zine";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-mcYBaNmfpXDMhZuDxZ8WgwRb0CM3WjATrMH5YcU2Dxo=";
|
||||
sha256 = "sha256-Z47BkBTKdzfjBJKjelJFu0tOU5bdjhLviDQ2fJQAlXE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Xfy7RRQairzfhVmh2E5ny07/9jACDdTqU2aj4IT1rkE=";
|
||||
cargoSha256 = "sha256-sEIuilAjPZupSJojAu5DLtgToLCgMJKlJXWIAGcLeCQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "109.0.5414.36",
|
||||
"sha256": "14kicgbadb83401dpfqnz3hb3dxi55nfydj5wpmg29dyw0bdndpm",
|
||||
"sha256bin64": "11lpv9432xqkdj4q89sfyd0261444s9amncnzdmij93ni1wac8b4",
|
||||
"version": "109.0.5414.46",
|
||||
"sha256": "17wzll9024c80fhgxi33ix1rpmqh9sbpx6qvw9cvhdlmhn0b5017",
|
||||
"sha256bin64": "199n8a7pjnhbgkm2dwh9hq7pzf39x932bh6b056jqp032d5c00ns",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-11-10",
|
||||
|
|
@ -32,9 +32,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "110.0.5449.0",
|
||||
"sha256": "1zims8jw7k53qpv4kml3n15hy587jgg0sai7j4zrv3i3lk8jr6g7",
|
||||
"sha256bin64": "1ykgxr3jxbqdgrq6g6vzbxnig05vljzdx800j6hn3kxwr9cdqwxn",
|
||||
"version": "110.0.5464.2",
|
||||
"sha256": "18k4rrwszk4xz416xi6li9b5pdajlscfgg4cyv67y10z7f28qwby",
|
||||
"sha256bin64": "0hzv55bba4041400zjysgzz1n8svzvi156xyrayfr5ynapf7g2rd",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-11-29",
|
||||
|
|
@ -45,8 +45,8 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "108.0.5359.99",
|
||||
"sha256": "0v5ynal3s28s4f9s4s95hblnjxiy6498qmk04s0vf2ixqwi7rivn",
|
||||
"version": "108.0.5359.125",
|
||||
"sha256": "0n8aigw7qv6dzd8898xz435kj79z73v916amfaxyz69g57pnpqhn",
|
||||
"sha256bin64": null,
|
||||
"deps": {
|
||||
"gn": {
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
"sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "108.0.5359.99-1",
|
||||
"sha256": "0qibibgi54mdwmmcmz613qk9mgjczspvq09bz5m0wpkxbx7hla0i"
|
||||
"rev": "108.0.5359.125-1",
|
||||
"sha256": "1dacvzi6j4xyjjnrsb79mhhj7jc992z1di9acl4appfydlqadgv3"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles, pkgsBuildBuild, stdenv }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, pkgsBuildBuild
|
||||
}:
|
||||
|
||||
let
|
||||
# Argo can package a static server in the CLI using the `staticfiles` go module.
|
||||
|
|
@ -19,22 +26,26 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo";
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eVd3tH77Z3AlNpMEx+xnOQTELXFeGTLIslE++++Sdkw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZG10ruusSywXWn88UqrHVfAWrio2KoK2YoM9qdtMlhU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-n8NAxfNZ/q2gdA5N7dTNgvdB549aiRxFPJO4UsfIn2U=";
|
||||
vendorHash = "sha256-Tqn5HGhRbN++yAo9JajUMTxFjVLw5QTvsis8wcfRIHw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "cmd/argo" ];
|
||||
subPackages = [
|
||||
"cmd/argo"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p ui/dist/app
|
||||
|
|
@ -65,6 +76,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Container native workflow engine for Kubernetes";
|
||||
homepage = "https://github.com/argoproj/argo";
|
||||
changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ groodt ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lqHHZtEtedU0Qtm6o6iy6JrQ1UiB9nSTZVyfq0cj0vI=";
|
||||
sha256 = "sha256-Qaq0I7ZCXRXIWtUN3fcpoN4SURq/OfH+u73nyWYmJOY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7e2ZJa6MfzznOoaBq0xQIXrdmDAzPzKh9QFlRfbxYMM=";
|
||||
vendorSha256 = "sha256-VDSMXE+Vlgmo7T1b+A7uW9BqSDBDyhrneJX1yH+XfDc=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.10";
|
||||
version = "3.5.11";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
|
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vxwhqbupXr0Kj3+HeXBrI2pfvr+ClaVlCblva+gq0/k=";
|
||||
hash = "sha256-KGeTzERLlsrBHQxskrMhFHw9XyYyl33bJJK+SN++EU4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||
signal-desktop = {
|
||||
dir = "Signal";
|
||||
version = "6.0.1";
|
||||
hash = "sha256-7Cojhz3wBPd/13uVg2MgJXvR9QMPZcwBibk/sCrRMAE=";
|
||||
version = "6.1.0";
|
||||
hash = "sha256-70IQ/2yjHbez8SpZxqZKa/XWIEYA3cN7JAIM9kgjN30=";
|
||||
};
|
||||
signal-desktop-beta = {
|
||||
dir = "Signal Beta";
|
||||
version = "6.1.0-beta.1";
|
||||
hash = "sha256-zfXHSAYJH9/y0IaB6dTb1T85hZzDXyNX6sCpaHnL32k=";
|
||||
version = "6.2.0-beta.1";
|
||||
hash = "sha256-OA7DHe/sfW8xpqJPEu7BWotpnaJYj5SatPB21byZHrY=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "onedrive";
|
||||
version = "2.4.21";
|
||||
version = "2.4.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abraunegg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KZVRLXXaJYMqHzjxTfQaD0u7n3ACBEk3fLOmqwybNhM=";
|
||||
hash = "sha256-/NhZHJEu2s+HlEUb1DqRdrpvrIWrDAtle07+oXMJCdI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dataexplorer";
|
||||
version = "3.6.2";
|
||||
version = "3.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
|
||||
sha256 = "sha256-2e8qeoJh7z/RIowMtAd8PGcMPck5H8iHqel6bW7EQ0E=";
|
||||
sha256 = "sha256-cqvlPV4i9m0x3hbruC5y2APsyjfI5y9RT8XVzsDaT/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant makeWrapper ];
|
||||
|
|
@ -38,11 +38,11 @@ stdenv.mkDerivation rec {
|
|||
# So we create our own wrapper, using similar cmdline args as upstream.
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${jre}/bin/java $out/bin/DataExplorer \
|
||||
--add-flags "-Dfile.encoding=UTF-8 -Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \
|
||||
--add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \
|
||||
--set SWT_GTK3 0
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \
|
||||
--add-flags "-Dfile.encoding=UTF-8 -Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \
|
||||
--add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \
|
||||
--set SWT_GTK3 0 \
|
||||
--set LIBOVERLAY_SCROLLBAR 0
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.nongnu.org/dataexplorer/index.html";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ panicgh ];
|
||||
platforms = jdk.meta.platforms;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode # contains RXTXcomm (JNI library with *.so files)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "3.9.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/weka/${lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip";
|
||||
url = "mirror://sourceforge/weka/${lib.replaceStrings ["."]["-"] "${pname}-${version}"}.zip";
|
||||
sha256 = "sha256-8fVN4MXYqXNEmyVtXh1IrauHTBZWgWG8AvsGI5Y9Aj0=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,21 +24,16 @@
|
|||
, libxcb
|
||||
}:
|
||||
|
||||
let
|
||||
majorVersion = "7.20";
|
||||
minorVersion = "2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "${majorVersion}.${minorVersion}";
|
||||
pname = "boinc";
|
||||
version = "7.20.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}-src";
|
||||
owner = "BOINC";
|
||||
repo = "boinc";
|
||||
rev = "client_release/${majorVersion}/${version}";
|
||||
sha256 = "sha256-vMb5Vq/6I6lniG396wd7+FfslsByedMRPIpiItp1d1s=";
|
||||
rev = "client_release/${lib.versions.majorMinor version}/${version}";
|
||||
hash = "sha256-KqD986Q7npKTnh0DdNgMHro+1M/UQHiNsXaRl9WjONw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ let
|
|||
|
||||
hashname = r:
|
||||
let
|
||||
rpl = lib.replaceChars [ ":" "/" ] [ "_" "_" ];
|
||||
rpl = lib.replaceStrings [ ":" "/" ] [ "_" "_" ];
|
||||
in
|
||||
(rpl r.url) + "-" + (rpl r.rev);
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ let
|
|||
# We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a
|
||||
# preprocessor flag.
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"$out/share/syminfo.lib\"')
|
||||
makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"')
|
||||
export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
|
||||
'';
|
||||
makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
diff --git a/ccp4/csymlib.c b/ccp4/csymlib.c
|
||||
index 76bc70b..7a0c5dc 100644
|
||||
index 76bc70b..3616121 100644
|
||||
--- a/ccp4/csymlib.c
|
||||
+++ b/ccp4/csymlib.c
|
||||
@@ -137,24 +137,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg,
|
||||
@@ -136,25 +136,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg,
|
||||
}
|
||||
}
|
||||
|
||||
/* Open the symop file: */
|
||||
- /* Open the symop file: */
|
||||
- if (!(symopfile = getenv("SYMINFO"))) {
|
||||
- if (debug)
|
||||
- printf("Environment variable SYMINFO not set ... guessing location of symmetry file. \n");
|
||||
|
|
@ -28,3 +29,12 @@ index 76bc70b..7a0c5dc 100644
|
|||
|
||||
filein = fopen(symopfile,"r");
|
||||
if (!filein) {
|
||||
@@ -162,8 +144,6 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- if (!(getenv("SYMINFO"))) free(symopfile);
|
||||
-
|
||||
parser = ccp4_parse_start(20);
|
||||
if (parser == NULL)
|
||||
ccp4_signal(CSYM_ERRNO(CSYMERR_ParserFail),"ccp4spg_load_spacegroup",NULL);
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@ assert (repos != []) || (url != "") || (urls != []);
|
|||
let
|
||||
name_ =
|
||||
lib.concatStrings [
|
||||
(lib.replaceChars ["."] ["_"] groupId) "_"
|
||||
(lib.replaceChars ["."] ["_"] artifactId) "-"
|
||||
(lib.replaceStrings ["."] ["_"] groupId) "_"
|
||||
(lib.replaceStrings ["."] ["_"] artifactId) "-"
|
||||
version
|
||||
];
|
||||
mkJarUrl = repoUrl:
|
||||
lib.concatStringsSep "/" [
|
||||
(lib.removeSuffix "/" repoUrl)
|
||||
(lib.replaceChars ["."] ["/"] groupId)
|
||||
(lib.replaceStrings ["."] ["/"] groupId)
|
||||
artifactId
|
||||
version
|
||||
"${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ let version_ = lib.splitString "-" crateVersion;
|
|||
completeDepsDir = lib.concatStringsSep " " completeDeps;
|
||||
completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
|
||||
envFeatures = lib.concatStringsSep " " (
|
||||
map (f: lib.replaceChars ["-"] ["_"] (lib.toUpper f)) crateFeatures
|
||||
map (f: lib.replaceStrings ["-"] ["_"] (lib.toUpper f)) crateFeatures
|
||||
);
|
||||
in ''
|
||||
${echo_colored colors}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "16.4.0";
|
||||
version = "16.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
|
|
|||
|
|
@ -1,95 +1,95 @@
|
|||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "07v98pr0anqbxn1yc55245k5ixxzfk2wmfq67zhz84aa18viqhbc";
|
||||
iosevka-aile = "03y0xijb7c0kampm3gjb69mv8hikhsgqhlw1w3zfcjhr2vc62g6q";
|
||||
iosevka-curly = "1i31zj0j8npgx7wn2qibih48s76qjxakz14sa2hgx908p8xyfwq5";
|
||||
iosevka-curly-slab = "1xijhk5vbgs3c89a7g9cfjqjqv801gimjja4wqpvaficab692jh2";
|
||||
iosevka-etoile = "1rqagk6gyja15fa4m107ylbjwbhn811gbl9lbr9yzashw4drjpp9";
|
||||
iosevka-slab = "063qk1d75l1jq7gdwzqxd7j8j56g7da0aagsqm0lvwl217l7x48b";
|
||||
iosevka-ss01 = "0rjbyfmm46ffslf0glvn5yrsxiaznj3bk53si5jhnipphqw11r9v";
|
||||
iosevka-ss02 = "0sgpaqzcp4zpk96xr2nz04sfg026ph4glkkzky7z1245z12lzdlc";
|
||||
iosevka-ss03 = "01wjv069mmyjw9mk9hkcj4d23f0lgwdy91j21lcja6gybawly5g6";
|
||||
iosevka-ss04 = "0j2qjly3z8vr8z62g2dlj1i6cpx5mlzfvng41x8hxq23j9gfr2y6";
|
||||
iosevka-ss05 = "1aimq0mm749mai3ykh6975ya8ng402ddkzb1hhxz3nnm8v6cwd27";
|
||||
iosevka-ss06 = "1yd882vj4l0qhz67nbba61nyplg9psyr3hnvknvkmr2wnj723dbm";
|
||||
iosevka-ss07 = "09x54z8lzg85akfdc95k6gyka77qgmz3fnhq2ji01apshf8hc751";
|
||||
iosevka-ss08 = "1lmsgcc5q68wm2hs0h35s374bql7rl8r5yp7z17vrjz2qwp3n7b4";
|
||||
iosevka-ss09 = "1p5f2885b18xgxbl63g5zphr2kz52swdpm98d0rcwr60bkqkf79l";
|
||||
iosevka-ss10 = "0kmc0fxyi1imndw88wsdfg6nhvijprrxc2d6nmgvnalnwrx95d33";
|
||||
iosevka-ss11 = "15k64sn23jh2plwwqsvplc04099xv9w16fmmzxzz9vd4js8j4245";
|
||||
iosevka-ss12 = "10y5ll8256h61ycgyjrysfaki9h93va271qgam0b5bjl0v9vhdlk";
|
||||
iosevka-ss13 = "1lv9w2yiqy09sggbzd17vx8nn8vh1qv7yn9rsnwcq95xqd4dpw60";
|
||||
iosevka-ss14 = "1pb53ahx5jig7a6yjb4kwpcgbpdbxans25p3amiswy7xyklhw3la";
|
||||
iosevka-ss15 = "1jax0zx17k8mzp7489fd1bprvh79ww4ghcy6vhih2nbg18kzxsqc";
|
||||
iosevka-ss16 = "0s3xq3ijrd8b51myh779hf5cvwvxvxz8xx9gxksnbzh1pml9zz1a";
|
||||
iosevka-ss17 = "1mnw0lh65yj936p3shsayq6k31s708cqb60qys82hcwas5bacidr";
|
||||
iosevka-ss18 = "1jyywvp9j6rj21v99psbwsr8xrfzfvq76z54hw0acb3j5mhl7s4r";
|
||||
sgr-iosevka = "1p2n8q6nj9f8nibb7zzy60ck0sp2cg6lz1z3inizs5i9lpnr8mx3";
|
||||
sgr-iosevka-aile = "1nxysymkc273cmk00b44bky63lm73dl3p9yai8lcn14lv1apdjg6";
|
||||
sgr-iosevka-curly = "0bwlalijphm1aykv8j652lp9p1xl4jj4gmc26ag8s13gmbx6gxhy";
|
||||
sgr-iosevka-curly-slab = "11d3biggpk6r0pa7k7ig8sgxmjw80b723ass3pqxns13y3krm8il";
|
||||
sgr-iosevka-etoile = "0lspbn81bajdc905wafqmfp8cjlw6q6xlvry1alq7y7ng19vm5dh";
|
||||
sgr-iosevka-fixed = "1zzqi09pafma9fj9603ixhygwa2aayzk27xda2yzhixiw11wxz33";
|
||||
sgr-iosevka-fixed-curly = "1j07rqa1495dr0s2ppcypycclmzgpbpl0yibkd7f1mlzl629gk38";
|
||||
sgr-iosevka-fixed-curly-slab = "1wlq2qdl3nx8q6a39dc3sv6h2gr8v3bhswgvgavbr7m2q6jcss8g";
|
||||
sgr-iosevka-fixed-slab = "1m20f9zc4q2rv16yl5pfvx4l2031783ixv4k6vhnzwqkvqqrk9dg";
|
||||
sgr-iosevka-fixed-ss01 = "1c7ldr1h2bgl6w8ggwbsifad7n3mincwplfiam4w4n56xkn19qdx";
|
||||
sgr-iosevka-fixed-ss02 = "1hck8rcja59c0jgl62dk9i5xrixxihd3mzcma6yqqsxadgvf6cc5";
|
||||
sgr-iosevka-fixed-ss03 = "1qck9qdanfwl1jgbjmyzvv52dgxa46gw9h6ygn3pp34pgbgj6lnd";
|
||||
sgr-iosevka-fixed-ss04 = "1d3gv5zcs66qjazxwig2kw6nlwqzvn3pmnpbwif65xd5hlqs1m3c";
|
||||
sgr-iosevka-fixed-ss05 = "1l335c8fnh3ijhx7bl2wpa8k1vnjskhrlhcg7k04z9jhjcyagr9f";
|
||||
sgr-iosevka-fixed-ss06 = "06zm8yr6n17b6vmic9ngv3iv7jvnps0bazvdi8y38r371gwp4af9";
|
||||
sgr-iosevka-fixed-ss07 = "0ambs05hjxvx6v905wzqk8wjl8a8yrd216fm8sy23wr8vkm7zrca";
|
||||
sgr-iosevka-fixed-ss08 = "10zgxj5p50hzbczh33mq1qw708srwcwp615ajfmmx0b86qgxmfqw";
|
||||
sgr-iosevka-fixed-ss09 = "1k0hd06lislhzvgd5vz7sra9pbwnl7nv0cxzmxglmlskafcls7zb";
|
||||
sgr-iosevka-fixed-ss10 = "0bgkfk31fd60w7x1nzy6x3p7gi2d72z7cf8f5av54rnamw4a4hnq";
|
||||
sgr-iosevka-fixed-ss11 = "0vsv9plkcmynrj6s75kbb57kkfpxay4k90nlimgb3s1z7d17az0a";
|
||||
sgr-iosevka-fixed-ss12 = "040bpjhgjii0s19ilfrvg1261ssk4n9xyynw61cbn65rh2dpfdcl";
|
||||
sgr-iosevka-fixed-ss13 = "0bmmfpynl5j74i71b0cyi9vyrrb6d5axz3frsg48q8pwqac2vkx7";
|
||||
sgr-iosevka-fixed-ss14 = "1bqfbv4rcvcpbrzsg2zpk870yq2a6j7ishsgc6p9xsqfblnw1p6a";
|
||||
sgr-iosevka-fixed-ss15 = "1rhks1drqs0yx2sbcdqyq9lvxrh11adqisw7pxncgm6flcgkhx29";
|
||||
sgr-iosevka-fixed-ss16 = "14kkdvmj2gpyxs5dcbfyghidbqaz147r114xi42yhl4fpsdppkrk";
|
||||
sgr-iosevka-fixed-ss17 = "0csd2ag4h8cdngscbmhj5kh1rlj022pmg8ig758hxp25ddmb2h8l";
|
||||
sgr-iosevka-fixed-ss18 = "0hpkzzx35a1nmspb2k7gg5z9kp00i4hd4k1nni4jg661mgvilldp";
|
||||
sgr-iosevka-slab = "1y8csc7kgm2xipa6s2jy0ibgb4j9pj6wxpjlxyad3ssbsqf5yfvc";
|
||||
sgr-iosevka-ss01 = "0hq5s1ajqfmq6y3l189h2xjkawayq10sjwpcmzkbf4565qifinm6";
|
||||
sgr-iosevka-ss02 = "0921izv9x38zziw8vfha4aqvvdb5g926gycg6rl2rxfymjsg2f1m";
|
||||
sgr-iosevka-ss03 = "0c9sfswgf4rgmwbsm4wwyfaqk7brp0dmw76krzylbppcyzsczjbr";
|
||||
sgr-iosevka-ss04 = "0ic7g811156cwkrsizjd5f051k964lpr216nrd15ap06viar4vk4";
|
||||
sgr-iosevka-ss05 = "0hxpi57xzxw03qr9ss2mrpl4p479v14c15y9iqjflb478qdicxg0";
|
||||
sgr-iosevka-ss06 = "04ny0vyr0sayfymaxgsqfnvqsx1afsh9fjdpcfna5vpl661ljnsf";
|
||||
sgr-iosevka-ss07 = "10s8vhcikk6xrvyjmzjq7k4b81cf9i71c6dhsrnwxvn732dx5awl";
|
||||
sgr-iosevka-ss08 = "0ji3gsf26xji6qfx99azhxj816q7bhpzqdxh43ncs86snl86g9xf";
|
||||
sgr-iosevka-ss09 = "0c1n399v3vf68q165mn26qc0cnbi5yfvvkxwxp1inl7vdsgzhslw";
|
||||
sgr-iosevka-ss10 = "07g2zbpgd8zbb2zyqk9kfb9s1hd94wmx1ijaf9fh6c6sby2wgssk";
|
||||
sgr-iosevka-ss11 = "0kfiln8w5gim2swyk80k2bnvnyr853imgp91z2v330hdllca99ra";
|
||||
sgr-iosevka-ss12 = "01kljfahn4ljss2rd66srp2lwj94fvkigpzk315zd21qxyy4wfl2";
|
||||
sgr-iosevka-ss13 = "0bgxfrpfn4yh6852155qj0j7zfsrf14rg4gc3ffidmszhindllcc";
|
||||
sgr-iosevka-ss14 = "04qldb75h61wca2pzkmks3amcq6q3n0dhjva0b5v1dg0y6qzs2c9";
|
||||
sgr-iosevka-ss15 = "1344wgx2nx1a7aphi06xkl6niij5cqlnnydbb6la0k75invyz2i6";
|
||||
sgr-iosevka-ss16 = "1apkrdmhz69vdbjhr88288qyqz4pfya11fj4gpxkb3hk01dbkwzs";
|
||||
sgr-iosevka-ss17 = "0mba09669408icz6p944pivfb0m99pirapmml1d1glni0xj4mndd";
|
||||
sgr-iosevka-ss18 = "0j463s8is0w0rvgqn63mxhf3wcx0r5a7q4zs6621f3xigqvbhkdm";
|
||||
sgr-iosevka-term = "034p2llrz2ffm5aslxg1ah8l0bj6kr9lx53yi1hg61cnx18z3yx0";
|
||||
sgr-iosevka-term-curly = "0zixih0y7ksav7qxswysijfdnnj1jjb74znz0bkb0f7cviaa6w2i";
|
||||
sgr-iosevka-term-curly-slab = "1vsz17s0yp3v01054342plc62pag3mx7xs5jb8llx729zc5qzpd7";
|
||||
sgr-iosevka-term-slab = "04bsgvzyjy2d0jndzxb2d0pv6sfr9gm3ryv94va65rxv3fc0mj73";
|
||||
sgr-iosevka-term-ss01 = "12hfzalx076gh9kskfxvgr9b3w8i3kk2lhbcsj417vsn5nx48grq";
|
||||
sgr-iosevka-term-ss02 = "15chkrw65nyfl9vd23y12cqvsn4sddrnf3zmxy0jval5paz8hnx3";
|
||||
sgr-iosevka-term-ss03 = "0ivxs8pdpbx1lcmfm1r6qkvzsx82swwi7xn4ja92rh8zix9i78bv";
|
||||
sgr-iosevka-term-ss04 = "08zfbmq6cvc7jzkindyvx7mlfvyhhicdxqm4pyblgb9xfh6vvk0k";
|
||||
sgr-iosevka-term-ss05 = "0c8mbjbkw6a5hpxshr20qsrwp0chwnxxijm3sqaf28hg2ka79qhg";
|
||||
sgr-iosevka-term-ss06 = "1ymdi01cl9v86qlcl0ka9v1p9ry129wqjmsjy1i60ld579yy8x05";
|
||||
sgr-iosevka-term-ss07 = "09qqjmn7iaykl08pdd4qj57z12npap246y8c0kp3rvwjdyh3p7y1";
|
||||
sgr-iosevka-term-ss08 = "10qca50vbwb5fa509jrb3w63dxk6ny7i7ffdmyiz1slv418jjjha";
|
||||
sgr-iosevka-term-ss09 = "0chhlxql7j1b0nfa6pnw3dfrjv6wij8wsl0i2xf5ar52rgzr2s95";
|
||||
sgr-iosevka-term-ss10 = "1z6za3sdaf793vma9d70a38rlb47nzqj08pnp6jqir2fifdsvzl1";
|
||||
sgr-iosevka-term-ss11 = "1midlf29xqli721gv195gy6mjmp9w8nq8kc1ly2d62spq3lhqmqw";
|
||||
sgr-iosevka-term-ss12 = "0bagnqg4r0a76p32d3yg8j6raxwzc7wbhx5kv7habpbinhq96ink";
|
||||
sgr-iosevka-term-ss13 = "0wj3gx4h4r99whfsnqja8j3a737b8firn5sga6320qm33szzgh69";
|
||||
sgr-iosevka-term-ss14 = "0zsmy58w23355laqjs9xh76i4bz80yha65yaj44ssrsz1h0f9bpn";
|
||||
sgr-iosevka-term-ss15 = "1yp9kywi00lykwj2wwvwvw4qblaw1549lj0ahrhrhljnijjc1zmb";
|
||||
sgr-iosevka-term-ss16 = "12c8i4gwshxj3mnzz7ycprwlmc5nhfc9dvg1wwcvc59xvdphpgzc";
|
||||
sgr-iosevka-term-ss17 = "0fiji4hbb9cbssx3whvjhsvm7zi1chrnrp46q01627z4nzw2s5a7";
|
||||
sgr-iosevka-term-ss18 = "0hmdpzffywgdls5qy38sq04jfsx9ym56lypb6fiwjvppgn8vkcgl";
|
||||
iosevka = "0wyi99j9zangbfj8rdfwgmgnl7f2s4d07pc8pvkjnzw8n4nz4rkn";
|
||||
iosevka-aile = "1szwyzri6j9rfgw3jrppg1gnj48bl77pvgm944jiwxhdl1dhzlqh";
|
||||
iosevka-curly = "0mzdq2shi51c6hhca8waxbj8i0pb3jw7b4rn0h4941kq8y9qddzs";
|
||||
iosevka-curly-slab = "106f97mh5ph2ykk2mk4am9vbavr41vznl8f2w02jaj81wk5xv6gd";
|
||||
iosevka-etoile = "1axnc8hvwvn0y2pzfid63s3lzzwh3ig89hj7k80cdcrsnbv5wvpi";
|
||||
iosevka-slab = "0mgrngn2g5i1s5285ds6x53gwl3ragdr3pkmp3kwk7m88jivx4n8";
|
||||
iosevka-ss01 = "0r0zn3dickzpkcqfdy6lw245301v8hqiy073bk7q7dykg7514wic";
|
||||
iosevka-ss02 = "05ifncnsy9bfb66qxpx57hkadq4vwa8bb5qki69skwfsfrfc217y";
|
||||
iosevka-ss03 = "1hh1x10v3igagaa70xmw7hhfa6jm99pn46w4wlgv0ydfz441hfcd";
|
||||
iosevka-ss04 = "13cwjc472gqvkz72lxx82xp9ka71ycdid7zldl5r38sakjqymxcv";
|
||||
iosevka-ss05 = "0y4zgda1n4shcqrw950w55jmlh71mi7fc9g6fjjb1ik5v227k8h3";
|
||||
iosevka-ss06 = "15xcg3dqjqb9hzzaf7pvq7lnn0qrvk828xy9ngq9xznhdzzlh0s3";
|
||||
iosevka-ss07 = "1w2lyqcvcn6k70a00xdi650rsw91lb8rgrbdpb92m4p3lr7b4vzg";
|
||||
iosevka-ss08 = "08b38c8vrvys8cxq3gqscr33ijm0wn6xnw6wjr21r8f6y2i1rhfp";
|
||||
iosevka-ss09 = "1mgp38665llp1rqlmzr62z5vxxlwl5g75mdd9qf8zah17babi88p";
|
||||
iosevka-ss10 = "06f8mkxfrxl7kkph9ljzsgsxf5qlnw0ggkb2bv518ajpycc9g77c";
|
||||
iosevka-ss11 = "17nxf0215s8vgyicbj6rhqia4hw5gsrljdk1jc5hd1yd50c8351q";
|
||||
iosevka-ss12 = "152f4bljjm3w49x4wfr1fr557pi4qpvgyk6icccrbig4r3idkqhg";
|
||||
iosevka-ss13 = "04kh77ry46gdgmp87p3nwbqmrkbwjjvfk2mrb43lw19vwmbax3aw";
|
||||
iosevka-ss14 = "1fln5kz531yp8gk447cw71xm9ddvw70dwyamjd9sl39vay32b534";
|
||||
iosevka-ss15 = "0iwy88pfxan94zhvjnqxsh9i39r1nzi0hc0q4xi1mqyaygml3y6c";
|
||||
iosevka-ss16 = "1xxir89gqbcqms158c1znlnbky39safjcgzyd1qvr5w78w7dz5gc";
|
||||
iosevka-ss17 = "0dac2m9vxif6s02ryzx9kw9j87dgm53cjjzh4h6bqm3wqjmy3hgy";
|
||||
iosevka-ss18 = "0igj1k7jm1xk649hpn2h3c1n9j8dcb7l5kvr6wb97r8w2s5kiz20";
|
||||
sgr-iosevka = "1f6c3sd022ss0m8myb03fpr03d4mmw6yapgamkp8xbskxny11sik";
|
||||
sgr-iosevka-aile = "02h8bd89pxdalfd7ysybzr6lrga5vilwsdsmbl9f6c74pdxp9wsq";
|
||||
sgr-iosevka-curly = "015wqd61iww7q15hfp4ifk7yb8p2070v0vi1v7jb0zqgim7lky4g";
|
||||
sgr-iosevka-curly-slab = "132ixkvfny95nsmil4b68zyag2gg9dxsn7yzfdmzr6ld392a2gxn";
|
||||
sgr-iosevka-etoile = "0vgkf40q81bgcm2q8nb4z40lzvib50k5mmsardgwaigwlhsjpnr1";
|
||||
sgr-iosevka-fixed = "0y7jrly440k8dq5av6yx257wyvaprh4nr6a0axqd9v9h0kw27s00";
|
||||
sgr-iosevka-fixed-curly = "1xvjsnay8bqji6mw13llfmnyzrahqwyymwbalc9gdgxd85abdndm";
|
||||
sgr-iosevka-fixed-curly-slab = "0q2s371z6cgnh07g1svl2jn10655kn2wyill1w274sb8qvx972m7";
|
||||
sgr-iosevka-fixed-slab = "0q41blbalb9r40c56gci184nbp2nyvglbqyyr2rmv87c2qqvnzrj";
|
||||
sgr-iosevka-fixed-ss01 = "05lvvnfa35p2xa1j2ygbwzwmn5jj8djafm2ykjv17992ljs6zlns";
|
||||
sgr-iosevka-fixed-ss02 = "1c13rybqmzikjvq7m4nkjkl147m6w7i389r5a9vl3c8v281g89q8";
|
||||
sgr-iosevka-fixed-ss03 = "0wykv3wa18i53659avb4n0wirrbcrj24wslwx1g151an9vrfbixq";
|
||||
sgr-iosevka-fixed-ss04 = "11k74l40323q0bcz3zf4a7gnpgnf4j2rjrgqqla6nfmjkacbfngy";
|
||||
sgr-iosevka-fixed-ss05 = "0p78q0ik8m815shbac2pyw5yas25rbzw7r9abb94md1fh175csx5";
|
||||
sgr-iosevka-fixed-ss06 = "1rg0nagpf3nrgmnlmy3lvrr665492ygkdqaxi1js5hqnmy9xhsml";
|
||||
sgr-iosevka-fixed-ss07 = "0j2iiv6jzd9v4ggdj88hpyqhmf04rsq8jc6llg50mx6nr89y7fbf";
|
||||
sgr-iosevka-fixed-ss08 = "10zlla2qkr6xpvdchawlixfn3yxnakhi0lg3naskk0zj00vifxay";
|
||||
sgr-iosevka-fixed-ss09 = "1l0h7m292hi6613j9spfxpy25n74718s0b96sn8ycw3qbpjlybkm";
|
||||
sgr-iosevka-fixed-ss10 = "064hjwhi78a7lb3gn8s1ga6kw2sk5j1y38cqrmxizja76msw3cxm";
|
||||
sgr-iosevka-fixed-ss11 = "1adnn6fpkx20zfmip62csxrasfn0fs7gxv00q8wkd69chgzz7k6l";
|
||||
sgr-iosevka-fixed-ss12 = "1yqv5b8az0dxilvrabm82lkrnvn1x8z43jg1pfh6ykd49kgim5ma";
|
||||
sgr-iosevka-fixed-ss13 = "0vkxzb3b3r61z0k6rix6j9paw5kxgd5k3a76k3ri0mw6fnh3kzks";
|
||||
sgr-iosevka-fixed-ss14 = "111ck61z1bbcrgrryw3dc1ariicfs7brga8zzrs9angg8xwcdky9";
|
||||
sgr-iosevka-fixed-ss15 = "0hb4lh87f0dw7acra9w6j7r17lc9xpfjh8hkp5096fbjfffyn786";
|
||||
sgr-iosevka-fixed-ss16 = "1rq4s7rqj0nnkq1b94ahhlqma9x50kagndrfc8wxqz26x1na88a6";
|
||||
sgr-iosevka-fixed-ss17 = "1jz54ilc36q6z6s8xqffbrb9g2w6yhikwyr8hjvghb0imvwa99vi";
|
||||
sgr-iosevka-fixed-ss18 = "1nsbxq4m2h1vbwcl0zfwmfrd48brlrmi5cb1099ybqqp9lkrpddf";
|
||||
sgr-iosevka-slab = "15k6r7847al2wh9df0fzq04brn8scix5d0wwnbbnyy2p8hg8r0jk";
|
||||
sgr-iosevka-ss01 = "0yaw30j2wj0i876xkpvh3k76hyyjjbqqm3vfwqn0nahn83sk7lq9";
|
||||
sgr-iosevka-ss02 = "048bgm59gnk5qpxfpflj4q8iryjlcnybyaqcmdkwhklqyracqada";
|
||||
sgr-iosevka-ss03 = "151ai1pkiszrd1zrdviqd7701hqmp48gqkfn86xz4bw7p84qniyv";
|
||||
sgr-iosevka-ss04 = "03ih3c0n0ab3wkp9w6ngzn4x6fmn4z19p506r0fvkg0n8rcmx35v";
|
||||
sgr-iosevka-ss05 = "0zh9zb2vl5z2xc4j0ascv2ps6789ll9qgjmvd6hhb23rf540d371";
|
||||
sgr-iosevka-ss06 = "15wd5sni08ckpbqr8cnkiv9pwhnqp9jh70nl3wv93bwvyqzycx6p";
|
||||
sgr-iosevka-ss07 = "12lgjhqaqj8qag59xz49l0d2wb39aymigfknhxj72yjgqrv6nmli";
|
||||
sgr-iosevka-ss08 = "1f8g0rsdjpykq1061hxbk46wl6x7rr6n4n5mx0kxl0q0rry8zk29";
|
||||
sgr-iosevka-ss09 = "0zjn4wyldmynldinhiqadpw3mldi46vsnw3wgsq8w0j90hcz1rg8";
|
||||
sgr-iosevka-ss10 = "0bxyvm2xs1iqdpwv6vhz0zc6k6h1jd2xr9alc6jhavyzwzgwsrnq";
|
||||
sgr-iosevka-ss11 = "1fl2insp3i1q697pim7jbk569cx2dpv0ivs8q1sgk7kl86mq5k8m";
|
||||
sgr-iosevka-ss12 = "1h003xf0g5w6jmcl8882lmsi3ri0dqnayiq37rwlygbi3zhchgpi";
|
||||
sgr-iosevka-ss13 = "1r30r7inci5clyp7wxl5a8jcvanlipwwbx5nc7vwq8n7q48n3i0j";
|
||||
sgr-iosevka-ss14 = "0h2fqnlrg3f5hba7v2v2xnfp7z0cdipkgj9g1iyzr71r1fpm4wwi";
|
||||
sgr-iosevka-ss15 = "03kdf4lvg9x6g9130l4by4q5bh0fra3mpvyap29rs1gm47w0n84k";
|
||||
sgr-iosevka-ss16 = "0cmkw1654figbsj9biqcjh6x86dffhn10b05y0s4qlj1ackzpciz";
|
||||
sgr-iosevka-ss17 = "0iyi20lzswcshikqvxlmbf8wkyfs8xz8bjw6lxix81818skgavhx";
|
||||
sgr-iosevka-ss18 = "0m82akjnb1xkqissh86s3vhm1fbsy9wlkqabcfhk1jyhj3w2q3i8";
|
||||
sgr-iosevka-term = "0r1v50n1fjy40df16kjcv92ihnka9sb1h1lkwigvy12pp8df0fbw";
|
||||
sgr-iosevka-term-curly = "1hk42bsf157131smbxali2g681jwh4fynjhnswsd05k04p20lndp";
|
||||
sgr-iosevka-term-curly-slab = "092fx48mf26zpaj2qvbbhr2qi3bpqhyhynznffdjadzdqnsqyxyy";
|
||||
sgr-iosevka-term-slab = "0kndz8q7him9wkfiaxkjfjkqsmsqg5y6n9bmzh0gvz304019s1gz";
|
||||
sgr-iosevka-term-ss01 = "0awxqg4r5pq7kcvqjabsgzjagmf66ads8bp0w1bw27w6f5vc21hf";
|
||||
sgr-iosevka-term-ss02 = "1zfvjw32z8kf25j9gvdq7aa4p94s4r8vvh7kncnxcm2prrc40fvc";
|
||||
sgr-iosevka-term-ss03 = "122qm2s6w6clw4fgy59cj8p54mlyavyfr81g06zjgy46i8skrpsw";
|
||||
sgr-iosevka-term-ss04 = "14y4rarp17qm0qy59rshhd581pdn1niqx6h2y74yyc6kms6q94rn";
|
||||
sgr-iosevka-term-ss05 = "18cv0bl7ngb4gp5phzh77r8q0y863ym598px2n5jf00maaigfahc";
|
||||
sgr-iosevka-term-ss06 = "14rp2kd2b609ijhg8gmnc5sgjniwgbfkcnp5xa5m9bbshbjmikqn";
|
||||
sgr-iosevka-term-ss07 = "09sppprv46d62cyp0aw77p3wr6s514qzc5p3lb1qxiakic5gn2js";
|
||||
sgr-iosevka-term-ss08 = "02slv5va9yn09pcscmx6snjp2swjznrrhnwjf9fwi74siypza1xx";
|
||||
sgr-iosevka-term-ss09 = "0hdhsd1rkiqgz91x9kkn2rd37ya6q91qkyv3w5ry8flfffba421z";
|
||||
sgr-iosevka-term-ss10 = "13b29x2znqm8l3ydakc0sq5skr1mk4xjfikvayp5vc1a4krjyzwn";
|
||||
sgr-iosevka-term-ss11 = "15qq6lvf7mdnch20shsigrr7xk7qbgr2wz7qbqwyaidd1vlk57px";
|
||||
sgr-iosevka-term-ss12 = "09nyj7dcc7ldi7kn8scxjaszp8gxzdxq860zig1bpsjrssm20870";
|
||||
sgr-iosevka-term-ss13 = "0v28swz2dbg8kc2wx5h4llkki5i1rpdk5f6ip08xjzlb35bphwwk";
|
||||
sgr-iosevka-term-ss14 = "1q94pvfs2yqz8sjvpchs44w83rnf08v6njz27pz4da5g1v7qg4s2";
|
||||
sgr-iosevka-term-ss15 = "077cl1259xgfb26p67wih69vq2vw20ardq479jajc5r7cn2cbxia";
|
||||
sgr-iosevka-term-ss16 = "0fy1810yxi2faacdc1fsy0nlzh781fijs6l8kfsh2xb22sk2ydf2";
|
||||
sgr-iosevka-term-ss17 = "1m8jv2rvxsj0aj1lwz38radvq2fivx1qgivsaly2sf992lga5w3v";
|
||||
sgr-iosevka-term-ss18 = "0rm8ki7g0brwcxmidapyn5r2jd55n9hlx2prhzskgyph4ikmnmrh";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,13 +54,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-common";
|
||||
version = "5.6.4";
|
||||
version = "5.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon";
|
||||
rev = version;
|
||||
hash = "sha256-IPu3J05y4xEFn82cI0y9eN+4kJRChKS/zEGZOWaJnZw=";
|
||||
hash = "sha256-UAPzB4Ps/w0VQjbbVl4KMRghwMc4roJR2/ZWkmwOSos=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xreader";
|
||||
version = "3.6.0";
|
||||
version = "3.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CXhktA0BvJ0mczhH6kTOMzLeDG9rThy3g3VOcOWlBDw=";
|
||||
sha256 = "sha256-cQ8ofBTOzHD1te2lXuCgJImgK3M1/lXmnh4yL4LfYx4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
ver: deps:
|
||||
let cmds = lib.mapAttrsToList (name: info: let
|
||||
pkg = stdenv.mkDerivation {
|
||||
name = lib.replaceChars ["/"] ["-"] name + "-${info.version}";
|
||||
name = lib.replaceStrings ["/"] ["-"] name + "-${info.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${name}/archive/${info.version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
ptmap
|
||||
camlp5
|
||||
sha
|
||||
dune_2
|
||||
dune_3
|
||||
luv
|
||||
extlib
|
||||
] else if lib.versionAtLeast version "4.0"
|
||||
|
|
@ -23,7 +23,7 @@ let
|
|||
ptmap
|
||||
camlp5
|
||||
sha
|
||||
dune_2
|
||||
dune_3
|
||||
luv
|
||||
extlib-1-7-7
|
||||
] else with ocaml-ng.ocamlPackages_4_05; [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "shirok";
|
||||
repo = pname;
|
||||
rev = "release${lib.replaceChars [ "." ] [ "_" ] version}";
|
||||
rev = "release${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "0ki1w7sa10ivmg51sqjskby0gsznb0d3738nz80x589033km5hmb";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmer";
|
||||
version = "3.0.2";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wasmerio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VCPA0/hcbagprr7Ztizkka7W5pkDPgAnqHaxQaY4H4o=";
|
||||
sha256 = "sha256-t/ObsvUSNGFvHkVH2nl8vLFI+5GUQx6niCgeH4ykk/0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-BzDud7IQiW/LosLDliORmYS+dNG+L6PY0rGEtAmiKhU=";
|
||||
cargoSha256 = "sha256-75/0D0lrV50wH51Ll7M1Lvqj2kRSaJXiQWElxCaF9mE=";
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
|
||||
baseAttrs = {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceChars [ "." ] [ "-" ] version}/icu4c-${lib.replaceChars [ "." ] [ "_" ] version}-src.tgz";
|
||||
url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "hsqldb";
|
||||
version = "2.7.1";
|
||||
underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);
|
||||
underscoreMajMin = lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version);
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "muparser";
|
||||
version = "2.2.3";
|
||||
url-version = lib.replaceChars ["."] ["_"] version;
|
||||
url-version = lib.replaceStrings ["."] ["_"] version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "trusteddomainproject";
|
||||
repo = "OpenDKIM";
|
||||
rev = "rel-opendkim-${lib.replaceChars ["."] ["-"] version}";
|
||||
rev = "rel-opendkim-${lib.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "0nx3in8sa6xna4vfacj8g60hfzk61jpj2ldag80xzxip9c3rd2pw";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "PixarAnimationStudios";
|
||||
repo = "OpenSubdiv";
|
||||
rev = "v${lib.replaceChars ["."] ["_"] version}";
|
||||
rev = "v${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "sha256-ejxQ5mGIIrEa/rAfkTrRbIRerrAvEPoWn7e0lIqS1JQ=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ let
|
|||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "pipewire";
|
||||
version = "0.3.61";
|
||||
version = "0.3.63";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -86,7 +86,7 @@ let
|
|||
owner = "pipewire";
|
||||
repo = "pipewire";
|
||||
rev = version;
|
||||
sha256 = "H1212aCsMENSmxhJiKF/RnpWK1bEz4HX2a1PJW6CC2U=";
|
||||
sha256 = "sha256-GQJpw5G9YN7T2upu2FLUxE8UvMRev3K2j4Z1uK1/dt4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ let
|
|||
(mkFlag vtuneSupport "ENABLE_VTUNE")
|
||||
(mkFlag werrorSupport "WARNINGS_AS_ERRORS")
|
||||
# Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag
|
||||
(mkFlag (!(isCross && stdenv.hostPlatform.isRiscV)) "ENABLE_ASSEMBLY")
|
||||
(mkFlag (with stdenv; !(isCross && hostPlatform.isRiscV || isDarwin && isAarch64)) "ENABLE_ASSEMBLY")
|
||||
];
|
||||
|
||||
cmakeStaticLibFlags = [
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r ../include $out
|
||||
cp -r ../dmlc-core/include/dmlc $out/include
|
||||
cp -r ../rabit/include/rabit $out/include
|
||||
install -Dm755 ../lib/${libname} $out/lib/${libname}
|
||||
install -Dm755 ../xgboost $out/bin/xgboost
|
||||
runHook postInstall
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ let
|
|||
extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs);
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot
|
||||
name = lib.replaceStrings [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot
|
||||
ANDROID_HOME = "${androidsdk}/libexec/android-sdk";
|
||||
buildInputs = [ jdk ant ];
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}:
|
||||
{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux}:
|
||||
|
||||
deployAndroidPackage {
|
||||
inherit package os;
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ lib.optionals (os == "linux") [ autoPatchelfHook ];
|
||||
buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ];
|
||||
buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgsi686Linux.glibc pkgsi686Linux.zlib pkgsi686Linux.ncurses5 pkgs.libcxx ];
|
||||
patchInstructions = ''
|
||||
${lib.optionalString (os == "linux") ''
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686
|
||||
{ callPackage, stdenv, lib, fetchurl, ruby, writeText
|
||||
, licenseAccepted ? false
|
||||
}:
|
||||
|
||||
|
|
@ -25,9 +25,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (pkgs) stdenv lib fetchurl;
|
||||
inherit (pkgs.buildPackages) makeWrapper unzip;
|
||||
|
||||
# Determine the Android os identifier from Nix's system identifier
|
||||
os = if stdenv.system == "x86_64-linux" then "linux"
|
||||
else if stdenv.system == "x86_64-darwin" then "macosx"
|
||||
|
|
@ -35,7 +32,7 @@ let
|
|||
|
||||
# Uses mkrepo.rb to create a repo spec.
|
||||
mkRepoJson = { packages ? [], images ? [], addons ? [] }: let
|
||||
mkRepoRuby = (pkgs.ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ]));
|
||||
mkRepoRuby = (ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ]));
|
||||
mkRepoRubyArguments = lib.lists.flatten [
|
||||
(builtins.map (package: ["--packages" "${package}"]) packages)
|
||||
(builtins.map (image: ["--images" "${image}"]) images)
|
||||
|
|
@ -115,25 +112,24 @@ let
|
|||
] ++ extraLicenses);
|
||||
in
|
||||
rec {
|
||||
deployAndroidPackage = import ./deploy-androidpackage.nix {
|
||||
inherit stdenv unzip;
|
||||
deployAndroidPackage = callPackage ./deploy-androidpackage.nix {
|
||||
};
|
||||
|
||||
platform-tools = import ./platform-tools.nix {
|
||||
inherit deployAndroidPackage autoPatchelfHook pkgs lib;
|
||||
platform-tools = callPackage ./platform-tools.nix {
|
||||
inherit deployAndroidPackage;
|
||||
os = if stdenv.system == "aarch64-darwin" then "macosx" else os; # "macosx" is a universal binary here
|
||||
package = packages.platform-tools.${platformToolsVersion};
|
||||
};
|
||||
|
||||
build-tools = map (version:
|
||||
import ./build-tools.nix {
|
||||
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib;
|
||||
callPackage ./build-tools.nix {
|
||||
inherit deployAndroidPackage;
|
||||
package = packages.build-tools.${version};
|
||||
}
|
||||
) buildToolsVersions;
|
||||
|
||||
emulator = import ./emulator.nix {
|
||||
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib;
|
||||
emulator = callPackage ./emulator.nix {
|
||||
inherit deployAndroidPackage os;
|
||||
package = packages.emulator.${emulatorVersion};
|
||||
};
|
||||
|
||||
|
|
@ -171,16 +167,16 @@ rec {
|
|||
) platformVersions);
|
||||
|
||||
cmake = map (version:
|
||||
import ./cmake.nix {
|
||||
inherit deployAndroidPackage os autoPatchelfHook pkgs lib stdenv;
|
||||
callPackage ./cmake.nix {
|
||||
inherit deployAndroidPackage os;
|
||||
package = packages.cmake.${version};
|
||||
}
|
||||
) cmakeVersions;
|
||||
|
||||
# Creates a NDK bundle.
|
||||
makeNdkBundle = ndkVersion:
|
||||
import ./ndk-bundle {
|
||||
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv;
|
||||
callPackage ./ndk-bundle {
|
||||
inherit deployAndroidPackage os platform-tools;
|
||||
package = packages.ndk-bundle.${ndkVersion} or packages.ndk.${ndkVersion};
|
||||
};
|
||||
|
||||
|
|
@ -253,8 +249,8 @@ rec {
|
|||
${lib.concatMapStringsSep "\n" (str: " - ${str}") licenseNames}
|
||||
|
||||
by setting nixpkgs config option 'android_sdk.accept_license = true;'.
|
||||
'' else import ./tools.nix {
|
||||
inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686 lib;
|
||||
'' else callPackage ./tools.nix {
|
||||
inherit deployAndroidPackage packages toolsVersion;
|
||||
|
||||
postInstall = ''
|
||||
# Symlink all requested plugins
|
||||
|
|
@ -323,7 +319,7 @@ rec {
|
|||
${lib.concatMapStrings (licenseName:
|
||||
let
|
||||
licenseHashes = builtins.concatStringsSep "\n" (mkLicenseHashes licenseName);
|
||||
licenseHashFile = pkgs.writeText "androidenv-${licenseName}" licenseHashes;
|
||||
licenseHashFile = writeText "androidenv-${licenseName}" licenseHashes;
|
||||
in
|
||||
''
|
||||
ln -s ${licenseHashFile} licenses/${licenseName}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,17 @@
|
|||
{ config, pkgs ? import <nixpkgs> {}, pkgsHostHost ? pkgs.pkgsHostHost
|
||||
, pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; }
|
||||
{ config, pkgs ? import <nixpkgs> {}
|
||||
, licenseAccepted ? config.android_sdk.accept_license or false
|
||||
}:
|
||||
|
||||
rec {
|
||||
composeAndroidPackages = import ./compose-android-packages.nix {
|
||||
inherit (pkgs) requireFile autoPatchelfHook;
|
||||
inherit pkgs pkgsHostHost pkgs_i686 licenseAccepted;
|
||||
composeAndroidPackages = pkgs.callPackage ./compose-android-packages.nix {
|
||||
inherit licenseAccepted;
|
||||
};
|
||||
|
||||
buildApp = import ./build-app.nix {
|
||||
inherit (pkgs) stdenv lib jdk ant gnumake gawk;
|
||||
buildApp = pkgs.callPackage ./build-app.nix {
|
||||
inherit composeAndroidPackages;
|
||||
};
|
||||
|
||||
emulateApp = import ./emulate-app.nix {
|
||||
inherit (pkgs) stdenv lib runtimeShell;
|
||||
emulateApp = pkgs.callPackage ./emulate-app.nix {
|
||||
inherit composeAndroidPackages;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686 }:
|
||||
{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux }:
|
||||
|
||||
deployAndroidPackage {
|
||||
inherit package os;
|
||||
|
|
@ -13,7 +13,7 @@ deployAndroidPackage {
|
|||
zlib
|
||||
ncurses5
|
||||
stdenv.cc.cc
|
||||
pkgs_i686.glibc
|
||||
pkgsi686Linux.glibc
|
||||
expat
|
||||
freetype
|
||||
nss
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
|
||||
}),
|
||||
pkgs ? import nixpkgsSource {},
|
||||
pkgs_i686 ? import nixpkgsSource { system = "i686-linux"; },*/
|
||||
pkgsi686Linux ? import nixpkgsSource { system = "i686-linux"; },*/
|
||||
|
||||
# If you want to use the in-tree version of nixpkgs:
|
||||
pkgs ? import ../../../../.. {},
|
||||
pkgs_i686 ? import ../../../../.. { system = "i686-linux"; },
|
||||
pkgsi686Linux ? import ../../../../.. { system = "i686-linux"; },
|
||||
|
||||
config ? pkgs.config
|
||||
}:
|
||||
|
|
@ -46,13 +46,13 @@ let
|
|||
};
|
||||
|
||||
androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {
|
||||
inherit config pkgs pkgs_i686;
|
||||
inherit config pkgs pkgsi686Linux;
|
||||
licenseAccepted = true;
|
||||
};*/
|
||||
|
||||
# Otherwise, just use the in-tree androidenv:
|
||||
androidEnv = pkgs.callPackage ./.. {
|
||||
inherit config pkgs pkgs_i686;
|
||||
inherit config pkgs pkgsi686Linux;
|
||||
licenseAccepted = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
deployAndroidPackage {
|
||||
inherit package os;
|
||||
buildInputs = lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
|
||||
nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ];
|
||||
buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
|
||||
patchInstructions = lib.optionalString (os == "linux") ''
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib64
|
||||
autoPatchelf --no-recurse $packageBaseDir/lib64
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{deployAndroidPackage, requireFile, lib, packages, toolsVersion, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}:
|
||||
{deployAndroidPackage, requireFile, lib, packages, toolsVersion, os, callPackage, postInstall ? ""}:
|
||||
|
||||
if toolsVersion == "26.0.1" then import ./tools/26.nix {
|
||||
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
|
||||
if toolsVersion == "26.0.1" then callPackage ./tools/26.nix {
|
||||
inherit deployAndroidPackage lib os postInstall;
|
||||
package = {
|
||||
name = "tools";
|
||||
path = "tools";
|
||||
|
|
@ -17,10 +17,10 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix {
|
|||
};
|
||||
};
|
||||
};
|
||||
} else if toolsVersion == "26.1.1" then import ./tools/26.nix {
|
||||
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
|
||||
} else if toolsVersion == "26.1.1" then callPackage ./tools/26.nix {
|
||||
inherit deployAndroidPackage lib os postInstall;
|
||||
package = packages.tools.${toolsVersion};
|
||||
} else import ./tools/25.nix {
|
||||
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
|
||||
} else callPackage ./tools/25.nix {
|
||||
inherit deployAndroidPackage lib os postInstall;
|
||||
package = packages.tools.${toolsVersion};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}:
|
||||
{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall ? ""}:
|
||||
|
||||
deployAndroidPackage {
|
||||
name = "androidsdk";
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ];
|
||||
buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgsi686Linux.glibc pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXrender pkgsi686Linux.fontconfig pkgsi686Linux.freetype pkgsi686Linux.zlib ];
|
||||
inherit package os;
|
||||
|
||||
patchInstructions = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}:
|
||||
{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall ? ""}:
|
||||
|
||||
deployAndroidPackage {
|
||||
name = "androidsdk";
|
||||
|
|
@ -8,7 +8,7 @@ deployAndroidPackage {
|
|||
buildInputs = lib.optional (os == "linux") (
|
||||
(with pkgs; [ glibc freetype fontconfig fontconfig.lib])
|
||||
++ (with pkgs.xorg; [ libX11 libXrender libXext ])
|
||||
++ (with pkgs_i686; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ])
|
||||
++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ])
|
||||
);
|
||||
|
||||
patchInstructions = ''
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ let
|
|||
extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = lib.replaceChars [" "] [""] name;
|
||||
name = lib.replaceStrings [" "] [""] name;
|
||||
|
||||
buildInputs = [ nodejs titanium alloy python which file jdk ];
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ let
|
|||
extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs);
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
|
||||
name = lib.replaceStrings [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
|
||||
buildPhase = ''
|
||||
# Be sure that the Xcode wrapper has priority over everything else.
|
||||
# When using buildInputs this does not seem to be the case.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = lib.replaceChars [" "] [""] name;
|
||||
name = lib.replaceStrings [" "] [""] name;
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
cat > $out/bin/run-test-simulator << "EOF"
|
||||
|
|
|
|||
|
|
@ -1,29 +1,28 @@
|
|||
{ lib, buildDunePackage, fetchurl, extlib, lutils, rdbg }:
|
||||
{ lib, buildDunePackage, fetchurl, extlib, lutils, rdbg, yaml }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lustre-v6";
|
||||
version = "6.103.3";
|
||||
version = "6.107.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.05";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.6.103.3.tgz";
|
||||
sha512 = "8d452184ee68edda1b5a50717e6a5b13fb21f9204634fc5898280e27a1d79c97a6e7cc04424fc22f34cdd02ed3cc8774dca4f982faf342980b5f9fe0dc1a017d";
|
||||
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz";
|
||||
hash = "sha256-+OqDwUIiPrtJy1C3DmDNTrtsT8clKKcNWCev4TEMRBc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
extlib
|
||||
lutils
|
||||
rdbg
|
||||
yaml
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lustre V6 compiler";
|
||||
homepage = "https://www-verimag.imag.fr/lustre-v6.html";
|
||||
license = lib.licenses.cecill21;
|
||||
maintainers = [ lib.maintainers.delta ];
|
||||
license = licenses.cecill21;
|
||||
maintainers = with maintainers; [ delta wegank ];
|
||||
mainProgram = "lv6";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "plotkicadsch";
|
||||
duneVersion = "3";
|
||||
|
||||
inherit (kicadsch) src version;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,22 @@
|
|||
{ lib, fetchurl, buildDunePackage, stdlib-shims, dune-configurator, ounit }:
|
||||
{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit2 }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "sha";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "sha256-cRtjydvwgXgimi6F3C48j7LrWgfMO6m9UJKjKlxvp0Q=";
|
||||
url = "https://github.com/djs55/ocaml-${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||
hash = "sha256-P71Xs5p8QAaOtBrh7MuhQJOL6144BqTLvXlZOyGD/7c=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
stdlib-shims
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
ounit
|
||||
ounit2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
46
pkgs/development/python-modules/awkward-cpp/default.nix
Normal file
46
pkgs/development/python-modules/awkward-cpp/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cmake
|
||||
, numpy
|
||||
, pybind11
|
||||
, scikit-build-core
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward-cpp";
|
||||
version = "2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XmP0PjE19224Hgkkp07PSHD1hcEan0MlaLN3wEAohow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pybind11
|
||||
scikit-build-core
|
||||
] ++ scikit-build-core.optional-dependencies.pyproject;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"awkward_cpp"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CPU kernels and compiled extensions for Awkward Array";
|
||||
homepage = "https://github.com/scikit-hep/awkward";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,40 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cmake
|
||||
, pythonOlder
|
||||
, awkward-cpp
|
||||
, hatch-fancy-pypi-readme
|
||||
, hatchling
|
||||
, numba
|
||||
, numpy
|
||||
, packaging
|
||||
, typing-extensions
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, rapidjson
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "1.10.2";
|
||||
format = "setuptools";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MDvAkZ8JMts+eKklTBf83rEl5L5lzYlLQN+8O/3fwFQ=";
|
||||
hash = "sha256-N4KzRkMIPW7nZE6f2z2ur8S2AwpmfyGf1hy3sjSXa2g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pyyaml
|
||||
rapidjson
|
||||
hatch-fancy-pypi-readme
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awkward-cpp
|
||||
numpy
|
||||
setuptools
|
||||
packaging
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
|
@ -44,11 +44,6 @@ buildPythonPackage rec {
|
|||
numba
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# incomatible with numpy 1.23
|
||||
"test_numpyarray"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests-cuda"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward0";
|
||||
version = "0.15.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "awkward-0.x";
|
||||
rev = version;
|
||||
sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# Can't find a fixture
|
||||
disabledTests = [ "test_import_pandas" ];
|
||||
|
||||
pythonImportsCheck = [ "awkward0" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";
|
||||
homepage = "https://github.com/scikit-hep/awkward-array";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ costrouc SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -23,14 +23,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "black";
|
||||
version = "22.10.0";
|
||||
version = "22.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9RNYjaWZlD4M3k4yzJh56CXVhyDWVXBi0QmMWtgAgOE=";
|
||||
hash = "sha256-IpNR5aGMow9Ee/ck0Af4kPl+E68HC7atTApEHNdZai8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@ buildPythonPackage rec {
|
|||
"test_public_key_compression_is_equal"
|
||||
"test_public_key_decompression_is_equal"
|
||||
"test_signatures_with_high_s"
|
||||
# timing sensitive
|
||||
"test_encode_decode_pairings"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "eth_keys" ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, setuptools
|
||||
, six
|
||||
, appdirs
|
||||
, scandir ? null
|
||||
, backports_os ? null
|
||||
, typing ? null
|
||||
, pytz
|
||||
|
|
@ -35,6 +36,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [ six appdirs pytz setuptools ]
|
||||
++ lib.optionals (!isPy3k) [ backports_os ]
|
||||
++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
|
||||
++ lib.optionals (!pythonAtLeast "3.5") [ scandir ]
|
||||
++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
|
||||
|
||||
LC_ALL="en_US.utf-8";
|
||||
|
|
|
|||
58
pkgs/development/python-modules/here-routing/default.nix
Normal file
58
pkgs/development/python-modules/here-routing/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, yarl
|
||||
, aresponses
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "here-routing";
|
||||
version = "0.2.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eifinger";
|
||||
repo = "here_routing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IXiYLDrPXc6YT8u0QT6f2GAjBNYhWwzkFxGhmAyiq5s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
yarl
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "here_routing" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/eifinger/here_routing/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Asynchronous Python client for the HERE Routing V8 API";
|
||||
homepage = "https://github.com/eifinger/here_routing";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
58
pkgs/development/python-modules/here-transit/default.nix
Normal file
58
pkgs/development/python-modules/here-transit/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, yarl
|
||||
, aresponses
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "here-transit";
|
||||
version = "1.2.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eifinger";
|
||||
repo = "here_transit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-C5HZZCmK9ILUUXyx1i/cUggSM3xbOzXiJ13hrT2DWAI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
yarl
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "here_transit" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/eifinger/here_transit/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Asynchronous Python client for the HERE Routing V8 API";
|
||||
homepage = "https://github.com/eifinger/here_transit";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "isort";
|
||||
version = "5.10.1";
|
||||
version = "5.11.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyCQA";
|
||||
repo = "isort";
|
||||
rev = version;
|
||||
sha256 = "09spgl2k9xrprr5gbpfc91a8p7mx7a0c64ydgc91b3jhrmnd9jg1";
|
||||
sha256 = "sha256-4Du9vYI1srStWCTfZr4Rq3uH5c9cRtR8ZqihI36G6hA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchPypi
|
||||
, six
|
||||
, pythonOlder
|
||||
, scandir ? null
|
||||
, glibcLocales
|
||||
, mock
|
||||
, typing
|
||||
|
|
@ -18,7 +19,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [ six ]
|
||||
++ lib.optionals (pythonOlder "3.5") [ typing ];
|
||||
++ lib.optionals (pythonOlder "3.5") [ scandir typing ];
|
||||
checkInputs = [ glibcLocales ]
|
||||
++ lib.optional (pythonOlder "3.3") mock;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, isPy27
|
||||
, rdflib
|
||||
, html5lib
|
||||
|
|
@ -17,6 +18,14 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-FXZjqSuH3zRbb2m94jXf9feXiRYI4S/h5PqNrWhxMa4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-4396.patch";
|
||||
url = "https://github.com/RDFLib/pyrdfa3/commit/ffd1d62dd50d5f4190013b39cedcdfbd81f3ce3e.patch";
|
||||
hash = "sha256-prRrOwylYcEqKLr/8LIpyJ5Yyt+6+HTUqH5sQXU8tqc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'html = pyRdfa.rdflibparsers:StructuredDataParser'" "'html = pyRdfa.rdflibparsers:StructuredDataParser'," \
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-telegram-bot";
|
||||
version = "13.14";
|
||||
version = "13.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6TkdQ+sRI94md6nSTqh4qdUyfWWyQZr7plP0dtJq7MM=";
|
||||
hash = "sha256-tAR2BrgIG2K71qo2H3yh7+h/qPGIHsnZMtNYRL9XoVQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-pfn-extras";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pfnet";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-J1+y5hHMKC31rIYeWI3Ca8Hdx0FF+MnCOAp0ejHzX/Y=";
|
||||
sha256 = "sha256-B8B5zULIuqiojP7bmj3sABC9dqYLqOX5CfEN6slOFZ8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy packaging torch typing-extensions ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue