Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
caa9f451d1
|
|
@ -248,7 +248,7 @@ rec {
|
|||
then v.__pretty v.val
|
||||
else if v == {} then "{ }"
|
||||
else if v ? type && v.type == "derivation" then
|
||||
"<derivation ${v.drvPath}>"
|
||||
"<derivation ${v.drvPath or "???"}>"
|
||||
else "{" + introSpace
|
||||
+ libStr.concatStringsSep introSpace (libAttr.mapAttrsToList
|
||||
(name: value:
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ class PluginDesc:
|
|||
owner: str
|
||||
repo: str
|
||||
branch: str
|
||||
alias: str
|
||||
alias: Optional[str]
|
||||
|
||||
|
||||
class Repo:
|
||||
|
|
@ -317,12 +317,10 @@ def get_current_plugins(editor: Editor) -> List[Plugin]:
|
|||
|
||||
|
||||
def prefetch_plugin(
|
||||
user: str,
|
||||
repo_name: str,
|
||||
branch: str,
|
||||
alias: Optional[str],
|
||||
p: PluginDesc,
|
||||
cache: "Optional[Cache]" = None,
|
||||
) -> Tuple[Plugin, Dict[str, str]]:
|
||||
user, repo_name, branch, alias = p.owner, p.repo, p.branch, p.alias
|
||||
log.info(f"Fetching last commit for plugin {user}/{repo_name}@{branch}")
|
||||
repo = Repo(user, repo_name, branch, alias)
|
||||
commit, date = repo.latest_commit()
|
||||
|
|
@ -347,7 +345,7 @@ def prefetch_plugin(
|
|||
|
||||
|
||||
def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin:
|
||||
plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line))
|
||||
plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line))
|
||||
return plugin
|
||||
|
||||
|
||||
|
|
@ -466,11 +464,11 @@ class Cache:
|
|||
|
||||
|
||||
def prefetch(
|
||||
args: PluginDesc, cache: Cache
|
||||
pluginDesc: PluginDesc, cache: Cache
|
||||
) -> Tuple[str, str, Union[Exception, Plugin], dict]:
|
||||
owner, repo = args.owner, args.repo
|
||||
owner, repo = pluginDesc.owner, pluginDesc.repo
|
||||
try:
|
||||
plugin, redirect = prefetch_plugin(owner, repo, args.branch, args.alias, cache)
|
||||
plugin, redirect = prefetch_plugin(pluginDesc, cache)
|
||||
cache[plugin.commit] = plugin
|
||||
return (owner, repo, plugin, redirect)
|
||||
except Exception as e:
|
||||
|
|
@ -576,8 +574,9 @@ def update_plugins(editor: Editor, args):
|
|||
if autocommit:
|
||||
commit(
|
||||
nixpkgs_repo,
|
||||
"{editor.get_drv_name name}: init at {version}".format(
|
||||
editor=editor.name, name=plugin.normalized_name, version=plugin.version
|
||||
"{drv_name}: init at {version}".format(
|
||||
drv_name=editor.get_drv_name(plugin.normalized_name),
|
||||
version=plugin.version
|
||||
),
|
||||
[args.outfile, args.input_file],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ in
|
|||
|
||||
unitConfig.ConditionPathExists = [ configDir stateDir ];
|
||||
|
||||
restartTriggers = [ config.environment.etc."hqplayer/hqplayerd.xml".source ];
|
||||
restartTriggers = optionals (cfg.config != null) [ config.environment.etc."hqplayer/hqplayerd.xml".source ];
|
||||
|
||||
preStart = ''
|
||||
cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}"
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ in {
|
|||
useDHCP = false;
|
||||
wireless = {
|
||||
enable = mkIf (!enableIwd) true;
|
||||
dbusControlled = true;
|
||||
iwd = mkIf enableIwd {
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,28 +8,108 @@ let
|
|||
else pkgs.wpa_supplicant;
|
||||
|
||||
cfg = config.networking.wireless;
|
||||
configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" ''
|
||||
${optionalString cfg.userControlled.enable ''
|
||||
ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group}
|
||||
update_config=1''}
|
||||
${cfg.extraConfig}
|
||||
${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let
|
||||
key = if psk != null
|
||||
then ''"${psk}"''
|
||||
else pskRaw;
|
||||
baseAuth = if key != null
|
||||
then "psk=${key}"
|
||||
else "key_mgmt=NONE";
|
||||
in ''
|
||||
network={
|
||||
ssid="${ssid}"
|
||||
${optionalString (priority != null) ''priority=${toString priority}''}
|
||||
${optionalString hidden "scan_ssid=1"}
|
||||
${if (auth != null) then auth else baseAuth}
|
||||
${extraConfig}
|
||||
}
|
||||
'') cfg.networks)}
|
||||
'' else "/etc/wpa_supplicant.conf";
|
||||
|
||||
# Content of wpa_supplicant.conf
|
||||
generatedConfig = concatStringsSep "\n" (
|
||||
(mapAttrsToList mkNetwork cfg.networks)
|
||||
++ optional cfg.userControlled.enable (concatStringsSep "\n"
|
||||
[ "ctrl_interface=/run/wpa_supplicant"
|
||||
"ctrl_interface_group=${cfg.userControlled.group}"
|
||||
"update_config=1"
|
||||
])
|
||||
++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"''
|
||||
++ optional (cfg.extraConfig != "") cfg.extraConfig);
|
||||
|
||||
configFile =
|
||||
if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable
|
||||
then pkgs.writeText "wpa_supplicant.conf" generatedConfig
|
||||
else "/etc/wpa_supplicant.conf";
|
||||
|
||||
# Creates a network block for wpa_supplicant.conf
|
||||
mkNetwork = ssid: opts:
|
||||
let
|
||||
quote = x: ''"${x}"'';
|
||||
indent = x: " " + x;
|
||||
|
||||
pskString = if opts.psk != null
|
||||
then quote opts.psk
|
||||
else opts.pskRaw;
|
||||
|
||||
options = [
|
||||
"ssid=${quote ssid}"
|
||||
(if pskString != null || opts.auth != null
|
||||
then "key_mgmt=${concatStringsSep " " opts.authProtocols}"
|
||||
else "key_mgmt=NONE")
|
||||
] ++ optional opts.hidden "scan_ssid=1"
|
||||
++ optional (pskString != null) "psk=${pskString}"
|
||||
++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth))
|
||||
++ optional (opts.priority != null) "priority=${toString opts.priority}"
|
||||
++ optional (opts.extraConfig != "") opts.extraConfig;
|
||||
in ''
|
||||
network={
|
||||
${concatMapStringsSep "\n" indent options}
|
||||
}
|
||||
'';
|
||||
|
||||
# Creates a systemd unit for wpa_supplicant bound to a given (or any) interface
|
||||
mkUnit = iface:
|
||||
let
|
||||
deviceUnit = optional (iface != null) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device";
|
||||
configStr = if cfg.allowAuxiliaryImperativeNetworks
|
||||
then "-c /etc/wpa_supplicant.conf -I ${configFile}"
|
||||
else "-c ${configFile}";
|
||||
in {
|
||||
description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}";
|
||||
|
||||
after = deviceUnit;
|
||||
before = [ "network.target" ];
|
||||
wants = [ "network.target" ];
|
||||
requires = deviceUnit;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
stopIfChanged = false;
|
||||
|
||||
path = [ package ];
|
||||
|
||||
script =
|
||||
''
|
||||
if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then
|
||||
echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
|
||||
fi
|
||||
|
||||
iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}"
|
||||
|
||||
${if iface == null then ''
|
||||
# detect interfaces automatically
|
||||
|
||||
# check if there are no wireless interfaces
|
||||
if ! find -H /sys/class/net/* -name wireless | grep -q .; then
|
||||
# if so, wait until one appears
|
||||
echo "Waiting for wireless interfaces"
|
||||
grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu)
|
||||
# Note: the above line has been carefully written:
|
||||
# 1. The process substitution avoids udevadm hanging (after grep has quit)
|
||||
# until it tries to write to the pipe again. Not even pipefail works here.
|
||||
# 2. stdbuf is needed because udevadm output is buffered by default and grep
|
||||
# may hang until more udev events enter the pipe.
|
||||
fi
|
||||
|
||||
# add any interface found to the daemon arguments
|
||||
for name in $(find -H /sys/class/net/* -name wireless | cut -d/ -f 5); do
|
||||
echo "Adding interface $name"
|
||||
args+="''${args:+ -N} -i$name $iface_args"
|
||||
done
|
||||
'' else ''
|
||||
# add known interface to the daemon arguments
|
||||
args="-i${iface} $iface_args"
|
||||
''}
|
||||
|
||||
# finally start daemon
|
||||
exec wpa_supplicant $args
|
||||
'';
|
||||
};
|
||||
|
||||
systemctl = "/run/current-system/systemd/bin/systemctl";
|
||||
|
||||
in {
|
||||
options = {
|
||||
networking.wireless = {
|
||||
|
|
@ -42,6 +122,10 @@ in {
|
|||
description = ''
|
||||
The interfaces <command>wpa_supplicant</command> will use. If empty, it will
|
||||
automatically use all wireless interfaces.
|
||||
|
||||
<note><para>
|
||||
A separate wpa_supplicant instance will be started for each interface.
|
||||
</para></note>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -61,6 +145,16 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
scanOnLowSignal = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to periodically scan for (better) networks when the signal of
|
||||
the current one is low. This will make roaming between access points
|
||||
faster, but will consume more power.
|
||||
'';
|
||||
};
|
||||
|
||||
networks = mkOption {
|
||||
type = types.attrsOf (types.submodule {
|
||||
options = {
|
||||
|
|
@ -89,11 +183,52 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
authProtocols = mkOption {
|
||||
default = [
|
||||
# WPA2 and WPA3
|
||||
"WPA-PSK" "WPA-EAP" "SAE"
|
||||
# 802.11r variants of the above
|
||||
"FT-PSK" "FT-EAP" "FT-SAE"
|
||||
];
|
||||
# The list can be obtained by running this command
|
||||
# awk '
|
||||
# /^# key_mgmt: /{ run=1 }
|
||||
# /^#$/{ run=0 }
|
||||
# /^# [A-Z0-9-]{2,}/{ if(run){printf("\"%s\"\n", $2)} }
|
||||
# ' /run/current-system/sw/share/doc/wpa_supplicant/wpa_supplicant.conf.example
|
||||
type = types.listOf (types.enum [
|
||||
"WPA-PSK"
|
||||
"WPA-EAP"
|
||||
"IEEE8021X"
|
||||
"NONE"
|
||||
"WPA-NONE"
|
||||
"FT-PSK"
|
||||
"FT-EAP"
|
||||
"FT-EAP-SHA384"
|
||||
"WPA-PSK-SHA256"
|
||||
"WPA-EAP-SHA256"
|
||||
"SAE"
|
||||
"FT-SAE"
|
||||
"WPA-EAP-SUITE-B"
|
||||
"WPA-EAP-SUITE-B-192"
|
||||
"OSEN"
|
||||
"FILS-SHA256"
|
||||
"FILS-SHA384"
|
||||
"FT-FILS-SHA256"
|
||||
"FT-FILS-SHA384"
|
||||
"OWE"
|
||||
"DPP"
|
||||
]);
|
||||
description = ''
|
||||
The list of authentication protocols accepted by this network.
|
||||
This corresponds to the <literal>key_mgmt</literal> option in wpa_supplicant.
|
||||
'';
|
||||
};
|
||||
|
||||
auth = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = ''
|
||||
key_mgmt=WPA-EAP
|
||||
eap=PEAP
|
||||
identity="user@example.com"
|
||||
password="secret"
|
||||
|
|
@ -200,6 +335,16 @@ in {
|
|||
description = "Members of this group can control wpa_supplicant.";
|
||||
};
|
||||
};
|
||||
|
||||
dbusControlled = mkOption {
|
||||
type = types.bool;
|
||||
default = lib.length cfg.interfaces < 2;
|
||||
description = ''
|
||||
Whether to enable the DBus control interface.
|
||||
This is only needed when using NetworkManager or connman.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
|
|
@ -223,80 +368,47 @@ in {
|
|||
assertions = flip mapAttrsToList cfg.networks (name: cfg: {
|
||||
assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1;
|
||||
message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';
|
||||
});
|
||||
|
||||
environment.systemPackages = [ package ];
|
||||
|
||||
services.dbus.packages = [ package ];
|
||||
}) ++ [
|
||||
{
|
||||
assertion = length cfg.interfaces > 1 -> !cfg.dbusControlled;
|
||||
message =
|
||||
let daemon = if config.networking.networkmanager.enable then "NetworkManager" else
|
||||
if config.services.connman.enable then "connman" else null;
|
||||
n = toString (length cfg.interfaces);
|
||||
in ''
|
||||
It's not possible to run multiple wpa_supplicant instances with DBus support.
|
||||
Note: you're seeing this error because `networking.wireless.interfaces` has
|
||||
${n} entries, implying an equal number of wpa_supplicant instances.
|
||||
'' + optionalString (daemon != null) ''
|
||||
You don't need to change `networking.wireless.interfaces` when using ${daemon}:
|
||||
in this case the interfaces will be configured automatically for you.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
hardware.wirelessRegulatoryDatabase = true;
|
||||
|
||||
# FIXME: start a separate wpa_supplicant instance per interface.
|
||||
systemd.services.wpa_supplicant = let
|
||||
ifaces = cfg.interfaces;
|
||||
deviceUnit = interface: [ "sys-subsystem-net-devices-${utils.escapeSystemdPath interface}.device" ];
|
||||
in {
|
||||
description = "WPA Supplicant";
|
||||
environment.systemPackages = [ package ];
|
||||
services.dbus.packages = optional cfg.dbusControlled package;
|
||||
|
||||
after = lib.concatMap deviceUnit ifaces;
|
||||
before = [ "network.target" ];
|
||||
wants = [ "network.target" ];
|
||||
requires = lib.concatMap deviceUnit ifaces;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
stopIfChanged = false;
|
||||
systemd.services =
|
||||
if cfg.interfaces == []
|
||||
then { wpa_supplicant = mkUnit null; }
|
||||
else listToAttrs (map (i: nameValuePair "wpa_supplicant-${i}" (mkUnit i)) cfg.interfaces);
|
||||
|
||||
path = [ package pkgs.udev ];
|
||||
# Restart wpa_supplicant after resuming from sleep
|
||||
powerManagement.resumeCommands = concatStringsSep "\n" (
|
||||
optional (cfg.interfaces == []) "${systemctl} try-restart wpa_supplicant"
|
||||
++ map (i: "${systemctl} try-restart wpa_supplicant-${i}") cfg.interfaces
|
||||
);
|
||||
|
||||
script = let
|
||||
configStr = if cfg.allowAuxiliaryImperativeNetworks
|
||||
then "-c /etc/wpa_supplicant.conf -I ${configFile}"
|
||||
else "-c ${configFile}";
|
||||
in ''
|
||||
if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then
|
||||
echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
|
||||
fi
|
||||
|
||||
iface_args="-s -u -D${cfg.driver} ${configStr}"
|
||||
|
||||
${if ifaces == [] then ''
|
||||
# detect interfaces automatically
|
||||
|
||||
# check if there are no wireless interface
|
||||
if ! find -H /sys/class/net/* -name wireless | grep -q .; then
|
||||
# if so, wait until one appears
|
||||
echo "Waiting for wireless interfaces"
|
||||
grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu)
|
||||
# Note: the above line has been carefully written:
|
||||
# 1. The process substitution avoids udevadm hanging (after grep has quit)
|
||||
# until it tries to write to the pipe again. Not even pipefail works here.
|
||||
# 2. stdbuf is needed because udevadm output is buffered by default and grep
|
||||
# may hang until more udev events enter the pipe.
|
||||
fi
|
||||
|
||||
# add any interface found to the daemon arguments
|
||||
for name in $(find -H /sys/class/net/* -name wireless | cut -d/ -f 5); do
|
||||
echo "Adding interface $name"
|
||||
args+="''${args:+ -N} -i$name $iface_args"
|
||||
done
|
||||
'' else ''
|
||||
# add known interfaces to the daemon arguments
|
||||
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
|
||||
''}
|
||||
|
||||
# finally start daemon
|
||||
exec wpa_supplicant $args
|
||||
'';
|
||||
};
|
||||
|
||||
powerManagement.resumeCommands = ''
|
||||
/run/current-system/systemd/bin/systemctl try-restart wpa_supplicant
|
||||
'';
|
||||
|
||||
# Restart wpa_supplicant when a wlan device appears or disappears.
|
||||
services.udev.extraRules = ''
|
||||
ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="/run/current-system/systemd/bin/systemctl try-restart wpa_supplicant.service"
|
||||
# Restart wpa_supplicant when a wlan device appears or disappears. This is
|
||||
# only needed when an interface hasn't been specified by the user.
|
||||
services.udev.extraRules = optionalString (cfg.interfaces == []) ''
|
||||
ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", \
|
||||
RUN+="${systemctl} try-restart wpa_supplicant.service"
|
||||
'';
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ globin ];
|
||||
meta.maintainers = with lib.maintainers; [ globin rnhmjoj ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -171,6 +171,14 @@ let
|
|||
map_hash_max_size ${toString cfg.mapHashMaxSize};
|
||||
''}
|
||||
|
||||
${optionalString (cfg.serverNamesHashBucketSize != null) ''
|
||||
server_names_hash_bucket_size ${toString cfg.serverNamesHashBucketSize};
|
||||
''}
|
||||
|
||||
${optionalString (cfg.serverNamesHashMaxSize != null) ''
|
||||
server_names_hash_max_size ${toString cfg.serverNamesHashMaxSize};
|
||||
''}
|
||||
|
||||
# $connection_upgrade is used for websocket proxying
|
||||
map $http_upgrade $connection_upgrade {
|
||||
default upgrade;
|
||||
|
|
@ -643,6 +651,23 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
serverNamesHashBucketSize = mkOption {
|
||||
type = types.nullOr types.ints.positive;
|
||||
default = null;
|
||||
description = ''
|
||||
Sets the bucket size for the server names hash tables. Default
|
||||
value depends on the processor’s cache line size.
|
||||
'';
|
||||
};
|
||||
|
||||
serverNamesHashMaxSize = mkOption {
|
||||
type = types.nullOr types.ints.positive;
|
||||
default = null;
|
||||
description = ''
|
||||
Sets the maximum size of the server names hash tables.
|
||||
'';
|
||||
};
|
||||
|
||||
resolver = mkOption {
|
||||
type = types.submodule {
|
||||
options = {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,14 @@ in
|
|||
`<nixpkgs/nixos/modules/virtualisation/google-compute-image.nix>`.
|
||||
'';
|
||||
};
|
||||
|
||||
virtualisation.googleComputeImage.compressionLevel = mkOption {
|
||||
type = types.int;
|
||||
default = 6;
|
||||
description = ''
|
||||
GZIP compression level of the resulting disk image (1-9).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
#### implementation
|
||||
|
|
@ -47,7 +55,8 @@ in
|
|||
PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]}
|
||||
pushd $out
|
||||
mv $diskImage disk.raw
|
||||
tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw
|
||||
tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \
|
||||
nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz
|
||||
rm $out/disk.raw
|
||||
popd
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kid3";
|
||||
version = "3.8.6";
|
||||
version = "3.8.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-R4gAWlCw8RezhYbw1XDo+wdp797IbLoM3wqHwr+ul6k=";
|
||||
sha256 = "sha256-Dr+NLh5ajG42jRKt1Swq6mccPfuAXRvhhoTNuO8lnI0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mympd";
|
||||
version = "7.0.2";
|
||||
version = "8.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2V3LbgnJfTIO71quZ+hfLnw/lNLYxXt19jw2Od6BVvM=";
|
||||
sha256 = "sha256-J37PH+yRSsPeNCdY2mslrjMoBwutm5xTSIt+TWyf21M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A9XIKCw1dL4vUQYSu6WdmpR82dAbtKVTyjllquyRGgs=";
|
||||
sha256 = "sha256-pRc0oud8k6ulC6tVXv6Mr7IEC2a/+FhkMDyxz1zFKTE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
|
||||
|
|
|
|||
76
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
76
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
|
|
@ -26,53 +26,48 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Hwi";
|
||||
version = "1.1.3";
|
||||
sha256 = "1c8hfnrjh2ad8qh75d63gsl170q8czf3j1hk8sv8fnbgnxdnkm7a";
|
||||
version = "2.0.1";
|
||||
sha256 = "18pp3f0z10c0q1bbllxi2j6ix8f0x58d0dndi5faf9p3hb58ly9k";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.All";
|
||||
version = "1.2.7";
|
||||
sha256 = "0jzmzvlpf6iba2fsc6cyi69vlaim9slqm2sapknmd7drl3gcn2zj";
|
||||
version = "1.2.10";
|
||||
sha256 = "0c3bi5r7sckzml44bqy0j1cd6l3xc29cdyf6rib52b5gmgrvcam2";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.Charge";
|
||||
version = "1.2.3";
|
||||
sha256 = "1rdrwmijx0v4z0xsq4acyvdcj7hv6arfh3hwjy89rqnkkznrzgwv";
|
||||
version = "1.2.5";
|
||||
sha256 = "02mf7yhr9lfy5368c5mn1wgxxka52f0s5vx31w97sdkpc5pivng5";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.CLightning";
|
||||
version = "1.2.3";
|
||||
sha256 = "02197rh03q8d0mv40zf67wp1rd2gbxi5l8krd2rzj84n267bcfvc";
|
||||
version = "1.2.6";
|
||||
sha256 = "1p4bzbrd2d0izjd9q06mnagl31q50hpz5jla9gfja1bhn3xqvwsy";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.Common";
|
||||
version = "1.2.0";
|
||||
sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.Common";
|
||||
version = "1.2.2";
|
||||
sha256 = "07xb7fsqvfjmcawxylriw60i73h0cvfb765aznhp9ffyrmjaql7z";
|
||||
version = "1.2.4";
|
||||
sha256 = "1bdj1cdf6sirwm19hq1k2fmh2jiqkcyzrqms6q9d0wqba9xggwyn";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.Eclair";
|
||||
version = "1.2.2";
|
||||
sha256 = "03dymhwxb5s28kb187g5h4aysnz2xzml89p47nmwz9lkg2h4s73h";
|
||||
version = "1.2.4";
|
||||
sha256 = "1l68sc9g4ffsi1bbgrbbx8zmqw811hjq17761q1han9gsykl5rr1";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.LND";
|
||||
version = "1.2.4";
|
||||
sha256 = "0qnj5rsp6hnybsr58zny9dfbsxksg1674q0z9944jwkzm7pcqyg4";
|
||||
version = "1.2.6";
|
||||
sha256 = "16wipkzzfrcjhi3whqxdfjq7qxnwjzf4gckpf1qjgdxbzggh6l3d";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.Ptarmigan";
|
||||
version = "1.2.2";
|
||||
sha256 = "17yl85vqfp7l12bv3f3w1b861hm41i7cfhs78gaq04s4drvcnj6k";
|
||||
version = "1.2.4";
|
||||
sha256 = "1j80m4pb3nn4dnqmxda13lp87pgviwxai456pki097rmc0vmqj83";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BuildBundlerMinifier";
|
||||
version = "3.2.435";
|
||||
sha256 = "0y1p226dbvs7q2ngm9w4mpkhfrhw2y122plv1yff7lx5m84ia02l";
|
||||
version = "3.2.449";
|
||||
sha256 = "1dcjlfl5w2vfppx2hq3jj6xy24id2x3hcajwylhphlz9jw2bnhsv";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BundlerMinifier.Core";
|
||||
|
|
@ -761,18 +756,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin.Altcoins";
|
||||
version = "2.0.31";
|
||||
sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "5.0.33";
|
||||
sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "5.0.4";
|
||||
sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i";
|
||||
version = "3.0.3";
|
||||
sha256 = "0129mgnyyb55haz68d8z694g1q2rlc0qylx08d5qnfpq1r03cdqd";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
|
|
@ -786,13 +771,18 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "5.0.73";
|
||||
sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1";
|
||||
version = "5.0.81";
|
||||
sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "5.0.77";
|
||||
sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb";
|
||||
version = "6.0.3";
|
||||
sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "6.0.7";
|
||||
sha256 = "0mk8n8isrrww0240x63rx3zx12nz5v08i3w62qp1n18mmdw3rdy6";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitpayClient";
|
||||
|
|
@ -801,8 +791,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "NBXplorer.Client";
|
||||
version = "3.0.21";
|
||||
sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi";
|
||||
version = "4.0.3";
|
||||
sha256 = "0x9iggc5cyv06gnwnwrk3riv2j3g0833imdf3jx8ghmrxvim88b3";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Nethereum.ABI";
|
||||
|
|
@ -1116,8 +1106,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "Selenium.WebDriver.ChromeDriver";
|
||||
version = "88.0.4324.9600";
|
||||
sha256 = "0jm8dpfp329xsrg69lzq2m6x9yin1m43qgrhs15cz2qx9f02pdx9";
|
||||
version = "90.0.4430.2400";
|
||||
sha256 = "18gjm92nzzvxf0hk7c0nnabs0vmh6yyzq3m4si7p21m6xa3bqiga";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Selenium.WebDriver";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "erigon";
|
||||
version = "2021.08.01";
|
||||
version = "2021.08.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fjMkCCeQa/IHB4yXlL7Qi8J9wtZm90l3xIA72LeoW8M=";
|
||||
sha256 = "sha256-pyqvzpsDk24UEtSx4qmDew9zRK45pD5i4Qv1uJ03tmk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1vsgd19an592dblm9afasmh8cd0x2frw5pvnxkxd2fikhy2mibbs";
|
||||
vendorSha256 = "sha256-FwKlQH8vEtWNDql1pmHzKneIwmJ7cg5LYkETVswO6pc=";
|
||||
runVend = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@ let
|
|||
|
||||
in buildGoModule rec {
|
||||
pname = "go-ethereum";
|
||||
version = "1.10.6";
|
||||
version = "1.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4lapkoxSKdXlD6rmUxnlSKrfH+DeV6/wV05CqJjuzjA=";
|
||||
sha256 = "sha256-P0+XPSpvVsjia21F3FIg7KO6Qe2ZbY90tM/dRwBBuBk=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-5qi01y0SIEI0WRYu2I2RN94QFS8rrlioFvnRqqp6wtk=";
|
||||
vendorSha256 = "sha256-51jt5oBb/3avZnDRfo/NKAtZAU6QBFkzNdVxFnJ+erM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "lndmanage";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitromortac";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1p73wdxv3fca2ga4nqpjk5lig7bj2v230lh8niw490p5y7hhnggl";
|
||||
sha256 = "1vnv03k2d11rw6mry6fmspiy3hqsza8y3daxnn4lp038gw1y0f4z";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.1.52";
|
||||
version = "2.1.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+BP71TQ8BTGZ/SbS7CrI4D7hcQaVLt+hCpInbOdU5GY=";
|
||||
sha256 = "sha256-rhD0owLEx7WxZnGPNaq4QpZopMsFQDOTnA0fs539Wxg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
|
||||
|
|
|
|||
16
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
16
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
|
|
@ -181,23 +181,23 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin.Altcoins";
|
||||
version = "2.0.33";
|
||||
sha256 = "12r4w89247xzrl2g01iv13kg1wl7gzfz1zikimx6dyhr4iipbmgf";
|
||||
version = "3.0.3";
|
||||
sha256 = "0129mgnyyb55haz68d8z694g1q2rlc0qylx08d5qnfpq1r03cdqd";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin.TestFramework";
|
||||
version = "2.0.23";
|
||||
sha256 = "03jw3gay7brm7s7jwn4zbk1n1sq7gck523cx3ckx87v3wi2062lx";
|
||||
version = "3.0.3";
|
||||
sha256 = "1j3ajj4jrwqzlhzhkg7vicwab0aq2y50x53rindd8cq09jxvzk62";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "5.0.78";
|
||||
sha256 = "1mfn045l489bm2xgjhvddhfy4xxcy42q6jhq4nyd6fnxg4scxyg9";
|
||||
version = "6.0.6";
|
||||
sha256 = "1kf2rjrnh97zlh00affsv95f94bwgr2h7b00njqac4qgv9cac7sa";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "5.0.81";
|
||||
sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x";
|
||||
version = "6.0.8";
|
||||
sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NETStandard.Library";
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blender";
|
||||
version = "2.93.1";
|
||||
version = "2.93.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-IdriOBw/DlpH6B0GKqC1nKnhTZwrIL8U9hkMS20BHNg=";
|
||||
sha256 = "sha256-nG1Kk6UtiCwsQBDz7VELcMRVEovS49QiO3haIpvSfu4=";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ mkDerivation rec {
|
|||
feedparser
|
||||
html2text
|
||||
html5-parser
|
||||
jeepney
|
||||
lxml
|
||||
markdown
|
||||
mechanize
|
||||
|
|
|
|||
|
|
@ -3,12 +3,15 @@
|
|||
let
|
||||
pname = "chrysalis";
|
||||
version = "0.8.4";
|
||||
in appimageTools.wrapType2 rec {
|
||||
in appimageTools.wrapAppImage rec {
|
||||
name = "${pname}-${version}-binary";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7";
|
||||
src = appimageTools.extract {
|
||||
inherit name;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7";
|
||||
};
|
||||
};
|
||||
|
||||
profile = ''
|
||||
|
|
@ -20,7 +23,18 @@ in appimageTools.wrapType2 rec {
|
|||
p.glib
|
||||
];
|
||||
|
||||
extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}";
|
||||
# Also expose the udev rules here, so it can be used as:
|
||||
# services.udev.packages = [ pkgs.chrysalis ];
|
||||
# to allow non-root modifications to the keyboards.
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
ln -s \
|
||||
--target-directory=$out/lib/udev/rules.d \
|
||||
${src}/resources/static/udev/60-kaleidoscope.rules
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A graphical configurator for Kaleidoscope-powered keyboards";
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver";
|
||||
version = "21.1.2"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.1.4"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-3q5LTllyqw7s8unJHTuasBCM4iaJ9lLpwgbXwBGUtIw=";
|
||||
sha256 = "jW4ZSHnjBHckfbcvhl+uTuNJb1hu77D6dzoSTA6y8l4=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
dontFixup = true;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-QPDnIXP3yB1Dn0LBbBBLvRDbCyguWvG9Zzb1Vjh72UA=";
|
||||
outputHash = "1K3GvNUT+zC7e8pD15UUCHDRWD7dtxtl8MfAJIsuaYs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -150,6 +150,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ jojosch ];
|
||||
maintainers = with maintainers; [ jojosch mkg20001 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
{ fetchurl, lib, stdenv, dpkg, makeWrapper, openssl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "8.2";
|
||||
pname = "minergate-cli";
|
||||
src = fetchurl {
|
||||
url = "https://minergate.com/download/ubuntu-cli";
|
||||
sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
dpkg-deb -x $src $out
|
||||
pgm=$out/opt/minergate-cli/minergate-cli
|
||||
|
||||
interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
|
||||
patchelf --set-interpreter "$interpreter" $pgm
|
||||
|
||||
wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl stdenv.cc.cc ]}
|
||||
|
||||
rm $out/usr/bin/minergate-cli
|
||||
mkdir -p $out/bin
|
||||
ln -s $pgm $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minergate CPU/GPU console client mining software";
|
||||
homepage = "https://www.minergate.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ bfortz ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
{ fetchurl, lib, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "8.1";
|
||||
pname = "minergate";
|
||||
src = fetchurl {
|
||||
url = "https://minergate.com/download/ubuntu";
|
||||
sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
dpkg-deb -x $src $out
|
||||
pgm=$out/opt/minergate/minergate
|
||||
|
||||
interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
|
||||
patchelf --set-interpreter "$interpreter" $pgm
|
||||
|
||||
wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
|
||||
|
||||
rm $out/usr/bin/minergate
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/opt/minergate/minergate $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minergate CPU/GPU mining software";
|
||||
homepage = "https://www.minergate.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ bfortz ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
|||
preInstall = ''
|
||||
substituteInPlace unipicker --replace "/etc/unipickerrc" "$out/etc/unipickerrc"
|
||||
substituteInPlace unipickerrc --replace "/usr/local" "$out"
|
||||
substituteInPlace unipicker --replace "fzf" "${fzf}/bin/fzf"
|
||||
substituteInPlace unipickerrc --replace "fzf" "${fzf}/bin/fzf"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asuka";
|
||||
version = "0.8.1";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~julienxx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1y8v4qc5dng3v9k0bky1xlf3qi9pk2vdsi29lff4ha5310467f0k";
|
||||
sha256 = "sha256-l3SgIyApASllHVhAc2yoUYc2x7QtCdzBrMYaXCp65m8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0b8wf12bjsy334g04sv3knw8f177xsmh7lrkyvx9gnn0fax0lmnr";
|
||||
cargoSha256 = "sha256-twECZM1KcWeQptLhlKlIz16r3Q/xMb0e+lBG+EX79mU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -90,11 +90,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.27.111";
|
||||
version = "1.28.105";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "nQkna1r8wSjTPEWp9RxOz45FVmz97NHzTlb4Hh5lXcs=";
|
||||
sha256 = "1E2KWG5vHYBuph6Pv9J6FBOsUpegx4Ix/H99ZQ/x4zI=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-electron";
|
||||
version = "2.8.9";
|
||||
version = "2.8.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
|
||||
sha256 = "sha256-PsMP0bDxlXAkRu3BgaUWcqnTfUKOGB81oHT94Xi8t8E=";
|
||||
sha256 = "sha256-k++vumbhcMl9i4s8f04zOUAfYlA1g477FjrGuEGSD1U=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
48
pkgs/applications/networking/listadmin/default.nix
Normal file
48
pkgs/applications/networking/listadmin/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib, stdenvNoCC, fetchurl, makeWrapper, perl, installShellFiles }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "listadmin";
|
||||
version = "2.73";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/listadmin/${version}/listadmin-${version}.tar.gz";
|
||||
sha256 = "00333d65ygdbm1hqr4yp2j8vh1cgh3hyfm7iy9y1alf0p0f6aqac";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
# There is a Makefile, but we don’t need it, and it prints errors
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
install -m 755 listadmin.pl $out/bin/listadmin
|
||||
installManPage listadmin.1
|
||||
|
||||
wrapProgram $out/bin/listadmin \
|
||||
--prefix PERL5LIB : "${with perl.pkgs; makeFullPerlPath [
|
||||
TextReform NetINET6Glue LWPProtocolhttps
|
||||
]}"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/listadmin --help 2> /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line mailman moderator queue manipulation";
|
||||
longDescription = ''
|
||||
listadmin is a command line tool to manipulate the queues of messages
|
||||
held for moderator approval by mailman. It is designed to keep user
|
||||
interaction to a minimum, in theory you could run it from cron to prune
|
||||
the queue. It can use the score from a header added by SpamAssassin to
|
||||
filter, or it can match specific senders, subjects, or reasons.
|
||||
'';
|
||||
homepage = "https://sourceforge.net/projects/listadmin/";
|
||||
license = licenses.publicDomain;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ nomeata ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{ callPackage
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
callPackage ../../browsers/firefox/update.nix ({
|
||||
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
|
||||
} // (builtins.removeAttrs args ["callPackage"]))
|
||||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KMFFRxNQUNcu7Q5515lNbEMyCWIvzXXC//s3WAWxw4g=";
|
||||
sha256 = "sha256-2oX3V84ScUV08/WaWJQPLJIni7KvJa/YBRBTWVdRO2U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnunet";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
|
||||
sha256 = "1hhqv994akymf4s593mc1wpsjy6hccd0zbdim3qmc1y3f32hacja";
|
||||
sha256 = "sha256-zKI9b7QIkKXrLMrkuPfnTI5OhNP8ovQZ13XLSljdmmc=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sieve-connect";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ perlPackages.perl ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
preBuild = ''
|
||||
# Fixes failing build when not building in git repo
|
||||
|
|
@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
|
|||
buildFlags = [ "PERL5LIB=${perlPackages.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
mkdir -p $out/bin
|
||||
install -m 755 sieve-connect $out/bin
|
||||
install -m 644 sieve-connect.1 $out/share/man/man1
|
||||
installManPage sieve-connect.1
|
||||
|
||||
wrapProgram $out/bin/sieve-connect \
|
||||
--prefix PERL5LIB : "${with perlPackages; makePerlPath [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "agenda";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dahenson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0yfapapsanqacaa83iagar88i335yy2jvay8y6z7gkri7avbs4am";
|
||||
sha256 = "sha256-K6ZtYllxBzLUPS2qeSxtplXqayB1m49sqmB28tHDS14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
|
||||
, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib
|
||||
, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack
|
||||
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch
|
||||
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
|
||||
, withRecommendedPackages ? true
|
||||
, enableStrictBarrier ? false
|
||||
# R as of writing does not support outputting both .so and .a files; it outputs:
|
||||
|
|
@ -13,11 +13,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "R";
|
||||
version = "4.0.4";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj";
|
||||
sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji";
|
||||
};
|
||||
|
||||
dontUseImakeConfigure = true;
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
./no-usr-local-search-paths.patch
|
||||
./fix-failing-test.patch
|
||||
./skip-check-for-aarch64.patch
|
||||
];
|
||||
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
From e8f54bc562eb301d204b5f880614be58a2b39a2b Mon Sep 17 00:00:00 2001
|
||||
From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
|
||||
Date: Mon, 30 Mar 2020 19:15:59 +0000
|
||||
Subject: [PATCH] no longer fail in norm() check for broken OpenBLAS Lapack
|
||||
3.9.0
|
||||
|
||||
git-svn-id: https://svn.r-project.org/R/trunk@78112 00db46b3-68df-0310-9c12-caf00c1e9a41
|
||||
---
|
||||
tests/reg-tests-1d.R | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R
|
||||
index 6b7de765a95..fafd6911e7a 100644
|
||||
--- a/tests/reg-tests-1d.R
|
||||
+++ b/tests/reg-tests-1d.R
|
||||
@@ -3836,7 +3836,8 @@ stopifnot(is.na( norm(diag(c(1, NA)), "2") ))
|
||||
## norm(<matrix-w-NA>, "F")
|
||||
(m <- cbind(0, c(NA, 0), 0:-1))
|
||||
nTypes <- eval(formals(base::norm)$type) # "O" "I" "F" "M" "2"
|
||||
-stopifnot(is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN
|
||||
+print( # stopifnot( -- for now, as Lapack is still broken in some OpenBLAS -- FIXME
|
||||
+ is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN
|
||||
## "F" gave non-NA with LAPACK 3.9.0, before our patch in R-devel and R-patched
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
diff -ur a/src/library/stats/man/nls.Rd b/src/library/stats/man/nls.Rd
|
||||
--- a/src/library/stats/man/nls.Rd 2021-05-21 19:15:02.000000000 -0300
|
||||
+++ b/src/library/stats/man/nls.Rd 2021-08-12 12:39:00.094758280 -0300
|
||||
@@ -287,7 +287,7 @@
|
||||
options(digits = 10) # more accuracy for 'trace'
|
||||
## IGNORE_RDIFF_BEGIN
|
||||
try(nlm1 <- update(nlmod, control = list(tol = 1e-7))) # where central diff. work here:
|
||||
- (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE), trace=TRUE))
|
||||
+ (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE, warnOnly=TRUE), trace=TRUE))
|
||||
## --> convergence tolerance 4.997e-8 (in 11 iter.)
|
||||
## IGNORE_RDIFF_END
|
||||
|
|
@ -87,13 +87,18 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = runtimeDeps;
|
||||
|
||||
postInstall = ''
|
||||
# terminfo
|
||||
mkdir -p $terminfo/share/terminfo/w $out/nix-support
|
||||
tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo
|
||||
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||
|
||||
# desktop icon
|
||||
install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
|
||||
install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop
|
||||
install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml
|
||||
|
||||
# helper scripts
|
||||
install -Dm644 assets/shell-integration/wezterm.sh $out/share/wezterm/shell-integration/wezterm.sh
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }:
|
||||
{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, unixtools, nixosTests }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "hub";
|
||||
|
|
@ -16,7 +16,7 @@ buildGoPackage rec {
|
|||
sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ groff installShellFiles util-linux ];
|
||||
nativeBuildInputs = [ groff installShellFiles unixtools.col ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
with python.pkgs;
|
||||
buildPythonApplication rec {
|
||||
version = "0.3.9";
|
||||
version = "0.5.0";
|
||||
pname = "nbstripout";
|
||||
|
||||
# Mercurial should be added as a build input but because it's a Python
|
||||
|
|
@ -14,7 +14,7 @@ buildPythonApplication rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b46dddbf78b8b137176bc72729124e378242ef9ce93af63f6e0a8c4850c972e7";
|
||||
sha256 = "86ab50136998d62c9fa92478d2eb9ddc4137e51a28568f78fa8f24a6fbb6a7d8";
|
||||
};
|
||||
|
||||
# for some reason, darwin uses /bin/sh echo native instead of echo binary, so
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitLab
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
|
|
@ -46,15 +45,15 @@ let
|
|||
'';
|
||||
|
||||
in
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkvtoolnix";
|
||||
version = "59.0.0";
|
||||
version = "60.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-bPypOsveXrkz1V961b9GTJKFdgru/kcW15z/yik/4yQ=";
|
||||
sha256 = "sha256-WtEC/EH0G1Tm6OK6hmVRzloLkO8mxxOYYZY7k/Wi2zE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "plex-mpv-shim";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwalton3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "18bd2nvlwzkmadimlkh7rs8rnp0ppfx1dzkxb11dq84pdpbl25pc";
|
||||
sha256 = "1ql7idkm916f1wlkqxqmq1i2pc94gbgq6pvb8szhb21icyy5d1y0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tartube";
|
||||
version = "2.3.110";
|
||||
version = "2.3.332";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axcore";
|
||||
repo = "tartube";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sdbd2lsc4bvgkwi55arjwbzwmq05abfmv6vsrvz4gsdv8s8wha5";
|
||||
sha256 = "1m7p4chpvbh4mswsymh89dksdgwhmnkpfbx9zi2jzqgkinfd6a2k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -37,11 +37,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "40.2";
|
||||
version = "40.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "dRGeIgZWV89w7ytgPU9zg1VzvQNPHmGMD2YkeP1saDU=";
|
||||
sha256 = "2tE4ufLVXeJxEo/KOLYfU/2YDFh9KeG6a1CP/zsZ9WQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -65,6 +65,12 @@ let
|
|||
EOF
|
||||
'';
|
||||
|
||||
# fixupPhase is moving the man to share/man which breaks it because it's a
|
||||
# relative symlink.
|
||||
postFixup = ''
|
||||
ln -nsf ../zulu-11.jdk/Contents/Home/man $out/share/man
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
home = jdk;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
|
|||
find = ''find ${concatStringsSep " " (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
|
||||
copy = ''cp -rsfu ${concatStringsSep " " (map (x: x + "/m2/*") flatDeps)} $out/m2'';
|
||||
|
||||
phases = [ "unpackPhase" "buildPhase" ];
|
||||
dontInstall = true;
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/target
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, libXxf86dga, libXxf86misc
|
||||
, libXxf86vm, openal, libGLU, libGL, libjpeg, flac
|
||||
, libXi, libXfixes, freetype, libopus, libtheora
|
||||
, physfs, enet, pkg-config, gtk2, pcre, libpulseaudio, libpthreadstubs
|
||||
, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs
|
||||
, libXdmcp
|
||||
}:
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
libXxf86vm openal libGLU libGL
|
||||
libjpeg flac
|
||||
libXi libXfixes
|
||||
enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp
|
||||
enet libtheora freetype physfs libopus pkg-config gtk3 pcre libXdmcp
|
||||
libpulseaudio libpthreadstubs
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bobcat";
|
||||
version = "5.05.00";
|
||||
version = "5.09.01";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
sha256 = "sha256:14lvxzkxmkk54s97ah996m6s1wbw1g3iwawbhsf8qw7sf75vlp1h";
|
||||
sha256 = "sha256-kaz15mNn/bq1HUknUJqXoLYxPRPX4w340sv9be0M+kQ=";
|
||||
domain = "gitlab.com";
|
||||
rev = version;
|
||||
repo = "bobcat";
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, exampleSupport ? false # Example encoding program
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fdk-aac";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz";
|
||||
sha256 = "0wgjjc0dfkm2w966lc9c8ir8f671vl1ppch3mya3h58jjjm360c4";
|
||||
sha256 = "sha256-yehjDPnUM/POrXSQahUg0iI/ibzT+pJUhhAXRAuOsi8=";
|
||||
};
|
||||
|
||||
configureFlags = [ ]
|
||||
++ optional exampleSupport "--enable-example";
|
||||
configureFlags = lib.optional exampleSupport "--enable-example";
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A high-quality implementation of the AAC codec from Android";
|
||||
homepage = "https://sourceforge.net/projects/opencore-amr/";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://sourceforge.net/projects/opencore-amr/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ codyopel ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imlib2";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-AzpqY53LyOA/Zf8F5XBo5zRtUO4vL/8wS7kJWhsrxAc=";
|
||||
sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
22
pkgs/development/libraries/libargs/default.nix
Normal file
22
pkgs/development/libraries/libargs/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "args";
|
||||
version = "6.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taywee";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-g5OXuZNi5bkWuSg7SNmhA6vyHUOFU8suYkH8nGx6tvg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple header-only C++ argument parser library";
|
||||
homepage = "https://github.com/Taywee/args";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfilezilla";
|
||||
version = "0.30.0";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-wW322s2y3tT24FFBtGge2pGloboFKQCiSp+E5lpQ3EA=";
|
||||
sha256 = "sha256-mX1Yh7YBXzhp03Wwy8S0lC/LJNvktDRohclGz+czFm8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,76 +1,101 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool
|
||||
, python3, perl, gmpxx, mpfr, boost, eigen, gfortran
|
||||
, enableFMA ? false
|
||||
, python3, perl, gmpxx, mpfr, boost, eigen, gfortran, cmake
|
||||
, enableFMA ? false, enableFortran ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libint2";
|
||||
let
|
||||
pname = "libint";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evaleev";
|
||||
repo = "libint";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pbc2j928jyffhdp4x5bkw68mqmx610qqhnb223vdzr0n2yj5y19";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-paths.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
gfortran
|
||||
mpfr
|
||||
python3
|
||||
perl
|
||||
gmpxx
|
||||
];
|
||||
|
||||
buildInputs = [ boost ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
configureFlags = [
|
||||
"--enable-eri=2"
|
||||
"--enable-eri3=2"
|
||||
"--enable-eri2=2"
|
||||
"--with-eri-max-am=7,5,4"
|
||||
"--with-eri-opt-am=3"
|
||||
"--with-eri3-max-am=7"
|
||||
"--with-eri2-max-am=7"
|
||||
"--with-g12-max-am=5"
|
||||
"--with-g12-opt-am=3"
|
||||
"--with-g12dkh-max-am=5"
|
||||
"--with-g12dkh-opt-am=3"
|
||||
"--enable-contracted-ints"
|
||||
"--enable-shared"
|
||||
] ++ lib.optional enableFMA "--enable-fma";
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
# build the fortran interface file
|
||||
cd export/fortran
|
||||
make libint_f.o ENABLE_FORTRAN=yes
|
||||
cd ../..
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp export/fortran/libint_f.mod $out/include/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions";
|
||||
homepage = "https://github.com/evaleev/libint";
|
||||
license = with licenses; [ lgpl3Only gpl3Only ];
|
||||
maintainers = [ maintainers.markuskowa ];
|
||||
maintainers = with maintainers; [ markuskowa sheepforce ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
codeGen = stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evaleev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0pbc2j928jyffhdp4x5bkw68mqmx610qqhnb223vdzr0n2yj5y19";
|
||||
};
|
||||
|
||||
patches = [ ./fix-paths.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
mpfr
|
||||
python3
|
||||
perl
|
||||
gmpxx
|
||||
] ++ lib.optional enableFortran gfortran;
|
||||
|
||||
buildInputs = [ boost eigen ];
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--enable-eri=2"
|
||||
"--enable-eri3=2"
|
||||
"--enable-eri2=2"
|
||||
"--with-eri-max-am=7,5,4"
|
||||
"--with-eri-opt-am=3"
|
||||
"--with-eri3-max-am=7"
|
||||
"--with-eri2-max-am=7"
|
||||
"--with-g12-max-am=5"
|
||||
"--with-g12-opt-am=3"
|
||||
"--with-g12dkh-max-am=5"
|
||||
"--with-g12dkh-opt-am=3"
|
||||
"--enable-contracted-ints"
|
||||
"--enable-shared"
|
||||
] ++ lib.optional enableFMA "--enable-fma"
|
||||
++ lib.optional enableFortran "--enable-fortran";
|
||||
|
||||
makeFlags = [ "export" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp ${pname}-${version}.tgz $out/.
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
inherit meta;
|
||||
};
|
||||
|
||||
codeComp = stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = "${codeGen}/${pname}-${version}.tgz";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
cmake
|
||||
] ++ lib.optional enableFortran gfortran;
|
||||
|
||||
buildInputs = [ boost eigen ];
|
||||
|
||||
# Default is just "double", but SSE2 is available on all x86_64 CPUs.
|
||||
# AVX support is advertised, but does not work in 2.6 (possibly in 2.7).
|
||||
# Fortran interface is incompatible with changing the LIBINT2_REALTYPE.
|
||||
cmakeFlags = [
|
||||
(if enableFortran
|
||||
then "-DENABLE_FORTRAN=ON"
|
||||
else "-DLIBINT2_REALTYPE=libint2::simd::VectorSSEDouble"
|
||||
)
|
||||
];
|
||||
|
||||
# Can only build in the source-tree. A lot of preprocessing magic fails otherwise.
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
inherit meta;
|
||||
};
|
||||
|
||||
in codeComp
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
i686-linux = "linux";
|
||||
x86_64-linux = "linux-64bit";
|
||||
aarch64-linux = "linux-64bit";
|
||||
}.${stdenv.hostPlatform.system}}
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}")}
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "WSME";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
disabled = pythonAtLeast "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "34209b623635a905bcdbc654f53ac814d038da65e4c2bc070ea1745021984079";
|
||||
sha256 = "bd2dfc715bedcc8f4649611bc0c8a238f483dc01cff7102bc1efa6bea207b64b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pbr ];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "amqtt";
|
||||
version = "0.10.0-alpha.4";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "Yakifo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1v5hlcciyicnhwk1xslh3kxyjqaw526fb05pvhjpp3zqrmbxya4d";
|
||||
sha256 = "sha256-27LmNR1KC8w3zRJ7YBlBolQ4Q70ScTPqypMCpU6fO+I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncpg";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "812dafa4c9e264d430adcc0f5899f0dc5413155a605088af696f952d72d36b5e";
|
||||
sha256 = "sha256-3S+gY8M0SCNIfZ3cy0CALwJiLd+L+KbMU4he56LBwMY=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-batch";
|
||||
version = "15.0.0";
|
||||
version = "16.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb";
|
||||
sha256 = "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerinstance";
|
||||
version = "7.0.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "9f624df0664ba80ba886bc96ffe5e468c620eb5b681bc3bc2a28ce26042fd465";
|
||||
sha256 = "7aeb380af71fc35a71d6752fa25eb5b95fdb2a0027fa32e6f50bce87e2622916";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerservice";
|
||||
version = "16.0.0";
|
||||
version = "16.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11";
|
||||
sha256 = "3654c8ace2b8868d0ea9c4c78c74f51e86e23330c7d8a636d132253747e6f3f4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-redis";
|
||||
version = "12.0.0";
|
||||
version = "13.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "8ae563e3df82a2f206d0483ae6f05d93d0d1835111c0bbca7236932521eed356";
|
||||
sha256 = "283f776afe329472c20490b1f2c21c66895058cb06fb941eccda42cc247217f1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bimmer-connected";
|
||||
version = "0.7.15";
|
||||
version = "0.7.18";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "bimmerconnected";
|
||||
repo = "bimmer_connected";
|
||||
rev = version;
|
||||
sha256 = "193m16rrq7mfvzjcq823icdr9fp3i8grqqn3ci8zhcsq6w3vnb90";
|
||||
sha256 = "sha256-90Rli0tiZIO2gtx3EfPXg8U6CSKEmHUiRePjITvov/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, clickclick
|
||||
, decorator
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, flask
|
||||
, inflection
|
||||
, jsonschema
|
||||
|
|
@ -22,14 +23,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "connexion";
|
||||
version = "2.7.0";
|
||||
version = "2.9.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zalando";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "15iflq5403diwda6n6qrpq67wkdcvl3vs0gsg0fapxqnq3a2m7jj";
|
||||
sha256 = "13smcg2w24zr2sv1968g9p9m6f18nqx688c96qdlmldnszgzf5ik";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -54,6 +55,15 @@ buildPythonPackage rec {
|
|||
testfixtures
|
||||
];
|
||||
|
||||
patches = [
|
||||
# No minor release for later versions, https://github.com/zalando/connexion/pull/1402
|
||||
(fetchpatch {
|
||||
name = "allow-later-flask-and-werkzeug-releases.patch";
|
||||
url = "https://github.com/zalando/connexion/commit/4a225d554d915fca17829652b7cb8fe119e14b37.patch";
|
||||
sha256 = "0dys6ymvicpqa3p8269m4yv6nfp58prq3fk1gcx1z61h9kv84g1k";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "connexion" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.9.8";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1yx9ybpw9ppym8k2ky5pxh3f2icpmk887i8ipwixrcrnml3q136p";
|
||||
sha256 = "sha256-D4lVTOiHdsMzqw/1kpNdvk3GX1y/stUaCCplXPu2/88=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymeteireann";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DylanGore";
|
||||
repo = "PyMetEireann";
|
||||
rev = version;
|
||||
sha256 = "1904f8mvv4ghzbniswmdwyj5v71m6y3yn1b4grjvfds05skalm67";
|
||||
sha256 = "sha256-Y0qB5RZykuBk/PNtxikxjsv672NhS6yJWJeSdAe/MoU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvicare";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "somm15";
|
||||
repo = "PyViCare";
|
||||
rev = version;
|
||||
sha256 = "sha256-kddkVu1uj7/85wu5WHekbHewOxUq84bB6mk2pQHlFvY=";
|
||||
sha256 = "sha256-Yur7ZtUBWmszo5KN4TDlLdSxzH5qL0mhJDFN74pH/ss=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "telethon";
|
||||
version = "1.21.1";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Telethon";
|
||||
sha256 = "sha256-mTyDfvdFrd+XKifXv7oM5Riihj0aUOBzclW3ZNI+DvI=";
|
||||
sha256 = "sha256-unVRzkR+lUqtZ/PuukurdXTMoHosb0HlvmmQTm4OwxM=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.58.0";
|
||||
version = "0.58.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aQlsqmssF9Be4vaUfBZxNQAyg6MsS3lAooalPQKRns0=";
|
||||
sha256 = "sha256-oYGfwEXr26RepuwpRQ8hCiqLTpDvz7v9Lit5QY4mT4U=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/aquasecurity/tfsec";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.12.19";
|
||||
version = "0.12.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-keYKYSWQOiO3d38qrMicYWRZ0jpkzhdZhqOr5JcbA4M=";
|
||||
sha256 = "sha256-40r0f+bzzD0M97pbiSoVSJvVvcCizQvw9PPeXhw7U48=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "byacc";
|
||||
version = "20210802";
|
||||
version = "20210808";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
|
||||
];
|
||||
sha256 = "sha256-KUnGftE71nkX8Mm8yFx22ZowkNIRBep2cqh6NQLjzPY=";
|
||||
sha256 = "sha256-8VhSm+nQWUJjx/Eah2FqSeoj5VrGNpElKiME+7x9OoM=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin
|
||||
{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeTextFile
|
||||
, runtimeShell
|
||||
, bash
|
||||
}:
|
||||
|
|
@ -38,12 +38,17 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
doCheck = true;
|
||||
checkInputs =
|
||||
let fakeRustup = writeScriptBin "rustup" ''
|
||||
#!${runtimeShell}
|
||||
shift
|
||||
shift
|
||||
exec "$@"
|
||||
'';
|
||||
let fakeRustup = writeTextFile {
|
||||
name = "fake-rustup";
|
||||
executable = true;
|
||||
destination = "/bin/rustup";
|
||||
text = ''
|
||||
#!${runtimeShell}
|
||||
shift
|
||||
shift
|
||||
exec "$@"
|
||||
'';
|
||||
};
|
||||
in [
|
||||
rustfmt
|
||||
fakeRustup # the test suite insists in calling `rustup run nightly rustfmt`
|
||||
|
|
|
|||
|
|
@ -1,27 +1,23 @@
|
|||
{ stdenv, lib, fetchurl, unzip }:
|
||||
|
||||
let
|
||||
# You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version`
|
||||
version = "3.5.37";
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||
fetchurl
|
||||
{
|
||||
url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip";
|
||||
sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl
|
||||
{
|
||||
url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip";
|
||||
sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw=";
|
||||
}
|
||||
else throw "Not supported on ${stdenv.hostPlatform.system}";
|
||||
platform =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then {
|
||||
name = "x86_64-unknown-linux-musl";
|
||||
sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw=";
|
||||
} else if stdenv.hostPlatform.system == "x86_64-darwin" then {
|
||||
name = "x86_64-apple-darwin";
|
||||
sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck=";
|
||||
} else throw "Not supported on ${stdenv.hostPlatform.system}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tabnine";
|
||||
# You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version`
|
||||
version = "3.5.37";
|
||||
|
||||
inherit version src;
|
||||
src = fetchurl {
|
||||
url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip";
|
||||
inherit (platform) sha256;
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
|
@ -40,6 +36,8 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.platform = platform.name;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tabnine.com";
|
||||
description = "Smart Compose for code that uses deep learning to help you write code faster";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "12.22.4";
|
||||
sha256 = "0k6dwkhpmjcdb71zd92a5v0l82rsk06p57iyjby84lhy2fmlxka4";
|
||||
version = "12.22.5";
|
||||
sha256 = "057xhxk440pxlgqpblsh4vfwmfzy0fx1h6q3jr2j79y559ngy9zr";
|
||||
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "14.17.4";
|
||||
sha256 = "0b6gadc53r07gx6qr6281ifr5m9bgprmfdqyz9zh5j7qhkkz8yxf";
|
||||
version = "14.17.5";
|
||||
sha256 = "1a0zj505nhpfcj19qvjy2hvc5a7gadykv51y0rc6032qhzzsgca2";
|
||||
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "16.6.1";
|
||||
sha256 = "0mz5wfhf2k1qf3d57h4r8b30izhyg93g5m9c8rljlzy6ih2ymcbr";
|
||||
version = "16.6.2";
|
||||
sha256 = "1svrkm2zq8dyvw2l7gvgm75x2fqarkbpc33970521r3iz6hwp547";
|
||||
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
|
||||
}
|
||||
|
|
|
|||
71
pkgs/games/liberation-circuit/default.nix
Normal file
71
pkgs/games/liberation-circuit/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, git, makeWrapper, allegro5, libGL }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liberation-circuit";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linleyh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "BAv0wEJw4pK77jV+1bWPHeqyU/u0HtZLBF3ETUoQEAk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Linux packaging assets
|
||||
(fetchurl {
|
||||
url = "https://github.com/linleyh/liberation-circuit/commit/72c1f6f4100bd227540aca14a535e7f4ebdeb851.patch";
|
||||
sha256 = "0sad1z1lls0hanv88g1q6x5qr4s8f5p42s8j8v55bmwsdc0s5qys";
|
||||
})
|
||||
];
|
||||
|
||||
# Hack to make binary diffs work
|
||||
prePatch = ''
|
||||
function patch {
|
||||
git apply --whitespace=nowarn "$@"
|
||||
}
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
unset -f patch
|
||||
substituteInPlace bin/launcher.sh --replace ./libcirc ./liberation-circuit
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake git makeWrapper ];
|
||||
buildInputs = [ allegro5 libGL ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DALLEGRO_LIBRARY=${lib.getDev allegro5}"
|
||||
"-DALLEGRO_INCLUDE_DIR=${lib.getDev allegro5}/include"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_LINK = "-lallegro_image -lallegro_primitives -lallegro_color -lallegro_acodec -lallegro_audio -lallegro_dialog -lallegro_font -lallegro_main -lallegro -lm";
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt
|
||||
cd ..
|
||||
cp -r bin $out/opt/liberation-circuit
|
||||
chmod +x $out/opt/liberation-circuit/launcher.sh
|
||||
makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit
|
||||
|
||||
install -D linux-packaging/liberation-circuit.desktop $out/share/applications/liberation-circuit.desktop
|
||||
install -D linux-packaging/liberation-circuit.appdata.xml $out/share/metainfo/liberation-circuit.appdata.xml
|
||||
install -D linux-packaging/icon-256px.png $out/share/pixmaps/liberation-circuit.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Real-time strategy game with programmable units";
|
||||
longDescription = ''
|
||||
Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C.
|
||||
'';
|
||||
homepage = "https://linleyh.itch.io/liberation-circuit";
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sndio";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.sndio.org/sndio-${version}.tar.gz";
|
||||
sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703";
|
||||
url = "https://www.sndio.org/sndio-${version}.tar.gz";
|
||||
sha256 = "08b33bbrhbva1lyzzsj5k6ggcqzrfjfhb2n99a0b8b07kqc3f7gq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.sndio.org";
|
||||
homepage = "https://www.sndio.org";
|
||||
description = "Small audio and MIDI framework part of the OpenBSD project";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ chiiruno ];
|
||||
|
|
|
|||
|
|
@ -126,8 +126,8 @@ self: super: {
|
|||
buildInputs = [ tabnine ];
|
||||
|
||||
postFixup = ''
|
||||
mkdir $target/binaries
|
||||
ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s)
|
||||
mkdir -p $target/binaries/${tabnine.version}
|
||||
ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform}
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fwts";
|
||||
version = "20.11.00";
|
||||
version = "21.07.00";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
|
||||
sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr";
|
||||
sha256 = "sha256-cTm8R7sUJk5aTjXvsxfBXX0J/ehVoqo43ILZ6VqaPTI=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "headscale";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juanfont";
|
||||
repo = "headscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AclIH2Gd8U/Hfy24KOFic/np4qAWELlIMfsPCSkdjog=";
|
||||
sha256 = "sha256-RZwuoA9z+UnjQlqDqHMSaSKIuKu/qGBh5VBNrzeuac0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UIBH6Pf2mmXBsdFW0RRvedLQhonNsrl4j2fxxRtum4M=";
|
||||
vendorSha256 = "sha256-EnTp4KgFyNGCLK5p1mE0yJLdFrhsLsmsSGJnDyWUVKo=";
|
||||
|
||||
# Ldflags are same as build target in the project's Makefile
|
||||
# https://github.com/juanfont/headscale/blob/main/Makefile
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,25 +8,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libreddit";
|
||||
version = "0.10.1";
|
||||
version = "0.14.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spikecodes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0f5xla6fgq4l9g95gwwvfxksaxj4zpayrsjacf53akjpxaqvqxdj";
|
||||
sha256 = "1z3qhlf0i4s3jqh0dml75912sikdvv2hxclai4my6wryk78v6099";
|
||||
};
|
||||
|
||||
cargoSha256 = "039k6kncdgy6q2lbcssj5dm9npk0yss5m081ps4nmdj2vjrkphf0";
|
||||
cargoSha256 = "0qdxhj9i3rhhnyla2glb2b45c51kyam8qg0038banwz9nw86jdjf";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoPatches = [
|
||||
# Patch file to add/update Cargo.lock in the source code
|
||||
# https://github.com/spikecodes/libreddit/issues/191
|
||||
./add-Cargo.lock.patch
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) libreddit;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "unstable-2021-07-01";
|
||||
version = "unstable-2021-08-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = "mautrix-signal";
|
||||
rev = "56eb24412fcafb4836f29375fba9cc6db1715d6f";
|
||||
sha256 = "10nbfl48yb7h23znkxvkqh1dgp2xgldvxsigwfmwa1qbq0l4dljl";
|
||||
rev = "a592baaaa6c9ab7ec29edc84f069b9e9e2fc1b03";
|
||||
sha256 = "0rvidf4ah23x8m7k7hbkwm2xrs838wnli99gh99b5hr6fqmacbwl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -23,21 +23,24 @@ let
|
|||
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-telegram";
|
||||
version = "0.10.0";
|
||||
version = "unstable-2021-08-12";
|
||||
disabled = python.pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lLVKD+/pKqs8oWBdyL+R1lk22LqQOC9nbMlxhCK39xA=";
|
||||
rev = "ec64c83cb01791525a39f937f3b847368021dce8";
|
||||
sha256 = "0rg4f4abdddhhf1xpz74y4468dv3mnm7k8nj161r1xszrk9f2n76";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ];
|
||||
postPatch = ''
|
||||
sed -i -e '/alembic>/d' requirements.txt
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "telethon>=1.22,<1.23" "telethon"
|
||||
'';
|
||||
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; ([
|
||||
Mako
|
||||
aiohttp
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-agent";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "agent";
|
||||
sha256 = "sha256-sKD9ulA6iaaI5yMja0ohDlXDNH4jZzyJWlXdvJo3Q2g=";
|
||||
sha256 = "sha256-yTCFMnOSRgMqL9KD26cYeJcQ1rrUBOf8I+i7IPExP9I=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MZGOZB/mS3pmZuI35E/QkaNLLhbuW2DfZiih9OCXMj0=";
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.6.4881-e2e58f321";
|
||||
version = "1.24.0.4930-ab6e1a058";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "02vmisqcrchr48pdx61ysfd9j95i5vyr30k20inx3xk4rj50a3cl";
|
||||
sha256 = "0fhbm2ykk2nx1j619kpzgw32rgbh2snh8g25m7k42cpmg4a3zz4m";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "1wf48h8aqzg5wszp2rcx9mv8xv6xsnqh405z3jna65mxhycf4cv9";
|
||||
sha256 = "0h1vk8ads1jrb5adcpfrz1qdf60jw4wiss9zzcyamfry1ir94n3r";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
|
||||
{ lib, buildGoModule, zip, fetchFromGitHub, makeWrapper, xdg-utils }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils }:
|
||||
let
|
||||
webassets = fetchFromGitHub {
|
||||
owner = "gravitational";
|
||||
|
|
@ -10,14 +10,14 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "teleport";
|
||||
version = "7.0.0";
|
||||
version = "7.0.2";
|
||||
|
||||
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
|
||||
src = fetchFromGitHub {
|
||||
owner = "gravitational";
|
||||
repo = "teleport";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2GQ3IP5jfT6vSni5hfDex09wXrnUmTpcvH2S6zc399I=";
|
||||
sha256 = "sha256-Sj7WQRgEiU5G/MDKFtEy/KJ2g0WENxbCnMA9CNcTUaY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -25,7 +25,7 @@ buildGoModule rec {
|
|||
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
|
||||
tags = [ "webassets_embed" ];
|
||||
|
||||
nativeBuildInputs = [ zip makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
patches = [
|
||||
# https://github.com/NixOS/nixpkgs/issues/120738
|
||||
|
|
@ -41,7 +41,7 @@ buildGoModule rec {
|
|||
mkdir -p build
|
||||
echo "making webassets"
|
||||
cp -r ${webassets}/* webassets/
|
||||
make lib/web/build/webassets.zip
|
||||
make lib/web/build/webassets
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "urserver";
|
||||
version = "3.9.0.2465";
|
||||
version = "3.10.0.2467";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion version) 3}/urserver-${version}.tar.gz";
|
||||
sha256 = "sha256-3DIroodWCMbq1fzPjhuGLk/2fY/qFxFISLzjkjJ4i90=";
|
||||
sha256 = "sha256-IaLRhia6mb4h7x5MbBRtPJxJ3uTlkfOzmoTwYzwfbWA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oil";
|
||||
version = "0.8.12";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||
sha256 = "sha256-M8JdMru2DDcPWa7qQq9m1NQwjI7kVkHvK5I4W5U1XPU=";
|
||||
sha256 = "sha256-xk4io2ZXVupU6mCqmD94k1AaE8Kk0cf3PIx28X6gNjY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xwallpaper";
|
||||
version = "0.7.0";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stoeckmann";
|
||||
repo = "xwallpaper";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bpymspnllbscha8j9y67w9ck2l6yv66zdbknv8s13hz5qi1ishk";
|
||||
sha256 = "sha256-O4VynpP3VJY/p6+NLUuKetwoMfbp93aXTiRoQJkgW+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook installShellFiles ];
|
||||
|
|
|
|||
37
pkgs/tools/admin/drawterm/default.nix
Normal file
37
pkgs/tools/admin/drawterm/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawterm";
|
||||
version = "unstable-2021-08-02";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.9front.org/plan9front/drawterm";
|
||||
rev = "a130d441722ac3f759d2d83b98eb6aef7e84f97e";
|
||||
sha256 = "R+W1XMqQqCrMwgX9lHRhxJPG6ZOvtQrU6HUsKfvfrBQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
xorg.libX11
|
||||
xorg.libXt
|
||||
];
|
||||
|
||||
# TODO: macos
|
||||
makeFlags = [ "CONF=unix" ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 -t $out/bin/ drawterm
|
||||
install -Dm644 -t $out/man/man1/ drawterm.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Connect to Plan9 CPU servers from other operating systems.";
|
||||
homepage = "https://drawterm.9front.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ luc65r ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.40.0";
|
||||
version = "1.40.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zhVG9mtkW0avMTtSnJ36qkxuy4SiiAENrKZqE5mXvaA=";
|
||||
sha256 = "sha256-J5Wid/Xq3wYY+2/RoFgdY5ZDdNQu8TkTF9W6YLvnwvM=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fuse }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "9pfs-20150918";
|
||||
pname = "9pfs";
|
||||
version = "unstable-2015-09-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mischief";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, fuse }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aefs-0.4pre259-8843b7c";
|
||||
pname = "aefs";
|
||||
version = "0.4pre259-8843b7c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tarballs.nixos.org/${name}.tar.bz2";
|
||||
url = "http://tarballs.nixos.org/aefs-${version}.tar.bz2";
|
||||
sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, fuse, libarchive }:
|
||||
|
||||
let
|
||||
name = "archivemount-0.9.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "archivemount";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz";
|
||||
url = "https://www.cybernoia.de/software/archivemount/archivemount-${version}.tar.gz";
|
||||
sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bonnie++-1.98";
|
||||
pname = "bonnie++";
|
||||
version = "1.98";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.coker.com.au/bonnie++/${name}.tgz";
|
||||
url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz";
|
||||
sha256 = "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, fuse, glib, attr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ciopfs-0.4";
|
||||
pname = "ciopfs";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.brain-dump.org/projects/ciopfs/${name}.tar.gz";
|
||||
url = "http://www.brain-dump.org/projects/ciopfs/ciopfs-${version}.tar.gz";
|
||||
sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,10 +9,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "davfs2-1.6.0";
|
||||
pname = "davfs2";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/davfs2/${name}.tar.gz";
|
||||
url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz";
|
||||
sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,12 @@
|
|||
|
||||
throw "It still does not build"
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fsfs-0.1.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fsfs";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz";
|
||||
url = "mirror://sourceforge/fsfs/fsfs-${version}.tar.gz";
|
||||
sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "genext2fs-1.4.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "genext2fs";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz";
|
||||
url = "mirror://sourceforge/genext2fs/genext2fs-${version}.tar.gz";
|
||||
sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0";
|
||||
};
|
||||
|
||||
|
|
|
|||
32
pkgs/tools/filesystems/gfs2-utils/default.nix
Normal file
32
pkgs/tools/filesystems/gfs2-utils/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, autoreconfHook, bison, flex, pkg-config
|
||||
, bzip2, check, ncurses, util-linux, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gfs2-utils";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pagure.io/gfs2-utils/archive/${version}/gfs2-utils-${version}.tar.gz";
|
||||
sha256 = "sha256-gwKxBBG5PtG4/RxX4sUC25ZeG8K2urqVkFDKL7NS4ZI=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "doc" "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];
|
||||
buildInputs = [ bzip2 ncurses util-linux zlib ];
|
||||
|
||||
checkInputs = [ check ];
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pagure.io/gfs2-utils";
|
||||
description = "Tools for creating, checking and working with gfs2 filesystems";
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
license = [ licenses.gpl2Plus licenses.lgpl2Plus ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,10 +2,11 @@
|
|||
, docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "httpfs2-0.1.5";
|
||||
pname = "httpfs2";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/httpfs/httpfs2/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/httpfs/httpfs2/httpfs2-${version}.tar.gz";
|
||||
sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1";
|
||||
};
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue