Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
commit
f5c34205ad
@ -311,6 +311,9 @@ checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix
|
||||
# Test that types.optionType correctly annotates option locations
|
||||
checkConfigError 'The option .theOption.nested. in .other.nix. is already declared in .optionTypeFile.nix.' config.theOption.nested ./optionTypeFile.nix
|
||||
|
||||
# Test that types.optionType leaves types untouched as long as they don't need to be merged
|
||||
checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
14
lib/tests/modules/adhoc-freeformType-survives-type-merge.nix
Normal file
14
lib/tests/modules/adhoc-freeformType-survives-type-merge.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ lib, ... }: {
|
||||
options.dummy = lib.mkOption { type = lib.types.anything; default = {}; };
|
||||
freeformType =
|
||||
let
|
||||
a = lib.types.attrsOf (lib.types.submodule { options.bar = lib.mkOption { }; });
|
||||
in
|
||||
# modifying types like this breaks type merging.
|
||||
# This test makes sure that type merging is not performed when only a single declaration exists.
|
||||
# Don't modify types in practice!
|
||||
a // {
|
||||
merge = loc: defs: { freeformItems = a.merge loc defs; };
|
||||
};
|
||||
config.foo.bar = "ok";
|
||||
}
|
@ -368,13 +368,21 @@ rec {
|
||||
emptyValue = { value = {}; };
|
||||
};
|
||||
|
||||
# derivation is a reserved keyword.
|
||||
# A package is a top-level store path (/nix/store/hash-name). This includes:
|
||||
# - derivations
|
||||
# - more generally, attribute sets with an `outPath` or `__toString` attribute
|
||||
# pointing to a store path, e.g. flake inputs
|
||||
# - strings with context, e.g. "${pkgs.foo}" or (toString pkgs.foo)
|
||||
# - hardcoded store path literals (/nix/store/hash-foo) or strings without context
|
||||
# ("/nix/store/hash-foo"). These get a context added to them using builtins.storePath.
|
||||
package = mkOptionType {
|
||||
name = "package";
|
||||
check = x: isDerivation x || isStorePath x;
|
||||
merge = loc: defs:
|
||||
let res = mergeOneOption loc defs;
|
||||
in if isDerivation res then res else toDerivation res;
|
||||
in if builtins.isPath res || (builtins.isString res && ! builtins.hasContext res)
|
||||
then toDerivation res
|
||||
else res;
|
||||
};
|
||||
|
||||
shellPackage = package // {
|
||||
@ -535,7 +543,9 @@ rec {
|
||||
description = "optionType";
|
||||
check = value: value._type or null == "option-type";
|
||||
merge = loc: defs:
|
||||
let
|
||||
if length defs == 1
|
||||
then (head defs).value
|
||||
else let
|
||||
# Prepares the type definitions for mergeOptionDecls, which
|
||||
# annotates submodules types with file locations
|
||||
optionModules = map ({ value, file }:
|
||||
|
@ -9260,6 +9260,12 @@
|
||||
githubId = 23431373;
|
||||
name = "Christoph Neidahl";
|
||||
};
|
||||
opeik = {
|
||||
email = "sandro@stikic.com";
|
||||
github = "opeik";
|
||||
githubId = 11566773;
|
||||
name = "Sandro Stikić";
|
||||
};
|
||||
orbekk = {
|
||||
email = "kjetil.orbekk@gmail.com";
|
||||
github = "orbekk";
|
||||
|
@ -20,7 +20,7 @@ HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}"
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/122023
|
||||
export LC_ALL=C.UTF-8
|
||||
|
||||
extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
|
||||
extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
|
||||
unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)"
|
||||
config_dir=pkgs/development/haskell-modules/configuration-hackage2nix
|
||||
|
||||
|
@ -22,7 +22,8 @@ merging is handled.
|
||||
|
||||
`types.package`
|
||||
|
||||
: A derivation or a store path.
|
||||
: A top-level store path. This can be an attribute set pointing
|
||||
to a store path, like a derivation or a flake input.
|
||||
|
||||
`types.anything`
|
||||
|
||||
|
@ -43,7 +43,9 @@
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
A derivation or a store path.
|
||||
A top-level store path. This can be an attribute set
|
||||
pointing to a store path, like a derivation or a flake
|
||||
input.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
@ -256,6 +256,13 @@
|
||||
<link xlink:href="options.html#opt-services.ethercalc.enable">services.ethercalc</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://nbd.sourceforge.io/">nbd</link>, a
|
||||
Network Block Device server. Available as
|
||||
<link xlink:href="options.html#opt-services.nbd.server.enable">services.nbd</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://timetagger.app">timetagger</link>,
|
||||
|
@ -75,6 +75,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative
|
||||
spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable).
|
||||
|
||||
- [nbd](https://nbd.sourceforge.io/), a Network Block Device server. Available as [services.nbd](options.html#opt-services.nbd.server.enable).
|
||||
|
||||
- [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable).
|
||||
|
||||
- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable).
|
||||
|
@ -180,6 +180,7 @@
|
||||
./programs/msmtp.nix
|
||||
./programs/mtr.nix
|
||||
./programs/nano.nix
|
||||
./programs/nbd.nix
|
||||
./programs/neovim.nix
|
||||
./programs/nm-applet.nix
|
||||
./programs/npm.nix
|
||||
@ -819,6 +820,7 @@
|
||||
./services/networking/nar-serve.nix
|
||||
./services/networking/nat.nix
|
||||
./services/networking/nats.nix
|
||||
./services/networking/nbd.nix
|
||||
./services/networking/ndppd.nix
|
||||
./services/networking/nebula.nix
|
||||
./services/networking/networkmanager.nix
|
||||
|
19
nixos/modules/programs/nbd.nix
Normal file
19
nixos/modules/programs/nbd.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs.nbd;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
programs.nbd = {
|
||||
enable = mkEnableOption "Network Block Device (nbd) support";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [ nbd ];
|
||||
boot.kernelModules = [ "nbd" ];
|
||||
};
|
||||
}
|
@ -34,6 +34,14 @@ in
|
||||
Repository to add the runner to.
|
||||
|
||||
Changing this option triggers a new runner registration.
|
||||
|
||||
IMPORTANT: If your token is org-wide (not per repository), you need to
|
||||
provide a github org link, not a single repository, so do it like this
|
||||
<literal>https://github.com/nixos</literal>, not like this
|
||||
<literal>https://github.com/nixos/nixpkgs</literal>.
|
||||
Otherwise, you are going to get a <literal>404 NotFound</literal>
|
||||
from <literal>POST https://api.github.com/actions/runner-registration</literal>
|
||||
in the configure script.
|
||||
'';
|
||||
example = "https://github.com/nixos/nixpkgs";
|
||||
};
|
||||
|
146
nixos/modules/services/networking/nbd.nix
Normal file
146
nixos/modules/services/networking/nbd.nix
Normal file
@ -0,0 +1,146 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.nbd;
|
||||
configFormat = pkgs.formats.ini { };
|
||||
iniFields = with types; attrsOf (oneOf [ bool int float str ]);
|
||||
serverConfig = configFormat.generate "nbd-server-config"
|
||||
({
|
||||
generic =
|
||||
(cfg.server.extraOptions // {
|
||||
user = "root";
|
||||
group = "root";
|
||||
port = cfg.server.listenPort;
|
||||
} // (optionalAttrs (cfg.server.listenAddress != null) {
|
||||
listenaddr = cfg.server.listenAddress;
|
||||
}));
|
||||
}
|
||||
// (mapAttrs
|
||||
(_: { path, allowAddresses, extraOptions }:
|
||||
extraOptions // {
|
||||
exportname = path;
|
||||
} // (optionalAttrs (allowAddresses != null) {
|
||||
authfile = pkgs.writeText "authfile" (concatStringsSep "\n" allowAddresses);
|
||||
}))
|
||||
cfg.server.exports)
|
||||
);
|
||||
splitLists =
|
||||
partition
|
||||
(path: hasPrefix "/dev/" path)
|
||||
(mapAttrsToList (_: { path, ... }: path) cfg.server.exports);
|
||||
allowedDevices = splitLists.right;
|
||||
boundPaths = splitLists.wrong;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.nbd = {
|
||||
server = {
|
||||
enable = mkEnableOption "the Network Block Device (nbd) server";
|
||||
|
||||
listenPort = mkOption {
|
||||
type = types.port;
|
||||
default = 10809;
|
||||
description = "Port to listen on. The port is NOT automatically opened in the firewall.";
|
||||
};
|
||||
|
||||
extraOptions = mkOption {
|
||||
type = iniFields;
|
||||
default = {
|
||||
allowlist = false;
|
||||
};
|
||||
description = ''
|
||||
Extra options for the server. See
|
||||
<citerefentry><refentrytitle>nbd-server</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
exports = mkOption {
|
||||
description = "Files or block devices to make available over the network.";
|
||||
default = { };
|
||||
type = with types; attrsOf
|
||||
(submodule {
|
||||
options = {
|
||||
path = mkOption {
|
||||
type = str;
|
||||
description = "File or block device to export.";
|
||||
example = "/dev/sdb1";
|
||||
};
|
||||
|
||||
allowAddresses = mkOption {
|
||||
type = nullOr (listOf str);
|
||||
default = null;
|
||||
example = [ "10.10.0.0/24" "127.0.0.1" ];
|
||||
description = "IPs and subnets that are authorized to connect for this device. If not specified, the server will allow all connections.";
|
||||
};
|
||||
|
||||
extraOptions = mkOption {
|
||||
type = iniFields;
|
||||
default = {
|
||||
flush = true;
|
||||
fua = true;
|
||||
};
|
||||
description = ''
|
||||
Extra options for this export. See
|
||||
<citerefentry><refentrytitle>nbd-server</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
type = with types; nullOr str;
|
||||
description = "Address to listen on. If not specified, the server will listen on all interfaces.";
|
||||
default = null;
|
||||
example = "10.10.0.1";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.server.enable {
|
||||
boot.kernelModules = [ "nbd" ];
|
||||
|
||||
systemd.services.nbd-server = {
|
||||
after = [ "network-online.target" ];
|
||||
before = [ "multi-user.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.nbd}/bin/nbd-server -C ${serverConfig}";
|
||||
Type = "forking";
|
||||
|
||||
DeviceAllow = map (path: "${path} rw") allowedDevices;
|
||||
BindPaths = boundPaths;
|
||||
|
||||
CapabilityBoundingSet = "";
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = false;
|
||||
PrivateMounts = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "noaccess";
|
||||
ProtectSystem = "strict";
|
||||
RestrictAddressFamilies = "AF_INET AF_INET6";
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -8,12 +8,7 @@ let
|
||||
homeDir = "/var/lib/tox-node";
|
||||
|
||||
configFile = let
|
||||
# fetchurl should be switched to getting this file from tox-node.src once
|
||||
# the dpkg directory is in a release
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/tox-rs/tox-node/master/dpkg/config.yml";
|
||||
sha256 = "1431wzpzm786mcvyzk1rp7ar418n45dr75hdggxvlm7pkpam31xa";
|
||||
};
|
||||
src = "${pkg.src}/dpkg/config.yml";
|
||||
confJSON = pkgs.writeText "config.json" (
|
||||
builtins.toJSON {
|
||||
log-type = cfg.logType;
|
||||
|
@ -329,6 +329,7 @@ in
|
||||
nat.standalone = handleTest ./nat.nix { withFirewall = false; };
|
||||
nats = handleTest ./nats.nix {};
|
||||
navidrome = handleTest ./navidrome.nix {};
|
||||
nbd = handleTest ./nbd.nix {};
|
||||
ncdns = handleTest ./ncdns.nix {};
|
||||
ndppd = handleTest ./ndppd.nix {};
|
||||
nebula = handleTest ./nebula.nix {};
|
||||
|
87
nixos/tests/nbd.nix
Normal file
87
nixos/tests/nbd.nix
Normal file
@ -0,0 +1,87 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
let
|
||||
listenPort = 30123;
|
||||
testString = "It works!";
|
||||
mkCreateSmallFileService = { path, loop ? false }: {
|
||||
script = ''
|
||||
${pkgs.coreutils}/bin/dd if=/dev/zero of=${path} bs=1K count=100
|
||||
${pkgs.lib.optionalString loop
|
||||
"${pkgs.util-linux}/bin/losetup --find ${path}"}
|
||||
'';
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
before = [ "nbd-server.service" ];
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "nbd";
|
||||
|
||||
nodes = {
|
||||
server = { config, pkgs, ... }: {
|
||||
# Create some small files of zeros to use as the ndb disks
|
||||
## `vault-pub.disk` is accessible from any IP
|
||||
systemd.services.create-pub-file =
|
||||
mkCreateSmallFileService { path = "/vault-pub.disk"; };
|
||||
## `vault-priv.disk` is accessible only from localhost.
|
||||
## It's also a loopback device to test exporting /dev/...
|
||||
systemd.services.create-priv-file =
|
||||
mkCreateSmallFileService { path = "/vault-priv.disk"; loop = true; };
|
||||
|
||||
# Needed only for nbd-client used in the tests.
|
||||
environment.systemPackages = [ pkgs.nbd ];
|
||||
|
||||
# Open the nbd port in the firewall
|
||||
networking.firewall.allowedTCPPorts = [ listenPort ];
|
||||
|
||||
# Run the nbd server and expose the small file created above
|
||||
services.nbd.server = {
|
||||
enable = true;
|
||||
exports = {
|
||||
vault-pub = {
|
||||
path = "/vault-pub.disk";
|
||||
};
|
||||
vault-priv = {
|
||||
path = "/dev/loop0";
|
||||
allowAddresses = [ "127.0.0.1" "::1" ];
|
||||
};
|
||||
};
|
||||
listenAddress = "0.0.0.0";
|
||||
listenPort = listenPort;
|
||||
};
|
||||
};
|
||||
|
||||
client = { config, pkgs, ... }: {
|
||||
programs.nbd.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
testString = "${testString}"
|
||||
|
||||
start_all()
|
||||
server.wait_for_open_port(${toString listenPort})
|
||||
|
||||
# Client: Connect to the server, write a small string to the nbd disk, and cleanly disconnect
|
||||
client.succeed("nbd-client server ${toString listenPort} /dev/nbd0 -name vault-pub -persist")
|
||||
client.succeed(f"echo '{testString}' | dd of=/dev/nbd0 conv=notrunc")
|
||||
client.succeed("nbd-client -d /dev/nbd0")
|
||||
|
||||
# Server: Check that the string written by the client is indeed in the file
|
||||
foundString = server.succeed(f"dd status=none if=/vault-pub.disk count={len(testString)}")[:len(testString)]
|
||||
if foundString != testString:
|
||||
raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'")
|
||||
|
||||
# Client: Fail to connect to the private disk
|
||||
client.fail("nbd-client server ${toString listenPort} /dev/nbd0 -name vault-priv -persist")
|
||||
|
||||
# Server: Successfully connect to the private disk
|
||||
server.succeed("nbd-client localhost ${toString listenPort} /dev/nbd0 -name vault-priv -persist")
|
||||
server.succeed(f"echo '{testString}' | dd of=/dev/nbd0 conv=notrunc")
|
||||
foundString = server.succeed(f"dd status=none if=/dev/loop0 count={len(testString)}")[:len(testString)]
|
||||
if foundString != testString:
|
||||
raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'")
|
||||
server.succeed("nbd-client -d /dev/nbd0")
|
||||
'';
|
||||
})
|
@ -1,26 +1,62 @@
|
||||
{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }:
|
||||
{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
|
||||
|
||||
# As of 2.1, puddletag has started pinning versions of all dependencies that it
|
||||
# was built against which is an issue as the chances of us having the exact same
|
||||
# versions in nixpkgs are slim to none.
|
||||
#
|
||||
# There is a difference between explicit and implicit version requirements and
|
||||
# we should be able to safely ignore the latter. Therefore use requirements.in
|
||||
# which contains just the explicit version dependencies instead of
|
||||
# requirements.txt.
|
||||
#
|
||||
# Additionally, we do need to override some of the explicit requirements through
|
||||
# `overrideVersions`. While we technically run the risk of breaking something by
|
||||
# ignoring the pinned versions, it's just something we will have to accept
|
||||
# unless we want to vendor those versions.
|
||||
|
||||
let
|
||||
# NOTE: check if we can drop any of these overrides when bumping the version
|
||||
overrideVersions = [
|
||||
"pyparsing"
|
||||
"pyqt5"
|
||||
];
|
||||
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "puddletag";
|
||||
version = "2.0.1";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keithgg";
|
||||
owner = "puddletag";
|
||||
repo = "puddletag";
|
||||
rev = version;
|
||||
sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ=";
|
||||
hash = "sha256-eilETaFvvPMopIbccV1uLbpD55kHX9KGTCcGVXaHPgM=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/source";
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace share/pixmaps share/icons
|
||||
|
||||
cp requirements.in requirements.txt
|
||||
'' + lib.concatMapStringsSep "\n"
|
||||
(e: ''
|
||||
sed -i requirements.txt -e 's/^${e}.*/${e}/'
|
||||
'')
|
||||
overrideVersions;
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyacoustid
|
||||
chromaprint
|
||||
configobj
|
||||
levenshtein
|
||||
lxml
|
||||
mutagen
|
||||
pyparsing
|
||||
pyqt5
|
||||
]);
|
||||
rapidfuzz
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
@ -33,8 +69,8 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "An audio tag editor similar to the Windows program, Mp3tag";
|
||||
homepage = "https://docs.puddletag.net";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ peterhoeg dschrempf ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roomeqwizard";
|
||||
version = "5.20.4";
|
||||
version = "5.20.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh";
|
||||
sha256 = "0m2b5hwazy4vyjk51cmayys250rircs3c0v7bv5mn28h7hyq29s8";
|
||||
sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -39,6 +39,7 @@
|
||||
, which
|
||||
, xkb-switch
|
||||
, ycmd
|
||||
, zoxide
|
||||
, nodejs
|
||||
|
||||
# test dependencies
|
||||
@ -693,6 +694,17 @@ self: super: {
|
||||
dependencies = with self; [ telescope-nvim ];
|
||||
});
|
||||
|
||||
telescope-zoxide = super.telescope-zoxide.overrideAttrs (old: {
|
||||
dependencies = with self; [ telescope-nvim ];
|
||||
|
||||
buildInputs = [ zoxide ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lua/telescope/_extensions/zoxide/config.lua \
|
||||
--replace "zoxide query -ls" "${zoxide}/bin/zoxide query -ls"
|
||||
'';
|
||||
});
|
||||
|
||||
tup =
|
||||
let
|
||||
# Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim
|
||||
@ -1076,6 +1088,15 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
zoxide-vim = super.zoxide-vim.overrideAttrs (old: {
|
||||
buildInputs = [ zoxide ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace autoload/zoxide.vim \
|
||||
--replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'"
|
||||
'';
|
||||
});
|
||||
|
||||
} // (
|
||||
let
|
||||
nodePackageNames = [
|
||||
|
@ -347,6 +347,7 @@ justincampbell/vim-eighties
|
||||
justinj/vim-pico8-syntax
|
||||
justinmk/vim-dirvish
|
||||
justinmk/vim-sneak
|
||||
jvgrootveld/telescope-zoxide
|
||||
jvirtanen/vim-hcl
|
||||
jvoorhis/coq.vim
|
||||
KabbAmine/vCoolor.vim
|
||||
@ -520,6 +521,7 @@ mzlogin/vim-markdown-toc
|
||||
mzlogin/vim-smali
|
||||
nacro90/numb.nvim
|
||||
nanotech/jellybeans.vim
|
||||
nanotee/zoxide.vim
|
||||
natebosch/vim-lsc
|
||||
nathanaelkane/vim-indent-guides
|
||||
nathangrigg/vim-beancount
|
||||
|
@ -41,12 +41,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49.zip";
|
||||
sha256 = "15rp55vr0h2954zl1rllsnriv64qab8fzsp0aprnpx1s5b14xjpm";
|
||||
hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook autoconf-archive ]
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
autoconf-archive
|
||||
] ++ lib.optional enableOpusfile [
|
||||
# configure.ac uses pkg-config only to locate libopusfile
|
||||
++ lib.optional enableOpusfile pkg-config;
|
||||
pkg-config
|
||||
];
|
||||
|
||||
patches = [ ./0001-musl-rewind-pipe-workaround.patch ];
|
||||
|
||||
|
@ -1,76 +1,99 @@
|
||||
{ stdenv, fetchurl, lib, makeWrapper, electron_16, makeDesktopItem, graphicsmagick
|
||||
, writeScript }:
|
||||
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, lib
|
||||
, makeWrapper
|
||||
, electron_16
|
||||
, makeDesktopItem
|
||||
, graphicsmagick
|
||||
, writeScript
|
||||
, undmg
|
||||
, unzip
|
||||
}:
|
||||
let
|
||||
electron = electron_16;
|
||||
icon = fetchurl {
|
||||
url =
|
||||
"https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
|
||||
sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "obsidian";
|
||||
desktopName = "Obsidian";
|
||||
comment = "Knowledge base";
|
||||
icon = "obsidian";
|
||||
exec = "obsidian";
|
||||
categories = [ "Office" ];
|
||||
};
|
||||
|
||||
updateScript = writeScript "obsidian-updater" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')"
|
||||
|
||||
update-source-version obsidian "$latestVersion"
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "0.13.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
|
||||
sha256 = "ymdqdDD7WWfol/jLBsz8tEzcN7Ed1HSIrkuA51cvKKw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper graphicsmagick ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/obsidian \
|
||||
--add-flags $out/share/obsidian/app.asar
|
||||
|
||||
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
|
||||
install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
|
||||
|
||||
install -m 444 -D "${desktopItem}/share/applications/"* \
|
||||
-t $out/share/applications/
|
||||
|
||||
for size in 16 24 32 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = updateScript;
|
||||
|
||||
version = "0.13.31";
|
||||
meta = with lib; {
|
||||
description =
|
||||
"A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
homepage = "https://obsidian.md";
|
||||
downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
|
||||
license = licenses.obsidian;
|
||||
maintainers = with maintainers; [ conradmearns zaninime ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ conradmearns zaninime opeik ];
|
||||
};
|
||||
}
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}${extension}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
sha256 = rec {
|
||||
x86_64-linux = "v3Zm5y8V1KyWDQeJxhryBojz56OTT7gfT+pLGDUD4zs=";
|
||||
x86_64-darwin = "m/81uuDhMJJ1tHTUPww+xNdwsaYCOmeNtbjdwMAwhBU=";
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
}.${system};
|
||||
|
||||
extension = rec {
|
||||
x86_64-linux = ".tar.gz";
|
||||
x86_64-darwin = "-universal.dmg";
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
}.${system};
|
||||
|
||||
linux = stdenv.mkDerivation rec {
|
||||
icon = fetchurl {
|
||||
url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
|
||||
sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "obsidian";
|
||||
desktopName = "Obsidian";
|
||||
comment = "Knowledge base";
|
||||
icon = "obsidian";
|
||||
exec = "obsidian";
|
||||
categories = [ "Office" ];
|
||||
};
|
||||
|
||||
inherit pname version src;
|
||||
meta.platforms = [ "x86_64-linux" ];
|
||||
nativeBuildInputs = [ makeWrapper graphicsmagick ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${electron_16}/bin/electron $out/bin/obsidian \
|
||||
--add-flags $out/share/obsidian/app.asar
|
||||
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
|
||||
install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
|
||||
install -m 444 -D "${desktopItem}/share/applications/"* \
|
||||
-t $out/share/applications/
|
||||
for size in 16 24 32 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
|
||||
done
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "updater" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
set -eu -o pipefail
|
||||
latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')"
|
||||
update-source-version obsidian "$latestVersion"
|
||||
'';
|
||||
};
|
||||
|
||||
darwin = stdenv.mkDerivation rec {
|
||||
appname = "Obsidian";
|
||||
inherit pname version src;
|
||||
meta.platforms = [ "x86_64-darwin" "aarch64-darwin" ];
|
||||
sourceRoot = "${appname}.app";
|
||||
nativeBuildInputs = [ makeWrapper undmg unzip ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{Applications/${appname}.app,bin}
|
||||
cp -R . $out/Applications/${appname}.app
|
||||
makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname}
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin then darwin else linux
|
||||
|
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, asciidoc
|
||||
, cmark
|
||||
, lmdb
|
||||
, lmdbxx
|
||||
@ -32,19 +33,20 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nheko";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "nheko";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KnWZ1DSTg8vtNSlpG5LGUG8YDHt25s9pMLpLuj0WLnM=";
|
||||
sha256 = "sha256-roC1OIq0Vmj5rABNtH4IOMHX9aSlOMFC7ZHueuj/PmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
lmdbxx
|
||||
cmake
|
||||
pkg-config
|
||||
asciidoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -1,18 +1,27 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ipfs-cluster";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
|
||||
vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc=";
|
||||
vendorSha256 = "sha256-ykUjq7Svp3+kUNnFkwsBlC+C4nws6Yvu3bk2Wb4c8vY=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs";
|
||||
repo = "ipfs-cluster";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ=";
|
||||
sha256 = "sha256-Xb7QbBmCJKgokxvdbtWxtnNIS/iUsYFLlRzgfoABAq8=";
|
||||
};
|
||||
|
||||
# Remove patch when updating to >0.14.5
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-distribution-test.patch";
|
||||
url = "https://github.com/ipfs/ipfs-cluster/pull/1589/commits/49825d1df76f848806f1d76abce5e279221cc8c5.patch";
|
||||
sha256 = "sha256-mM2rc4ai/qhbvxnoRw5jO7BTRlD2/Tp037EuqqS49DE=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
|
||||
homepage = "https://cluster.ipfs.io/";
|
||||
|
@ -102,9 +102,6 @@ in stdenvNoCC.mkDerivation (args // {
|
||||
# gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping
|
||||
dontWrapGApps = args.dontWrapGApps or true;
|
||||
|
||||
DOTNET_NOLOGO = args.DOTNET_NOLOGO or true; # This disables the welcome message.
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT = args.DOTNET_CLI_TELEMETRY_OPTOUT or true;
|
||||
|
||||
passthru = {
|
||||
fetch-deps = writeScript "fetch-${pname}-deps" ''
|
||||
set -euo pipefail
|
||||
|
@ -9,8 +9,6 @@ dotnetConfigureHook() {
|
||||
parallelFlag="--disable-parallel"
|
||||
fi
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
for project in ${projectFile[@]} ${testProjectFile[@]}; do
|
||||
env \
|
||||
dotnet restore "$project" \
|
||||
|
30
pkgs/data/fonts/source-sans-pro/default.nix
Normal file
30
pkgs/data/fonts/source-sans-pro/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
# Source Sans Pro got renamed to Source Sans 3 (see
|
||||
# https://github.com/adobe-fonts/source-sans/issues/192). This is the
|
||||
# last version named "Pro". It is useful for backward compatibility
|
||||
# with older documents/templates/etc.
|
||||
let
|
||||
version = "3.006";
|
||||
in fetchzip {
|
||||
name = "source-sans-pro-${version}";
|
||||
|
||||
url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/{opentype,truetype,variable}
|
||||
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
|
||||
'';
|
||||
|
||||
sha256 = "sha256-uWr/dFyLF65v0o6+oN/3RQoe4ziPspzGB1rgiBkoTYY=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://adobe-fonts.github.io/source-sans/";
|
||||
description = "Sans serif font family for user interface environments";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
};
|
||||
}
|
30
pkgs/data/fonts/source-serif-pro/default.nix
Normal file
30
pkgs/data/fonts/source-serif-pro/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
# Source Serif Pro got renamed to Source Serif 4 (see
|
||||
# https://github.com/adobe-fonts/source-serif/issues/77). This is the
|
||||
# last version named "Pro". It is useful for backward compatibility
|
||||
# with older documents/templates/etc.
|
||||
let
|
||||
version = "3.001";
|
||||
in fetchzip {
|
||||
name = "source-serif-pro-${version}";
|
||||
|
||||
url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-pro-${version}R.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/{opentype,truetype,variable}
|
||||
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
|
||||
'';
|
||||
|
||||
sha256 = "sha256-rYWk8D41QMuuSP+cQMk8ttT7uX3a7gBk4OqjA7K9udk=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://adobe-fonts.github.io/source-serif/";
|
||||
description = "Typeface for setting text in many sizes, weights, and languages. Designed to complement Source Sans";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
};
|
||||
}
|
@ -4,16 +4,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unifont";
|
||||
version = "14.0.01";
|
||||
version = "14.0.02";
|
||||
|
||||
ttf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
|
||||
sha256 = "19algkm4nnixmzshc25rjgh8gfccqinallgi86wgvkcwcmn6ccn6";
|
||||
# Unfortunately the 14.0.02 TTF file is not available on the GNU mirror.
|
||||
# Restore this for next version: "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
|
||||
url = "https://unifoundry.com/pub/unifont/${pname}-${version}/font-builds/${pname}-${version}.ttf";
|
||||
sha256 = "1c8rdk3xg6j8lrzxddd73jppfgpk253jdkch63rr7n2d7ljp9gc3";
|
||||
};
|
||||
|
||||
pcf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
|
||||
sha256 = "1aj29pswi6qwpvjwncv5w3ndwy2nzli0200i6dx6f80036z8nz9i";
|
||||
sha256 = "0hcl1zihm91xwvh5ds01sybgs0j8zsrrhn4wlz5j6ji99rh797jr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "14.0.01";
|
||||
version = "14.0.02";
|
||||
in fetchzip rec {
|
||||
name = "unifont_upper-${version}";
|
||||
|
||||
@ -9,7 +9,7 @@ in fetchzip rec {
|
||||
|
||||
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
|
||||
|
||||
sha256 = "0sb3m2qg0ri7zmxhjvrq8n0jmxxjx8rrx9rpibh5f5fbfkibq4gm";
|
||||
sha256 = "0p1c2kkg20jqddy828yj6sxfwgv8k5gxwmg0cybalrjb0s09kcs8";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-arcmenu";
|
||||
version = "23";
|
||||
version = "24";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arcmenu";
|
||||
repo = "ArcMenu";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i/sXAZhNbbVbKdCJ3k9kRAEY9iC5iSNq4YtjiiOqHTM=";
|
||||
sha256 = "sha256-GbZt6JC+uAPkb4GU1Q7WRJ6Pf95Uh48cYwvoTgLimHs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
File diff suppressed because one or more lines are too long
@ -4,9 +4,11 @@
|
||||
}:
|
||||
|
||||
assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
|
||||
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, writeText
|
||||
, libunwind
|
||||
, openssl
|
||||
, icu
|
||||
@ -87,6 +89,13 @@ in stdenv.mkDerivation rec {
|
||||
$out/bin/dotnet --info
|
||||
'';
|
||||
|
||||
setupHook = writeText "dotnet-setup-hook" ''
|
||||
export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files
|
||||
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk
|
||||
export DOTNET_NOLOGO=1 # Disables the welcome message
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dotnet.github.io/";
|
||||
description = builtins.getAttr type descriptions;
|
||||
|
@ -1,19 +1,14 @@
|
||||
{ lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2
|
||||
{ lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_2
|
||||
, fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers
|
||||
}:
|
||||
|
||||
lib.throwIfNot (lib.versionOlder ocaml.version "4.13")
|
||||
"reason is not available for OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-reason";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "reason";
|
||||
rev = "daa11255cb4716ce1c370925251021bd6e3bd974";
|
||||
sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz";
|
||||
sha256 = "sha256:0yc94m3ddk599crg33yxvkphxpy54kmdsl599c320wvn055p4y4l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -42,11 +37,13 @@ stdenv.mkDerivation rec {
|
||||
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR
|
||||
wrapProgram $out/bin/rtop \
|
||||
--prefix PATH : "${utop}/bin" \
|
||||
--prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \
|
||||
--prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
@ -5186,7 +5186,6 @@ broken-packages:
|
||||
- unfix-binders
|
||||
- unfoldable
|
||||
- unicode-prelude
|
||||
- unicode-show
|
||||
- unicode-symbols
|
||||
- unicode-tricks
|
||||
- uniform-fileio
|
||||
|
@ -279392,8 +279392,6 @@ self: {
|
||||
testHaskellDepends = [ base hspec QuickCheck ];
|
||||
description = "print and show in unicode";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"unicode-symbols" = callPackage
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ftxui";
|
||||
version = "unstable-2021-08-13";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArthurSonzogni";
|
||||
repo = pname;
|
||||
rev = "69b0c9e53e523ac43a303964fc9c5bc0da7d5d61";
|
||||
sha256 = "0cbljksgy1ckw34h0mq70s8sma0p16sznn4z9r4hwv76y530m0ww";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BfNUk2DbBpKMBEu1tQWl85tgjB/4NAh86VVSS9zAjKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -23,9 +23,13 @@ stdenv.mkDerivation rec {
|
||||
graphviz
|
||||
];
|
||||
|
||||
# gtest and gbenchmark don't seem to generate any binaries
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ArthurSonzogni/FTXUI";
|
||||
description = "Functional Terminal User Interface for C++";
|
||||
changelog = "https://github.com/ArthurSonzogni/FTXUI/blob/v${version}/CHANGELOG.md";
|
||||
description = "Functional Terminal User Interface library for C++";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
platforms = platforms.unix;
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtxclient";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "mtxclient";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TsGoSVewQJlr0zj8qYEd+UU8DlncZDCqfrqTv89LEYU=";
|
||||
sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,25 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, nix-update-script }:
|
||||
{ lib, stdenv, fetchFromGitHub, nix-update-script }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "re2";
|
||||
version = "2021-11-01";
|
||||
version = "2022-02-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "re2";
|
||||
rev = version;
|
||||
sha256 = "sha256-q8u7xNp6n17F6twPoVkix8iCKPWUN+qg6rhSR4Dv+bI=";
|
||||
sha256 = "sha256-3RspCfJD2jV7GYuzeBUcxkZsdHyL14kaz8lSoIrH7b8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstreal fix for parallel testing.
|
||||
(fetchpatch {
|
||||
name = "parallel-tests.patch";
|
||||
url = "https://github.com/google/re2/commit/9262284a7edc1b83e7172f4ec2d7967d695e7420.patch";
|
||||
sha256 = "1knhfx9cs4841r09jw4ha6mdx9qwpvlcxvd04i8vr84kd0lilqms";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile --replace "/usr/local" "$out"
|
||||
# we're using gnu sed, even on darwin
|
||||
@ -29,6 +20,11 @@ stdenv.mkDerivation rec {
|
||||
buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# Broken when shared/static are tested in parallel:
|
||||
# cp: cannot create regular file 'obj/testinstall.cc': File exists
|
||||
# make: *** [Makefile:334: static-testinstall] Error 1
|
||||
# Will be fixed by https://code-review.googlesource.com/c/re2/+/59830
|
||||
enableParallelChecking = false;
|
||||
|
||||
preCheck = "patchShebangs runtests";
|
||||
doCheck = true;
|
||||
|
@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "petsc";
|
||||
version = "3.16.4";
|
||||
version = "3.16.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
|
||||
sha256 = "sha256-IpzOIr3P7bH+gn0wbtGvypc3eGzcPwVit0oZZsEkPK8=";
|
||||
sha256 = "sha256-fehXDuuUBidS2CqDII/Cuvx3s/UVAjpMFNj/lEDmbKw=";
|
||||
};
|
||||
|
||||
mpiSupport = !withp4est || p4est.mpiSupport;
|
||||
|
@ -6,13 +6,13 @@ assert blas.isILP64 == lapack.isILP64;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scalapack";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Reference-ScaLAPACK";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0hiap5i9ik6xpvl721n2slanlqygagc1pg2bcjb27ans6balhsfh";
|
||||
sha256 = "sha256-GNVGWrIWdfyTfbz7c31Vjt9eDlVzCd/aLHoWq2DMyX4=";
|
||||
};
|
||||
|
||||
passthru = { inherit (blas) isILP64; };
|
||||
|
@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tachyon";
|
||||
version = "0.99b6";
|
||||
version = "0.99.3";
|
||||
src = fetchurl {
|
||||
url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l";
|
||||
sha256 = "sha256-rsxxm1NK2IPRl/5O2Ng2sC1VH84Zj1uJ6mN+HZHyN+E=";
|
||||
};
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Carbon
|
||||
|
@ -47,11 +47,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tracker-miners";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "RDafU+Lt70FDdAbb7s1Hepf4qa/dkTSDLqRdG6KqLEc=";
|
||||
sha256 = "/YTHHmIbwrgcrLX5CJMkNiRtG4pPw6Y1PiuNuuvAI2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -0,0 +1,29 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "flow";
|
||||
version = "20200610-git";
|
||||
|
||||
description = "A flowchart and generalised graph library.";
|
||||
|
||||
deps = [ args."closer-mop" args."documentation-utils" args."trivial-indent" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz";
|
||||
sha256 = "1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194";
|
||||
};
|
||||
|
||||
packageName = "flow";
|
||||
|
||||
asdFilesToKeep = ["flow.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM flow DESCRIPTION A flowchart and generalised graph library. SHA256
|
||||
1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194 URL
|
||||
http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz MD5
|
||||
f0767467d5e9bfda6fe5777a26719811 NAME flow FILENAME flow DEPS
|
||||
((NAME closer-mop FILENAME closer-mop)
|
||||
(NAME documentation-utils FILENAME documentation-utils)
|
||||
(NAME trivial-indent FILENAME trivial-indent))
|
||||
DEPENDENCIES (closer-mop documentation-utils trivial-indent) VERSION
|
||||
20200610-git SIBLINGS (flow-visualizer) PARASITES NIL) */
|
@ -0,0 +1,27 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "lambda-fiddle";
|
||||
version = "20190710-git";
|
||||
|
||||
description = "A collection of functions to process lambda-lists.";
|
||||
|
||||
deps = [ ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz";
|
||||
sha256 = "0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j";
|
||||
};
|
||||
|
||||
packageName = "lambda-fiddle";
|
||||
|
||||
asdFilesToKeep = ["lambda-fiddle.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM lambda-fiddle DESCRIPTION
|
||||
A collection of functions to process lambda-lists. SHA256
|
||||
0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j URL
|
||||
http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz
|
||||
MD5 78f68f144ace9cb8f634ac14b3414e5e NAME lambda-fiddle FILENAME
|
||||
lambda-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
|
||||
PARASITES NIL) */
|
@ -0,0 +1,35 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "legit";
|
||||
version = "20190710-git";
|
||||
|
||||
description = "CL interface to the GIT binary.";
|
||||
|
||||
deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."documentation-utils" args."lambda-fiddle" args."simple-inferiors" args."trivial-indent" args."uiop" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz";
|
||||
sha256 = "0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9";
|
||||
};
|
||||
|
||||
packageName = "legit";
|
||||
|
||||
asdFilesToKeep = ["legit.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM legit DESCRIPTION CL interface to the GIT binary. SHA256
|
||||
0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9 URL
|
||||
http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz
|
||||
MD5 9b380fc23d4bab086df8a0e4a598457a NAME legit FILENAME legit DEPS
|
||||
((NAME alexandria FILENAME alexandria)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
(NAME cl-ppcre FILENAME cl-ppcre)
|
||||
(NAME documentation-utils FILENAME documentation-utils)
|
||||
(NAME lambda-fiddle FILENAME lambda-fiddle)
|
||||
(NAME simple-inferiors FILENAME simple-inferiors)
|
||||
(NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop))
|
||||
DEPENDENCIES
|
||||
(alexandria bordeaux-threads cl-ppcre documentation-utils lambda-fiddle
|
||||
simple-inferiors trivial-indent uiop)
|
||||
VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
|
@ -0,0 +1,33 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "nbd";
|
||||
version = "20200925-git";
|
||||
|
||||
parasites = [ "nbd/simple-in-memory" ];
|
||||
|
||||
description = "Network Block Device server library.";
|
||||
|
||||
deps = [ args."bordeaux-threads" args."flexi-streams" args."lisp-binary" args."wild-package-inferred-system" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz";
|
||||
sha256 = "1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky";
|
||||
};
|
||||
|
||||
packageName = "nbd";
|
||||
|
||||
asdFilesToKeep = ["nbd.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM nbd DESCRIPTION Network Block Device server library. SHA256
|
||||
1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky URL
|
||||
http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz MD5
|
||||
f32b7a508ac87c1e179c259b171dc837 NAME nbd FILENAME nbd DEPS
|
||||
((NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
(NAME flexi-streams FILENAME flexi-streams)
|
||||
(NAME lisp-binary FILENAME lisp-binary)
|
||||
(NAME wild-package-inferred-system FILENAME wild-package-inferred-system))
|
||||
DEPENDENCIES
|
||||
(bordeaux-threads flexi-streams lisp-binary wild-package-inferred-system)
|
||||
VERSION 20200925-git SIBLINGS NIL PARASITES (nbd/simple-in-memory)) */
|
@ -0,0 +1,33 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "simple-inferiors";
|
||||
version = "20200325-git";
|
||||
|
||||
description = "A very simple library to use inferior processes.";
|
||||
|
||||
deps = [ args."alexandria" args."bordeaux-threads" args."documentation-utils" args."trivial-indent" args."uiop" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz";
|
||||
sha256 = "15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5";
|
||||
};
|
||||
|
||||
packageName = "simple-inferiors";
|
||||
|
||||
asdFilesToKeep = ["simple-inferiors.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM simple-inferiors DESCRIPTION
|
||||
A very simple library to use inferior processes. SHA256
|
||||
15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5 URL
|
||||
http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz
|
||||
MD5 f90ae807c10d5b3c4b9eef1134a537c8 NAME simple-inferiors FILENAME
|
||||
simple-inferiors DEPS
|
||||
((NAME alexandria FILENAME alexandria)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
(NAME documentation-utils FILENAME documentation-utils)
|
||||
(NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop))
|
||||
DEPENDENCIES
|
||||
(alexandria bordeaux-threads documentation-utils trivial-indent uiop)
|
||||
VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */
|
@ -0,0 +1,30 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "wild-package-inferred-system";
|
||||
version = "20200325-git";
|
||||
|
||||
parasites = [ "wild-package-inferred-system/test" ];
|
||||
|
||||
description = "Introduces the wildcards `*' and `**' into package-inferred-system";
|
||||
|
||||
deps = [ args."fiveam" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz";
|
||||
sha256 = "1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas";
|
||||
};
|
||||
|
||||
packageName = "wild-package-inferred-system";
|
||||
|
||||
asdFilesToKeep = ["wild-package-inferred-system.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM wild-package-inferred-system DESCRIPTION
|
||||
Introduces the wildcards `*' and `**' into package-inferred-system SHA256
|
||||
1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas URL
|
||||
http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz
|
||||
MD5 4dfd9f90d780b1e67640543dd4acbf21 NAME wild-package-inferred-system
|
||||
FILENAME wild-package-inferred-system DEPS ((NAME fiveam FILENAME fiveam))
|
||||
DEPENDENCIES (fiveam) VERSION 20200325-git SIBLINGS (foo-wild) PARASITES
|
||||
(wild-package-inferred-system/test)) */
|
@ -138,6 +138,7 @@ file-attributes
|
||||
fiveam
|
||||
flexi-streams
|
||||
float-features
|
||||
flow
|
||||
form-fiddle
|
||||
fset
|
||||
generic-cl
|
||||
@ -157,6 +158,7 @@ iterate
|
||||
jonathan
|
||||
jsown
|
||||
lack
|
||||
legit
|
||||
let-plus
|
||||
lev
|
||||
lfarm-client
|
||||
@ -183,6 +185,7 @@ moptilities
|
||||
more-conditions
|
||||
mt19937
|
||||
named-readtables
|
||||
nbd
|
||||
net-telent-date
|
||||
nibbles
|
||||
optima
|
||||
|
@ -297,6 +297,15 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"wild-package-inferred-system" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."wild-package-inferred-system" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/wild-package-inferred-system.nix {
|
||||
inherit fetchurl;
|
||||
"fiveam" = quicklisp-to-nix-packages."fiveam";
|
||||
}));
|
||||
|
||||
|
||||
"parseq" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."parseq" or (x: {}))
|
||||
@ -369,6 +378,43 @@ let quicklisp-to-nix-packages = rec {
|
||||
"usocket" = quicklisp-to-nix-packages."usocket";
|
||||
}));
|
||||
|
||||
"simple-inferiors" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."simple-inferiors" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/simple-inferiors.nix {
|
||||
inherit fetchurl;
|
||||
"alexandria" = quicklisp-to-nix-packages."alexandria";
|
||||
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
|
||||
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
|
||||
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
|
||||
"uiop" = quicklisp-to-nix-packages."uiop";
|
||||
}));
|
||||
|
||||
|
||||
"lambda-fiddle" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."lambda-fiddle" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/lambda-fiddle.nix {
|
||||
inherit fetchurl;
|
||||
}));
|
||||
|
||||
|
||||
"iolib_dot_grovel" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."iolib_dot_grovel" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/iolib_dot_grovel.nix {
|
||||
inherit fetchurl;
|
||||
"alexandria" = quicklisp-to-nix-packages."alexandria";
|
||||
"babel" = quicklisp-to-nix-packages."babel";
|
||||
"cffi" = quicklisp-to-nix-packages."cffi";
|
||||
"iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
|
||||
"iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
|
||||
"iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
|
||||
"iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
|
||||
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
|
||||
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
|
||||
"uiop" = quicklisp-to-nix-packages."uiop";
|
||||
}));
|
||||
|
||||
"trivia_dot_quasiquote" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
@ -2673,6 +2719,18 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"nbd" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."nbd" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/nbd.nix {
|
||||
inherit fetchurl;
|
||||
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
|
||||
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
|
||||
"lisp-binary" = quicklisp-to-nix-packages."lisp-binary";
|
||||
"wild-package-inferred-system" = quicklisp-to-nix-packages."wild-package-inferred-system";
|
||||
}));
|
||||
|
||||
|
||||
"named-readtables" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."named-readtables" or (x: {}))
|
||||
@ -2971,6 +3029,22 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"legit" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."legit" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/legit.nix {
|
||||
inherit fetchurl;
|
||||
"alexandria" = quicklisp-to-nix-packages."alexandria";
|
||||
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
|
||||
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
|
||||
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
|
||||
"lambda-fiddle" = quicklisp-to-nix-packages."lambda-fiddle";
|
||||
"simple-inferiors" = quicklisp-to-nix-packages."simple-inferiors";
|
||||
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
|
||||
"uiop" = quicklisp-to-nix-packages."uiop";
|
||||
}));
|
||||
|
||||
|
||||
"lack" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."lack" or (x: {}))
|
||||
@ -3307,6 +3381,17 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"flow" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."flow" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/flow.nix {
|
||||
inherit fetchurl;
|
||||
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
|
||||
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
|
||||
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
|
||||
}));
|
||||
|
||||
|
||||
"float-features" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."float-features" or (x: {}))
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.29";
|
||||
version = "0.2.30";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-x+TXHG7xJWd5t6pKQ/6X48lOuIQWUnEwsySFRh5GJnE=";
|
||||
sha256 = "sha256-qq01hnNiJ6BUGhi5owYvxM+Kj7/KYp0vBpILmwPuZaw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,24 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bsdiff4";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "87cffc7522effdda03fd1564b212ad2279c0af50d16c3e65776f80acb6705d4b";
|
||||
hash = "sha256-GICsP1KmxGrmvMbbEX5Ps1+bDM1a91/U/uaQfQDWmDw=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bsdiff4"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
mv bsdiff4 _bsdiff4
|
||||
python -c 'import bsdiff4; bsdiff4.test()'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "binary diff and patch using the BSDIFF4-format";
|
||||
description = "Binary diff and patch using the BSDIFF4-format";
|
||||
homepage = "https://github.com/ilanschnell/bsdiff4";
|
||||
license = licenses.bsdProtection;
|
||||
maintainers = with maintainers; [ ris ];
|
||||
|
@ -6,15 +6,20 @@
|
||||
, transaction
|
||||
, zope_testrunner
|
||||
, python
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "BTrees";
|
||||
version = "4.9.2";
|
||||
pname = "btrees";
|
||||
version = "4.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d33323655924192c4ac998d9ee3002e787915d19c1e17a6baf47c9a63d9556e3";
|
||||
pname = "BTrees";
|
||||
inherit version;
|
||||
hash = "sha256-1qsONBDQdNcVQkXW3GSTrobxtQvWCA0TEOuz7N6l3rY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
32
pkgs/development/python-modules/chromaprint/default.nix
Normal file
32
pkgs/development/python-modules/chromaprint/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, m2r
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chromaprint";
|
||||
version = "0.5";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-d4M+ieNQpIXcnEH1WyIWnTYZe3P+Y58W0uz1uYPwLQE=";
|
||||
};
|
||||
|
||||
buildInputs = [ m2r ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "chromaprint" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Facilitate effortless color terminal output";
|
||||
homepage = "https://pypi.org/project/${pname}/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dschrempf peterhoeg ];
|
||||
};
|
||||
}
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deep-translator";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-k4RhUZN/aC9D1NKkmCGZGZNU9In577RobBnDagMYHbo=";
|
||||
sha256 = "sha256-2u4ZmLUEOwbN2sbPgLu9R1VdNevXBP4lBFuGw2aiRMg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,25 +1,37 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, urllib3 }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, urllib3
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "downloader-cli";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepjyoti30";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hjwy3qa6al6p35pv01sdl3szh7asf6vlmhwjbkpppn4zi239k0y";
|
||||
hash = "sha256-Dl5XIvdZInz+edL9uQv7V6Kc6FB+7hFAGe/nybnqvQU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ urllib3 ];
|
||||
propagatedBuildInputs = [
|
||||
urllib3
|
||||
];
|
||||
|
||||
# Disable checks due to networking (Errno 101)
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "downloader_cli" ];
|
||||
pythonImportsCheck = [
|
||||
"downloader_cli"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple downloader written in Python with an awesome customizable progressbar. ";
|
||||
description = "Downloader with an awesome customizable progressbar";
|
||||
homepage = "https://github.com/deepjyoti30/downloader-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ j0hax ];
|
||||
|
@ -16,13 +16,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glean_parser";
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MJ827VXy8e2CRyq4sY4d0B7etxBgRk4/hZybYOOLh9Q=";
|
||||
sha256 = "sha256-8oMbaGsW5Lkw9OluNsXXe2IBNbjeoIb9vDjVOt+uHR0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gql";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "graphql-python";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c2OVBOIwQlwyqET8Q22O65VtWduVzQjYOhkE8GpD6LQ=";
|
||||
hash = "sha256-ZtrT+zeoP9KXdaCDKOUrjEwe7dN0+IwA20FDe5ja7l8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -9,25 +9,36 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "neo";
|
||||
version = "0.10.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.10.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RE/xUnjdz541d4IOh4z2ufQiDOFFvxATyPMFNs9gk5s=";
|
||||
sha256 = "sha256-LUIYsIJtruqIDhVSJwYAKew4oAI4zrXwlxONlGfGOZs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy quantities ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
quantities
|
||||
];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests --exclude=iotest
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"neo"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Package for representing electrophysiology data";
|
||||
homepage = "https://neuralensemble.org/neo/";
|
||||
description = "Package for representing electrophysiology data in Python";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
|
@ -1,20 +1,36 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, colorama, pytestCheckHook }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, colorama
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simber";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepjyoti30";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx";
|
||||
hash = "sha256-P4bhxu9Di4E2Zkd0vIkyDi1S6Y0V/EQSMF4ftWoiXKE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama ];
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "simber" ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"simber"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple, minimal and powerful logger for Python";
|
||||
|
@ -1,24 +1,39 @@
|
||||
{ lib, fetchPypi, buildPythonPackage
|
||||
, traits, pyface, six
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, traits
|
||||
, pyface
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "traitsui";
|
||||
version = "7.2.1";
|
||||
version = "7.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "dfc39015faf0591f9927e3d4d22bd95a16d49c85db30e60acd4ba7b85c7c5d5b";
|
||||
hash = "sha256-ZkSz+PYColdgcC3IchuneM51lFBAk68UpIadI56GdPQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ traits pyface six ];
|
||||
propagatedBuildInputs = [
|
||||
traits
|
||||
pyface
|
||||
];
|
||||
|
||||
doCheck = false; # Needs X server
|
||||
# Needs X server
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"traitsui"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Traits-capable windowing framework";
|
||||
homepage = "https://github.com/enthought/traitsui";
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
};
|
||||
}
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamlfix";
|
||||
version = "0.8.0";
|
||||
version = "0.8.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "lyz-code";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Gkq80YMeiPy7xxLauA/nloW4znMV2tfE+e24HyZgUaQ=";
|
||||
sha256 = "sha256-YCC4xK1fB5Gyv32JhbSuejtzLNMRnH7iyUpzccVijS0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,18 +2,22 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, yara
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yara-python";
|
||||
version = "4.1.3";
|
||||
version = "4.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = "yara-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lOP+OVnMgpP8S+Q3jGRNEAFXAohXgX5Nvl+l4EK5ebs=";
|
||||
hash = "sha256-jNxYuIddMzANZoQ0p7BbRrX6ISpaCA7T6j+iS+FOocg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -28,9 +32,13 @@ buildPythonPackage rec {
|
||||
"--dynamic-linking"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests.py" ];
|
||||
pytestFlagsArray = [
|
||||
"tests.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "yara" ];
|
||||
pythonImportsCheck = [
|
||||
"yara"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface for YARA";
|
||||
|
@ -32,13 +32,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.931";
|
||||
version = "2.0.936";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-y38oyQVHEi/bXcntxDU0AsOog6Sq/TPvF/NfJjybXiE=";
|
||||
hash = "sha256-erpVJTnWUfoY4Ymdf7fZyri2NGAYs0NF+r3DMFFYURM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||
sha256 = "sha256:1acm1z24cw2yzykwwjfrcf66mi16xvsrnrrhrsd9yqrajqab707n";
|
||||
hash = "sha256:hYQOmnJjsOIIri5H0/B5LhixwfiLxxpVoN4ON1NUkWg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -102,11 +102,6 @@ stdenv.mkDerivation rec {
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
# Set up Nuget dependencies
|
||||
export HOME=$(mktemp -d)
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
export DOTNET_NOLOGO=1
|
||||
|
||||
# Never use nuget.org
|
||||
nuget sources Disable -Name "nuget.org"
|
||||
|
||||
|
@ -9,15 +9,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "faas-cli";
|
||||
# When updating version change rev.
|
||||
version = "0.14.2";
|
||||
rev = "b1c09c0243f69990b6c81a17d7337f0fd23e7542";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfaas";
|
||||
repo = "faas-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-OdFd4q5IHu4FjNArcqVt4dNyLWegR4GdAyyCzgNIU+Q=";
|
||||
sha256 = "sha256-1aflQXfW/y31Dk0OZW77qNQKEwkhi6p8ZBfTUyRDbdo=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
@ -28,7 +26,7 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/openfaas/faas-cli/version.GitCommit=${rev}"
|
||||
"-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}"
|
||||
"-X github.com/openfaas/faas-cli/version.Version=${version}"
|
||||
"-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}"
|
||||
];
|
||||
|
@ -24,14 +24,7 @@ let
|
||||
unmanaged = clangStdenv.mkDerivation rec {
|
||||
inherit src pname version;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# Building the "unmanaged part" still involves compiling C# code.
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||
'';
|
||||
nativeBuildInputs = [ cmake dotnet-sdk ];
|
||||
|
||||
hardeningDisable = [ "strictoverflow" ];
|
||||
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-GcqmMqrZSgvSrsY8FJbPynNWTzSi5A6kmyq+xJ+2i3Y=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ]
|
||||
outputs = [ "out" "man" "doc" ]
|
||||
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -a doc $out/share/
|
||||
cp -a README AUTHORS TODO $out/share/doc/
|
||||
mkdir -p $doc/share/doc
|
||||
cp -a doc $doc/share/doc/iwd
|
||||
cp -a README AUTHORS TODO $doc/share/doc/iwd
|
||||
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
mkdir -p $test/bin
|
||||
cp -a test/* $test/bin/
|
||||
|
@ -16,7 +16,7 @@
|
||||
, enablePython ? true
|
||||
|
||||
# for determining the latest compatible linuxPackages
|
||||
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
|
||||
, linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16
|
||||
}:
|
||||
|
||||
with lib;
|
||||
@ -215,28 +215,28 @@ in {
|
||||
# to be adapted
|
||||
zfsStable = common {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_15;
|
||||
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17";
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_16;
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8=";
|
||||
sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl";
|
||||
};
|
||||
|
||||
zfsUnstable = common {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_15;
|
||||
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17";
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_16;
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
# IMPORTANT: Always use a tagged release candidate or commits from the
|
||||
# zfs-<version>-staging branch, because this is tested by the OpenZFS
|
||||
# maintainers.
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
# rev = "0000000000000000000000000000000000000000";
|
||||
|
||||
sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8=";
|
||||
sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl";
|
||||
|
||||
isUnstable = true;
|
||||
};
|
||||
|
@ -70,11 +70,6 @@ stdenv.mkDerivation rec {
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
export DOTNET_NOLOGO=1
|
||||
|
||||
nuget sources Add -Name nixos -Source "$PWD/nixos"
|
||||
nuget init "$nugetDeps" "$PWD/nixos"
|
||||
|
||||
|
@ -43,10 +43,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
mkdir home
|
||||
export HOME=$PWD/home
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||
export FrameworkPathOverride=${mono}/lib/mono/4.7.1-api
|
||||
|
||||
# disable default-source so nuget does not try to download from online-repo
|
||||
|
42
pkgs/tools/misc/gtkterm/default.nix
Normal file
42
pkgs/tools/misc/gtkterm/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkterm";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jeija";
|
||||
repo = "gtkterm";
|
||||
rev = "${version}";
|
||||
sha256 = "0s2cx8w1n8d37pl80gll5h6dyvbqrfcam8l4wmvnqqww9jml6577";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
vte
|
||||
libgudev
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple, graphical serial port terminal emulator";
|
||||
homepage = "https://github.com/Jeija/gtkterm";
|
||||
license = licenses.gpl3Plus;
|
||||
longDescription = ''
|
||||
GTKTerm is a simple, graphical serial port terminal emulator for
|
||||
Linux and possibly other POSIX-compliant operating systems. It
|
||||
can be used to communicate with all kinds of devices with a
|
||||
serial interface, such as embedded computers, microcontrollers,
|
||||
modems, GPS receivers, CNC machines and more.
|
||||
'';
|
||||
maintainers = with maintainers; [ wentasah ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "gtkterm";
|
||||
};
|
||||
}
|
49
pkgs/tools/misc/kakoune-cr/default.nix
Normal file
49
pkgs/tools/misc/kakoune-cr/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib, crystal, fetchFromGitHub, fetchurl, jq }:
|
||||
let
|
||||
icon = fetchurl {
|
||||
url = "https://github.com/mawww/kakoune/raw/master/doc/kakoune_logo.svg";
|
||||
hash = "sha256-JxhIEmjiGrisaarA1sX1AfzNjHNIm9xjyPs/nG1uL/U=";
|
||||
};
|
||||
in
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "kakoune.cr";
|
||||
version = "unstable-2021-11-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexherbo2";
|
||||
repo = "kakoune.cr";
|
||||
rev = "43d4276e1d173839f335ff60f205b89705892e00";
|
||||
hash = "sha256-xFrxbnZl/49vGKdkESPa6LpK0ckq4Jv5GNLL/G0qA1w=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ jq ];
|
||||
|
||||
format = "shards";
|
||||
shardsFile = ./shards.nix;
|
||||
lockFile = ./shard.lock;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/kakoune/version.cr --replace \
|
||||
'`git describe --tags --always`' \
|
||||
'"${version}"'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm555 share/kcr/commands/*/kcr-* -t $out/bin
|
||||
install -Dm444 share/kcr/applications/kcr.desktop -t $out/share/applications
|
||||
install -Dm444 ${icon} $out/share/icons/hicolor/scalable/apps/kcr.svg
|
||||
cp -r share/kcr $out/share/
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/kcr --help
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/alexherbo2/kakoune.cr";
|
||||
description = "A command-line tool for Kakoune";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
10
pkgs/tools/misc/kakoune-cr/shard.lock
Normal file
10
pkgs/tools/misc/kakoune-cr/shard.lock
Normal file
@ -0,0 +1,10 @@
|
||||
version: 2.0
|
||||
shards:
|
||||
fifo:
|
||||
git: https://github.com/alexherbo2/fifo.cr.git
|
||||
version: 0.1.0+git.commit.37a2cc2718af0f8a1c50071106d7a5ca3a0d3da2
|
||||
|
||||
rsub:
|
||||
git: https://github.com/alexherbo2/rsub.cr.git
|
||||
version: 0.1.0+git.commit.43c6b9836ee281328bccfdf8c669bab26448e3b3
|
||||
|
14
pkgs/tools/misc/kakoune-cr/shards.nix
Normal file
14
pkgs/tools/misc/kakoune-cr/shards.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
fifo = {
|
||||
owner = "alexherbo2";
|
||||
repo = "fifo.cr";
|
||||
rev = "37a2cc2718af0f8a1c50071106d7a5ca3a0d3da2";
|
||||
sha256 = "0syh2819dzsfb562z645sajfh7xplhh3mxdachjnzlsdfqkxw85r";
|
||||
};
|
||||
rsub = {
|
||||
owner = "alexherbo2";
|
||||
repo = "rsub.cr";
|
||||
rev = "43c6b9836ee281328bccfdf8c669bab26448e3b3";
|
||||
sha256 = "144p83y3d02jy4gapify53x3i4i51yva6ajbvgi8rx0zj2ajgr0d";
|
||||
};
|
||||
}
|
@ -46,14 +46,13 @@ stdenv.mkDerivation rec {
|
||||
libX11
|
||||
libssh2
|
||||
openssl
|
||||
perl
|
||||
slang
|
||||
zip
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--enable-vfs-smb" ];
|
||||
configureFlags = [ "--enable-vfs-smb" "PERL=${perl}/bin/perl" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/filemanager/ext.c \
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mqttui";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdJoPaTo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Uts9hKhnFNYdQhxeUoTOehCcfgqQwStSoGWixgY3dPU=";
|
||||
sha256 = "sha256-kGOQIoE+0lCBm9zQwPMFfYnLJgR79hSKECerWyOFsjI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-YxXniyuQEM+vrCbflqCLlnXpH3ClAd9O496SFVKRvBs=";
|
||||
cargoSha256 = "sha256-vm4IR/yQlQDn9LN9Ifr4vJvM6cCqgjRU2vdAHVEsWnI=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, which }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, which, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nbd";
|
||||
@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
test = nixosTests.nbd;
|
||||
};
|
||||
|
||||
# Glib calls `clock_gettime', which is in librt. Linking that library
|
||||
# here ensures that a proper rpath is added to the executable so that
|
||||
# it can be loaded at run-time.
|
||||
|
40
pkgs/tools/security/mokutil/default.nix
Normal file
40
pkgs/tools/security/mokutil/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, openssl
|
||||
, efivar
|
||||
, keyutils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mokutil";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lcp";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dt41TCr6RkmE9H+NN8LWv3ogGsK38JtLjVN/b2mbGJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
efivar
|
||||
keyutils
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/lcp/mokutil";
|
||||
description = "Utility to manipulate machines owner keys";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -2,16 +2,16 @@
|
||||
|
||||
let
|
||||
|
||||
version = "4.5.0.2216";
|
||||
version = "4.7.0.2747";
|
||||
|
||||
sonarScannerArchPackage = {
|
||||
"x86_64-linux" = {
|
||||
url = "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-linux.zip";
|
||||
sha256 = "sha256-rmvDb5l2BGV8j94Uhu2kJXwoDAHA3VncAahqGvLY3I0=";
|
||||
sha256 = "0qy97lcn9nfwg0x32v9x5kh5jswnjyw3wpvxj45z7cddlj2is4iy";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
url = "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-macosx.zip";
|
||||
sha256 = "1g3lldpkrjlvwld9h82hlwclyplxpbk4q3nq59ylw4dhp26kb993";
|
||||
sha256 = "0f8km7wqkw09g01l03kcrjgvq7b6xclzpvb5r64ymsmrc39p0ylp";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yara";
|
||||
version = "4.2.0-rc1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WcN6ClYO2d+/MdG06RHx3kN0o0WVAY876dJiG7CwJ8w=";
|
||||
hash = "sha256-ECvNob5QbOe5JfaDMGvSxCS+E9nqdsfSCZAVlAs18q4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -13,8 +13,8 @@
|
||||
let
|
||||
sha256 = "1f0nrdg8hf650qxz79i3a1d2zyf24niyrcnbnhc9i7hzbnqbp5qg";
|
||||
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
|
||||
specVersion = "4.115.0";
|
||||
specSha256 = "1s9pis1jl6d8znkb8hwsv89wzf38bhjing4x4q9ggy038y7xkkwg";
|
||||
specVersion = "4.118.3";
|
||||
specSha256 = "0jf4fnadcdfm4ja0d0m5rxcpg48cqsi9plaqz6kwyx3mp2snx9yc";
|
||||
spec = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
|
||||
sha256 = specSha256;
|
||||
@ -24,7 +24,7 @@ in
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "linode-cli";
|
||||
version = "5.17.1";
|
||||
version = "5.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linode";
|
||||
|
@ -1123,8 +1123,6 @@ mapAliases ({
|
||||
source-han-serif-korean = source-han-serif;
|
||||
source-han-serif-simplified-chinese = source-han-serif;
|
||||
source-han-serif-traditional-chinese = source-han-serif;
|
||||
source-sans-pro = source-sans; # Added 2021-10-20
|
||||
source-serif-pro = source-serif; # Added 2021-10-20
|
||||
|
||||
spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22
|
||||
spectral = neochat; # Added 2020-12-27
|
||||
|
@ -774,6 +774,8 @@ with pkgs;
|
||||
mkShell = callPackage ../build-support/mkshell { };
|
||||
mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; };
|
||||
|
||||
mokutil = callPackage ../tools/security/mokutil { };
|
||||
|
||||
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; };
|
||||
|
||||
nix-gitignore = callPackage ../build-support/nix-gitignore { };
|
||||
@ -6771,9 +6773,7 @@ with pkgs;
|
||||
ipfs = callPackage ../applications/networking/ipfs {
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
|
||||
|
||||
ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix {
|
||||
buildGoModule = buildGo116Module;
|
||||
@ -6996,6 +6996,8 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
|
||||
kakoune-cr = callPackage ../tools/misc/kakoune-cr { };
|
||||
|
||||
kbdd = callPackage ../applications/window-managers/kbdd { };
|
||||
|
||||
kbs2 = callPackage ../tools/security/kbs2 {
|
||||
@ -14080,7 +14082,7 @@ with pkgs;
|
||||
|
||||
regina = callPackage ../development/interpreters/regina { };
|
||||
|
||||
inherit (ocaml-ng.ocamlPackages_4_12) reason;
|
||||
inherit (ocamlPackages) reason;
|
||||
|
||||
pixie = callPackage ../development/interpreters/pixie { };
|
||||
dust = callPackage ../development/interpreters/pixie/dust.nix { };
|
||||
@ -24289,8 +24291,10 @@ with pkgs;
|
||||
source-code-pro = callPackage ../data/fonts/source-code-pro {};
|
||||
|
||||
source-sans = callPackage ../data/fonts/source-sans { };
|
||||
source-sans-pro = callPackage ../data/fonts/source-sans-pro { };
|
||||
|
||||
source-serif = callPackage ../data/fonts/source-serif { };
|
||||
source-serif-pro = callPackage ../data/fonts/source-serif-pro { };
|
||||
|
||||
source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };
|
||||
|
||||
@ -26126,6 +26130,8 @@ with pkgs;
|
||||
|
||||
got = callPackage ../applications/version-management/got { };
|
||||
|
||||
gtkterm = callPackage ../tools/misc/gtkterm { };
|
||||
|
||||
gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
|
||||
|
||||
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
|
||||
|
@ -1609,6 +1609,8 @@ in {
|
||||
|
||||
chispa = callPackage ../development/python-modules/chispa { };
|
||||
|
||||
chromaprint = callPackage ../development/python-modules/chromaprint { };
|
||||
|
||||
ci-info = callPackage ../development/python-modules/ci-info { };
|
||||
|
||||
ci-py = callPackage ../development/python-modules/ci-py { };
|
||||
|
Loading…
Reference in New Issue
Block a user