mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
25421963c7
@ -610,7 +610,7 @@ in mkLicense lset) ({
|
||||
};
|
||||
|
||||
inria-icesl = {
|
||||
fullName = "INRIA Non-Commercial License Agreement for IceSL";
|
||||
fullName = "End User License Agreement for IceSL Software";
|
||||
url = "https://icesl.loria.fr/assets/pdf/EULA_IceSL_binary.pdf";
|
||||
free = false;
|
||||
};
|
||||
|
||||
@ -18489,6 +18489,16 @@
|
||||
githubId = 7121530;
|
||||
name = "Wolf Honoré";
|
||||
};
|
||||
wigust = {
|
||||
name = "Oleg Pykhalov";
|
||||
email = "go.wigust@gmail.com";
|
||||
github = "wigust";
|
||||
githubId = 7709598;
|
||||
keys = [{
|
||||
# primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB"
|
||||
fingerprint = "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C";
|
||||
}];
|
||||
};
|
||||
wildsebastian = {
|
||||
name = "Sebastian Wild";
|
||||
email = "sebastian@wild-siena.com";
|
||||
|
||||
@ -222,6 +222,7 @@
|
||||
order, or relying on `mkBefore` and `mkAfter`, but may impact users calling
|
||||
`mkOrder n` with n ≤ 400.
|
||||
|
||||
- `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally.
|
||||
|
||||
## Other Notable Changes {#sec-release-23.11-notable-changes}
|
||||
|
||||
|
||||
23
nixos/modules/hardware/glasgow.nix
Normal file
23
nixos/modules/hardware/glasgow.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.hardware.glasgow;
|
||||
|
||||
in
|
||||
{
|
||||
options.hardware.glasgow = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Enables Glasgow udev rules and ensures 'plugdev' group exists.
|
||||
This is a prerequisite to using Glasgow without being root.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.glasgow ];
|
||||
users.groups.plugdev = { };
|
||||
};
|
||||
}
|
||||
@ -61,6 +61,7 @@
|
||||
./hardware/flipperzero.nix
|
||||
./hardware/flirc.nix
|
||||
./hardware/gkraken.nix
|
||||
./hardware/glasgow.nix
|
||||
./hardware/gpgsmartcards.nix
|
||||
./hardware/hackrf.nix
|
||||
./hardware/i2c.nix
|
||||
|
||||
@ -15,26 +15,26 @@ let
|
||||
usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ]));
|
||||
hasWorkers = cfg.workers != { };
|
||||
|
||||
listenerSupportsResource = resource: listener:
|
||||
lib.any ({ names, ... }: builtins.elem resource names) listener.resources;
|
||||
|
||||
clientListener = findFirst
|
||||
(listenerSupportsResource "client")
|
||||
null
|
||||
(cfg.settings.listeners
|
||||
++ concatMap ({ worker_listeners, ... }: worker_listeners) (attrValues cfg.workers));
|
||||
|
||||
registerNewMatrixUser =
|
||||
let
|
||||
isIpv6 = x: lib.length (lib.splitString ":" x) > 1;
|
||||
listener =
|
||||
lib.findFirst (
|
||||
listener: lib.any (
|
||||
resource: lib.any (
|
||||
name: name == "client"
|
||||
) resource.names
|
||||
) listener.resources
|
||||
) (lib.last cfg.settings.listeners) cfg.settings.listeners;
|
||||
# FIXME: Handle cases with missing client listener properly,
|
||||
# don't rely on lib.last, this will not work.
|
||||
isIpv6 = hasInfix ":";
|
||||
|
||||
# add a tail, so that without any bind_addresses we still have a useable address
|
||||
bindAddress = head (listener.bind_addresses ++ [ "127.0.0.1" ]);
|
||||
listenerProtocol = if listener.tls
|
||||
bindAddress = head (clientListener.bind_addresses ++ [ "127.0.0.1" ]);
|
||||
listenerProtocol = if clientListener.tls
|
||||
then "https"
|
||||
else "http";
|
||||
in
|
||||
assert assertMsg (clientListener != null) "No client listener found in synapse or one of its workers";
|
||||
pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" ''
|
||||
exec ${cfg.package}/bin/register_new_matrix_user \
|
||||
$@ \
|
||||
@ -44,7 +44,7 @@ let
|
||||
"[${bindAddress}]"
|
||||
else
|
||||
"${bindAddress}"
|
||||
}:${builtins.toString listener.port}/"
|
||||
}:${builtins.toString clientListener.port}/"
|
||||
'';
|
||||
|
||||
defaultExtras = [
|
||||
@ -937,6 +937,13 @@ in {
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = clientListener != null;
|
||||
message = ''
|
||||
At least one listener which serves the `client` resource via HTTP is required
|
||||
by synapse in `services.matrix-synapse.settings.listeners` or in one of the workers!
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = hasLocalPostgresDB -> config.services.postgresql.enable;
|
||||
message = ''
|
||||
@ -969,13 +976,13 @@ in {
|
||||
(
|
||||
listener:
|
||||
listener.port == main.port
|
||||
&& (lib.any (resource: builtins.elem "replication" resource.names) listener.resources)
|
||||
&& listenerSupportsResource "replication" listener
|
||||
&& (lib.any (bind: bind == main.host || bind == "0.0.0.0" || bind == "::") listener.bind_addresses)
|
||||
)
|
||||
null
|
||||
cfg.settings.listeners;
|
||||
in
|
||||
hasWorkers -> (listener != null);
|
||||
hasWorkers -> (cfg.settings.instance_map ? main && listener != null);
|
||||
message = ''
|
||||
Workers for matrix-synapse require setting `services.matrix-synapse.settings.instance_map.main`
|
||||
to any listener configured in `services.matrix-synapse.settings.listeners` with a `"replication"`
|
||||
|
||||
@ -30,13 +30,11 @@ let
|
||||
configFile = pkgs.writeText "NetworkManager.conf" (lib.concatStringsSep "\n" [
|
||||
(mkSection "main" {
|
||||
plugins = "keyfile";
|
||||
dhcp = cfg.dhcp;
|
||||
dns = cfg.dns;
|
||||
inherit (cfg) dhcp dns;
|
||||
# If resolvconf is disabled that means that resolv.conf is managed by some other module.
|
||||
rc-manager =
|
||||
if config.networking.resolvconf.enable then "resolvconf"
|
||||
else "unmanaged";
|
||||
firewall-backend = cfg.firewallBackend;
|
||||
})
|
||||
(mkSection "keyfile" {
|
||||
unmanaged-devices =
|
||||
@ -233,15 +231,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
firewallBackend = mkOption {
|
||||
type = types.enum [ "iptables" "nftables" "none" ];
|
||||
default = "iptables";
|
||||
description = lib.mdDoc ''
|
||||
Which firewall backend should be used for configuring masquerading with shared mode.
|
||||
If set to none, NetworkManager doesn't manage the configuration at all.
|
||||
'';
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ];
|
||||
default = "WARN";
|
||||
@ -340,20 +329,20 @@ in
|
||||
default = [ ];
|
||||
example = literalExpression ''
|
||||
[ {
|
||||
source = pkgs.writeText "upHook" '''
|
||||
source = pkgs.writeText "upHook" '''
|
||||
if [ "$2" != "up" ]; then
|
||||
logger "exit: event $2 != up"
|
||||
exit
|
||||
fi
|
||||
|
||||
if [ "$2" != "up" ]; then
|
||||
logger "exit: event $2 != up"
|
||||
exit
|
||||
fi
|
||||
|
||||
# coreutils and iproute are in PATH too
|
||||
logger "Device $DEVICE_IFACE coming up"
|
||||
''';
|
||||
type = "basic";
|
||||
} ]'';
|
||||
# coreutils and iproute are in PATH too
|
||||
logger "Device $DEVICE_IFACE coming up"
|
||||
''';
|
||||
type = "basic";
|
||||
} ]
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
A list of scripts which will be executed in response to network events.
|
||||
A list of scripts which will be executed in response to network events.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -413,6 +402,9 @@ in
|
||||
them via the DNS server in your network, or use environment.etc
|
||||
to add a file into /etc/NetworkManager/dnsmasq.d reconfiguring hostsdir.
|
||||
'')
|
||||
(mkRemovedOptionModule [ "networking" "networkmanager" "firewallBackend" ] ''
|
||||
This option was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally.
|
||||
'')
|
||||
];
|
||||
|
||||
|
||||
|
||||
@ -248,7 +248,6 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
boot.blacklistedKernelModules = [ "ip_tables" ];
|
||||
environment.systemPackages = [ pkgs.nftables ];
|
||||
networking.networkmanager.firewallBackend = mkDefault "nftables";
|
||||
# versionOlder for backportability, remove afterwards
|
||||
networking.nftables.flushRuleset = mkDefault (versionOlder config.system.stateVersion "23.11" || (cfg.rulesetFile != null || cfg.ruleset != ""));
|
||||
systemd.services.nftables = {
|
||||
|
||||
@ -1428,7 +1428,7 @@ self: super: {
|
||||
hexokinase = buildGoModule {
|
||||
name = "hexokinase";
|
||||
src = old.src + "/hexokinase";
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
};
|
||||
in
|
||||
''
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "152vr796sa1gq62zp3grcr3ywg4b4z233cvwm3s2jhi2nzra26vq";
|
||||
x86_64-darwin = "0zk4nf8zyj6vq7yqnidjqgidrj1nq7rri9y2d4aay44kanm3v03f";
|
||||
aarch64-linux = "0bprcnd93h13x5d2hzfgpa9yyda3x0zi3w0rfwhi2rbyzlr7vzhf";
|
||||
aarch64-darwin = "0rwdknqdhgf3fby1i0gz6hha1vnxfk2dwrpn75g0ra21m11b5b4g";
|
||||
armv7l-linux = "0ck2bxhy3k239ici3y2xsc8kwa8bsfn8ywh1p4lh2dkc91liisnq";
|
||||
x86_64-linux = "1xzmfvkzqfxblahi2pc54fr7i6rynqm76p4wpbfzxrrh5a3xjwn3";
|
||||
x86_64-darwin = "0lp6yqwqwfngl98nba8f77yypb44cfn7kcjhbc93s8kqd57m97zj";
|
||||
aarch64-linux = "1hpwjdbfc8l4a7ln50s6h68abcb6djcc5y0h686s9k5v2axm7f3v";
|
||||
aarch64-darwin = "0cbms9p8g2gjx9wmm78fzlscw62qasjv30al8v39bda3k694wnh5";
|
||||
armv7l-linux = "0hvaray6b36j8s0fvffnkbsw7kf2rn2z4y8q4wlnqx3hfyalcvcn";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.82.1.23255";
|
||||
version = "1.82.2.23257";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
installShellCompletion scripts/cheat.{bash,fish,zsh}
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
#
|
||||
# Ref <https://github.com/NixOS/nixpkgs/pull/87383#issuecomment-633204382>
|
||||
# and <https://github.com/NixOS/nixpkgs/blob/d4226e3a4b5fcf988027147164e86665d382bbfa/pkgs/development/go-modules/generic/default.nix#L18>
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyprland-autoname-workspaces";
|
||||
version = "1.1.10";
|
||||
version = "1.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprland-community";
|
||||
repo = "hyprland-autoname-workspaces";
|
||||
rev = version;
|
||||
hash = "sha256-I0ELCexJxZgbTLzO4GtvOtaIghzVND8kgOFmlQ0oca8=";
|
||||
hash = "sha256-x9MXp2MZtrnVI3W+6xo34uUHuRnpVeXS+3vbyti1p24=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MmWYsYRxrcEtL+efK1yCzq5b+PsrsrG1flSXn2kGdYs=";
|
||||
cargoHash = "sha256-mSUtFZvq5+rumefJ6I9C6YzRzu64oJ/bTwaa+rrFlL4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically rename workspaces with icons of started applications";
|
||||
|
||||
@ -12,7 +12,7 @@ buildGoModule rec {
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.9.12";
|
||||
version = "0.9.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lCo58v2UGolFagci2xHcieTUvqNc1KKNj3Z92oG5WPI=";
|
||||
hash = "sha256-dP/FbMrjPextwedQeLJHM6f/a+EuZ+hQSLrH/rF2XOg=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
let
|
||||
gouiJS = fetchurl {
|
||||
url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js";
|
||||
sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g";
|
||||
hash = "sha256-z8A5vbkAaXCw/pv9t9sFJ2xNbEOjg4vkr/YBkNptc3U=";
|
||||
};
|
||||
|
||||
publisherJS = fetchurl {
|
||||
url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js";
|
||||
sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2";
|
||||
hash = "sha256-4iKMkOEKPCo6Xrq0L5IglVZpB9wyLymCgRYz3cE9DSY=";
|
||||
};
|
||||
|
||||
packages = [
|
||||
@ -19,7 +19,8 @@ let
|
||||
"perkeep.org/cmd/pk-mount"
|
||||
];
|
||||
|
||||
in buildGoModule rec {
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "perkeep";
|
||||
version = "0.11";
|
||||
|
||||
@ -27,10 +28,10 @@ in buildGoModule rec {
|
||||
owner = "perkeep";
|
||||
repo = "perkeep";
|
||||
rev = version;
|
||||
sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll";
|
||||
hash = "sha256-lGZb9tH1MrclCRkkmNB85dP/Hl+kkue/WplNMul9RR4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b";
|
||||
vendorHash = "sha256-y+AYUG15tsj5SppY2bTg/dh3LPpp+14smCo7nLJRyak=";
|
||||
deleteVendor = true; # Vendor is out of sync with go.mod
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, libiconv, alsa-lib, stdenv }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, alsa-lib, stdenv }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sampler";
|
||||
@ -8,18 +8,18 @@ buildGoModule rec {
|
||||
owner = "sqshq";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z";
|
||||
hash = "sha256-H7QllAqPp35wHeJ405YSfPX3S4lH0/hdQ8Ja2OGLVtE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with go 1.17
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sqshq/sampler/commit/97a4a0ebe396a780d62f50f112a99b27044e832b.patch";
|
||||
sha256 = "1czns7jc85mzdf1mg874jimls8x32l35x3lysxfgfah7cvvwznbk";
|
||||
hash = "sha256-c9nP92YHKvdc156OXgYVoyNNa5TkoFeDa78WxOTR9rM=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorSha256 = "02cfzqadpsk2vkzsp7ciji9wisjza0yp35pw42q44navhbzcb4ji";
|
||||
vendorHash = "sha256-UZLF/oJbWUKwIPyWcT1QX+rIU5SRnav/3GLq2xT+jgk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
nativeBuildInputs = [ git ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,10 +8,10 @@ buildGoModule rec {
|
||||
owner = "jmhobbs";
|
||||
repo = "terminal-parrot";
|
||||
rev = version;
|
||||
sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722";
|
||||
hash = "sha256-Qhy5nCbuC9MmegXA48LFCDk4Lm1T5MBmcXfeHzTJm6w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c";
|
||||
vendorHash = "sha256-DJEoJjItusN1LTOOX1Ep+frF03yF/QmB/L66gSG0VOE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -8,10 +8,10 @@ buildGoModule rec {
|
||||
owner = "timewarrior-synchronize";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M=";
|
||||
hash = "sha256-GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs=";
|
||||
vendorHash = "sha256-iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/timewarrior-synchronize/timew-sync-server";
|
||||
|
||||
@ -12,7 +12,7 @@ buildGoModule rec {
|
||||
};
|
||||
|
||||
# Upstream has a `./vendor` directory with all deps which we rely upon.
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple GTD-style todo list for the command line";
|
||||
|
||||
@ -14,7 +14,7 @@ buildGoModule rec {
|
||||
hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Inspect the plaintext payload inside of proxied TLS connections";
|
||||
|
||||
@ -15,7 +15,7 @@ buildGoModule rec {
|
||||
sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ buildGoModule rec {
|
||||
wrapProgram $out/bin/dnsname --prefix PATH : ${lib.makeBinPath [ dnsmasq ]}
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
subPackages = [ "plugins/meta/dnsname" ];
|
||||
|
||||
doCheck = false; # NOTE: requires root privileges
|
||||
|
||||
@ -117,7 +117,7 @@ let
|
||||
k3sCNIPlugins = buildGoModule rec {
|
||||
pname = "k3s-cni-plugins";
|
||||
version = k3sCNIVersion;
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -210,7 +210,7 @@ let
|
||||
rev = "v${containerdVersion}";
|
||||
sha256 = containerdSha256;
|
||||
};
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
buildInputs = [ btrfs-progs ];
|
||||
subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ];
|
||||
ldflags = versionldflags;
|
||||
|
||||
@ -116,7 +116,7 @@ let
|
||||
k3sCNIPlugins = buildGoModule rec {
|
||||
pname = "k3s-cni-plugins";
|
||||
version = k3sCNIVersion;
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -208,7 +208,7 @@ let
|
||||
rev = "v${containerdVersion}";
|
||||
sha256 = containerdSha256;
|
||||
};
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
buildInputs = [ btrfs-progs ];
|
||||
subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ];
|
||||
ldflags = versionldflags;
|
||||
|
||||
@ -129,7 +129,7 @@ let
|
||||
k3sCNIPlugins = buildGoModule rec {
|
||||
pname = "k3s-cni-plugins";
|
||||
version = k3sCNIVersion;
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -226,7 +226,7 @@ let
|
||||
rev = "v${containerdVersion}";
|
||||
sha256 = containerdSha256;
|
||||
};
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
buildInputs = [ btrfs-progs ];
|
||||
subPackages = [ "cmd/containerd-shim-runc-v2" ];
|
||||
ldflags = versionldflags;
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-alU1c1ppn4cQi582kcA/PIAJJt73i3uG02cQvSYij1A=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules";
|
||||
|
||||
@ -10,10 +10,10 @@ buildGoModule rec {
|
||||
|
||||
owner = "kubernetes";
|
||||
repo = "test-infra";
|
||||
sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4";
|
||||
hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql";
|
||||
vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OxZH8dUl7PEzcan9Jl1rwPpP0+pj4jzLydEQfxxWM+o=";
|
||||
sha256 = "sha256-+4TQAtqM1ruhv3W1SBHAd1WVJKa7dvGLHlxVqazc+uk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3aGdn6Gp+N/a+o9dl4h0oIOnYhtu4oZuBF6X/HKjQOI=";
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||
signal-desktop = {
|
||||
dir = "Signal";
|
||||
version = "6.30.2";
|
||||
hash = "sha256-qz3eO+pTLK0J+XjAccrZIJdyoU1zyYyrnpQKeLRZvc8=";
|
||||
version = "6.31.0";
|
||||
hash = "sha256-JYufuFbIYUR3F+MHGZjmDtwTHPDhWLTkjCDDz+8hDrQ=";
|
||||
};
|
||||
signal-desktop-beta = {
|
||||
dir = "Signal Beta";
|
||||
version = "6.31.0-beta.1";
|
||||
hash = "sha256-j3DY+FY7kVVGvVuVZw/JxIpwxtgBttSyWcRaa9MCSjE=";
|
||||
version = "6.32.0-beta.1";
|
||||
hash = "sha256-7G4vjnEQnYOIVwXmBt1yZULvDaWXWTDgZCLWCZUq2Gs=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||
rev = "v${version}";
|
||||
sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Slack client for your terminal";
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "webcord";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kiw3pebjH9Pz5oi6Gbjxrjd/kvozapLNqfWLVuTXF/I=";
|
||||
hash = "sha256-g9UJANYs5IlKAeRc27oNOfdD3uD3nrG5Ecp+AbbsXLE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-CPGfhV8VXbpX9UB5oQhI+IwFWPgYq2dGnSuyByMNGg4=";
|
||||
npmDepsHash = "sha256-SSlSLZs97LDtL7OyfCtEGZjDVfsn5KKUgRNyL8J5M5g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@ -14,7 +14,7 @@ let
|
||||
inherit pname version;
|
||||
inherit (kubo-migrator-unwrapped) src;
|
||||
sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}";
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
# Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match
|
||||
# See https://github.com/ipfs/fs-repo-migrations/pull/163
|
||||
postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) ''
|
||||
|
||||
@ -27,7 +27,7 @@ buildGoModule rec {
|
||||
|
||||
passthru.tests.kubo = nixosTests.kubo;
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ];
|
||||
|
||||
|
||||
@ -15,10 +15,10 @@ buildGoModule rec {
|
||||
owner = "jonhoo";
|
||||
repo = "hasmail";
|
||||
rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d";
|
||||
sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1";
|
||||
hash = "sha256-QcUk2+JmKWfmCy46i9gna5brWS4r/D6nC6uG2Yvi09w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "129hvr8qh5mxj6mzg7793p5jsi4jmsm96f63j7r8wn544yq8sqci";
|
||||
vendorHash = "sha256-kWGNsCekWI7ykcM4k6qukkQtyx3pnPerkb0WiFHeMIk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, mullvad
|
||||
}:
|
||||
buildGoModule {
|
||||
@ -13,7 +12,7 @@ buildGoModule {
|
||||
|
||||
sourceRoot = "${mullvad.src.name}/wireguard/libwg";
|
||||
|
||||
vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU=";
|
||||
vendorHash = "sha256-QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU=";
|
||||
|
||||
# XXX: hack to make the ar archive go to the correct place
|
||||
# This is necessary because passing `-o ...` to `ldflags` does not work
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "twingate";
|
||||
version = "2023.227.93197";
|
||||
version = "2023.250.97595";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb";
|
||||
hash = "sha256-YV56U+RXpTOJvyufVKtTY1c460//ZJcifq2XroTQLXU=";
|
||||
hash = "sha256-JTkyJLbcAEcmftPKejMnxwIY+ICkaFar2fahKeXk3fs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -8,10 +8,10 @@ buildGoModule rec {
|
||||
owner = "INFURA";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0j5mj9gwwvgx7r1svlg14dpcqlj8mhwlf7sampkkih6bv92qfzcd";
|
||||
hash = "sha256-jX2HRdrLwDjnrUofRzmsSFLMbiPh0a1DPv1tzl+StUg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1d12jcd8crxcgp5m8ga691wivim4cg8cbz4pzgxp0jhzg9jplpbv";
|
||||
vendorHash = "sha256-e116ZXofSnD7+5f8xdBjpMYdeUhGPVTLfaxnhhqTIrQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Benchmark multiple API endpoints against each other";
|
||||
|
||||
@ -8,14 +8,14 @@ buildGoModule rec {
|
||||
owner = "nonoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ycy8avq5s7zspfi0d9klqcwwkpmcaz742cigd7pmcnbbhspcicp";
|
||||
hash = "sha256-l0V2NVzLsnpPe5EJcr5i9U7OGaYzNRDd1f/ogrdCnvk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CnZTUP2JBbhG8VUHbVX+vicfQJC9Y8endlwQHdmzMus=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ pulseaudio ];
|
||||
|
||||
vendorSha256 = "1srjngcis42wfskwfqxxj101y9xyzrans1smy53bh1c9zm856xha";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nonoo/kappanhang";
|
||||
description = "Remote control for Icom radio transceivers";
|
||||
|
||||
@ -102,6 +102,8 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-jn/S0xjxZPnkGYpTRIpL3dKxGe7+Z+EmOGHiE0UkQqg=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@ -20,7 +20,7 @@ in buildGoModule {
|
||||
owner = "gg-scm";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f";
|
||||
hash = "sha256-5iiu3blNJHDehg3wnvZUmfjFST+zNr89+FAoQu4CSH8=";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/gg/editor_unix.go \
|
||||
@ -33,7 +33,7 @@ in buildGoModule {
|
||||
"-X" "main.buildCommit=${commit}"
|
||||
];
|
||||
|
||||
vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405";
|
||||
vendorHash = "sha256-IU3Ac9rXsyPqRJrPJMW1eNVzQy7qoVBs9XYaLX9c5AU=";
|
||||
|
||||
nativeBuildInputs = [ pandoc installShellFiles makeWrapper ];
|
||||
nativeCheckInputs = [ bash coreutils git ];
|
||||
|
||||
@ -14,7 +14,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E=";
|
||||
};
|
||||
|
||||
vendorSha256 = null; #vendorSha256 = "";
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reconnaissance tool for GitHub code search";
|
||||
|
||||
@ -8,10 +8,10 @@ buildGoModule rec {
|
||||
owner = "apenwarr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0p1n29k2a2rpznwxlwzkmx38ic6g041k9vx7msvick7cydn417fx";
|
||||
hash = "sha256-3Z1AbPPsTBa3rqfvNAMBz7CIRq/zc9q5/TcLJWYSNlw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0m64grnmhjvfsw7a56474s894sgd24rvcp5kamhzzyc4q556hqny";
|
||||
vendorHash = "sha256-3mJoSsGE+f9hVbNctjMR7WmSkCaHmKIO125LWG1+xFQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = gitls;
|
||||
|
||||
@ -13,10 +13,10 @@ buildGoModule rec {
|
||||
owner = "uetchy";
|
||||
repo = "gst";
|
||||
rev = "v${version}";
|
||||
sha256 = "07cixz5wlzzb4cwcrncg2mz502wlhd3awql5js1glw9f6qfwc5in";
|
||||
hash = "sha256-NhbGHTYucfqCloVirkaDlAtQfhWP2cw4I+t/ysvvkR0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh";
|
||||
vendorHash = "sha256-kGPg6NyhVfVOn0BFQY83/VYdpUjOqaf5I4bev0uhvUw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ lib.recurseIntoAttrs
|
||||
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
|
||||
mpris = callPackage ./mpris.nix { };
|
||||
mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { };
|
||||
mpv-webm = callPackage ./mpv-webm.nix { };
|
||||
mpvacious = callPackage ./mpvacious.nix { };
|
||||
quality-menu = callPackage ./quality-menu.nix { };
|
||||
simple-mpv-webui = callPackage ./simple-mpv-webui.nix { };
|
||||
|
||||
36
pkgs/applications/video/mpv/scripts/mpv-webm.nix
Normal file
36
pkgs/applications/video/mpv/scripts/mpv-webm.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, luaPackages
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "mpv-webm";
|
||||
version = "unstable-2023-02-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ekisu";
|
||||
repo = "mpv-webm";
|
||||
rev = "a18375932e39e9b2a40d9c7ab52ea367b41e2558";
|
||||
hash = "sha256-aetkQ1gU/6Yys5FJS/N06ED9tCSvL6BAgUGdNmNmpbU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ luaPackages.moonscript ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
install -m 644 build/webm.lua $out/share/mpv/scripts/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "webm.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple WebM maker for mpv, with no external dependencies";
|
||||
homepage = "https://github.com/ekisu/mpv-webm";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ pbsds ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prism";
|
||||
@ -8,10 +8,10 @@ buildGoModule rec {
|
||||
owner = "muesli";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511";
|
||||
hash = "sha256-IRR7Gu+wGUUYyFfhc003QVlEaWCJPmi6XYVUN6Q6+GA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq";
|
||||
vendorHash = "sha256-uKtVifw4dxJdVvHxytL+9qjXHEdTyiz8U8n/95MObdY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An RTMP stream recaster/splitter";
|
||||
|
||||
@ -21,7 +21,7 @@ buildGoModule rec{
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
sha256 = "0in8kyi4jprvbm3zsl3risbjj8b0ma62yl3rq8rcvcgypx0mn7d4";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
56
pkgs/by-name/st/static-server/package.nix
Normal file
56
pkgs/by-name/st/static-server/package.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, buildGo121Module
|
||||
, fetchFromGitHub
|
||||
, curl
|
||||
, stdenv
|
||||
, testers
|
||||
, static-server
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
buildGo121Module rec {
|
||||
pname = "static-server";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eliben";
|
||||
repo = "static-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AZcNh/kF6IdAceA7qe+nhRlwU4yGh19av/S1Zt7iKIs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1p3dCLLo+MTPxf/Y3zjxTagUi+tq7nZSj4ZB/aakJGY=";
|
||||
|
||||
patches = [
|
||||
# patch out debug.ReadBuidlInfo since version information is not available with buildGoModule
|
||||
(substituteAll {
|
||||
src = ./version.patch;
|
||||
inherit version;
|
||||
})
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
curl
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
# tests sometimes fail with SIGQUIT on darwin
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = static-server;
|
||||
};
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple, zero-configuration HTTP server CLI for serving static files";
|
||||
homepage = "https://github.com/eliben/static-server";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "static-server";
|
||||
};
|
||||
}
|
||||
23
pkgs/by-name/st/static-server/version.patch
Normal file
23
pkgs/by-name/st/static-server/version.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- a/internal/server/server.go
|
||||
+++ b/internal/server/server.go
|
||||
@@ -15,7 +15,6 @@ import (
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
- "runtime/debug"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -50,11 +49,7 @@ func Main() int {
|
||||
flags.Parse(os.Args[1:])
|
||||
|
||||
if *versionFlag {
|
||||
- if buildInfo, ok := debug.ReadBuildInfo(); ok {
|
||||
- fmt.Printf("%v %v\n", programName, buildInfo.Main.Version)
|
||||
- } else {
|
||||
- errorLog.Printf("version info unavailable! run 'go version -m %v'", programName)
|
||||
- }
|
||||
+ fmt.Printf("%v %v\n", programName, "@version@")
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
56
pkgs/by-name/tm/tmuxifier/package.nix
Normal file
56
pkgs/by-name/tm/tmuxifier/package.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib, stdenv, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tmuxifier";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jimeh";
|
||||
repo = "tmuxifier";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7TvJnvtZEo5h45PcSy3tJN09UblswV0mQbTaKjgLyqw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
sed -i "s@set -e@TMUXIFIER=$out\nTMUXIFIER_LAYOUT_PATH=\"\''${TMUXIFIER_LAYOUT_PATH:-\$HOME/.tmux-layouts}\"\nset -e@" \
|
||||
bin/tmuxifier
|
||||
sed -i "s@\$TMUXIFIER/lib/@\$TMUXIFIER/lib/tmuxifier/@g" \
|
||||
bin/tmuxifier libexec/* lib/*
|
||||
sed -i "s@\$TMUXIFIER/templates/@\$TMUXIFIER/share/tmuxifier/templates/@g; s@\$TMUXIFIER/init.@\$TMUXIFIER/share/tmuxifier/init/init.@g" \
|
||||
libexec/*
|
||||
sed -i "s@\$TMUXIFIER/completion/tmuxifier.bash@\$TMUXIFIER/share/bash-completion/completions/tmuxifier.bash@g; s@\$TMUXIFIER/completion/tmuxifier.zsh@\$TMUXIFIER/share/zsh/site-functions/_tmuxifier@g" \
|
||||
init.sh
|
||||
sed -i "s@\$TMUXIFIER/completion/tmuxifier.tcsh@\$TMUXIFIER/share/tmuxifier/completion/tmuxifier.tcsh@g" \
|
||||
init.tcsh
|
||||
sed -i "s@\$TMUXIFIER/completion/tmuxifier.fish@\$TMUXIFIER/share/fish/vendor_completions.d/tmuxifier.fish@g" \
|
||||
init.fish
|
||||
|
||||
install -t $out/bin -Dm555 bin/tmuxifier
|
||||
install -t $out/share/tmuxifier/init -Dm444 init.fish init.sh init.tcsh
|
||||
install -t $out/share/tmuxifier/templates -Dm444 templates/*
|
||||
install -t $out/lib/tmuxifier -Dm444 lib/*
|
||||
cp -r libexec $out
|
||||
installShellCompletion --cmd tmuxifier \
|
||||
--bash completion/tmuxifier.bash \
|
||||
--fish completion/tmuxifier.fish \
|
||||
--zsh completion/tmuxifier.zsh
|
||||
install -t $out/share/tmuxifier/completion -Dm444 completion/tmuxifier.tcsh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Powerful session, window & pane management for Tmux";
|
||||
homepage = "https://github.com/jimeh/tmuxifier";
|
||||
license = licenses.mit;
|
||||
mainProgram = "tmuxifier";
|
||||
maintainers = with maintainers; [ wigust ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -16,7 +16,6 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
, polkit
|
||||
, wrapGAppsHook
|
||||
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
@ -65,11 +63,6 @@ stdenv.mkDerivation rec {
|
||||
"-Dcurated=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-notifications";
|
||||
version = "7.0.0";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HEkuNJgG0WEOKO6upwQgXg4huA7dNyz73U1nyOjQiTs=";
|
||||
sha256 = "sha256-vm+wMHyWWtOWM0JyiesfpzC/EmkTNbprXaBgVUDQvDg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "lunarml";
|
||||
|
||||
version = "unstable-2023-09-16";
|
||||
version = "unstable-2023-09-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minoki";
|
||||
repo = "LunarML";
|
||||
rev = "0fe97ebed71d6aa24c9e80436d45af1b3ef6abd3";
|
||||
sha256 = "KSLQva4Lv+hZWrx2cMbLOj82ldodiGn/9j8ksB1FN+s=";
|
||||
rev = "c6e23ae68149bda550ddb75c0df9f422aa379b3a";
|
||||
sha256 = "DY4gOCXfGV1OVdGXd6GGvbHlQdWWxMg5TZzkceeOu9o=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ mkDerivation }:
|
||||
mkDerivation {
|
||||
version = "1.15.5";
|
||||
sha256 = "sha256-2M1xen5gwmtOu4ug0XkxYke6h+Bw89JkpQGMDhbtNa0=";
|
||||
version = "1.15.6";
|
||||
sha256 = "sha256-eRwyqylldsJOsGAwm61m7jX1yrVDrTPS0qO23lJkcKc=";
|
||||
# https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
|
||||
minimumOTPVersion = "24";
|
||||
escriptPath = "lib/elixir/scripts/generate_app.escript";
|
||||
|
||||
@ -20,7 +20,7 @@ buildGoModule {
|
||||
|
||||
nativeBuildInputs = [ cmake ninja perl ];
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
# hack to get both go and cmake configure phase
|
||||
# (if we use postConfigure then cmake will loop runHook postConfigure)
|
||||
|
||||
@ -12,11 +12,12 @@
|
||||
, gtksourceview5
|
||||
, enchant
|
||||
, icu
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libspelling";
|
||||
version = "unstable-2023-07-17";
|
||||
version = "0.2.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
@ -24,8 +25,8 @@ stdenv.mkDerivation {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "chergert";
|
||||
repo = "libspelling";
|
||||
rev = "65185023db95ec464970aeaeab766fe3ba26ae7d";
|
||||
hash = "sha256-R3nPs16y8XGamQvMSF7wb52h0jxt17H2FZPwauLDI/c=";
|
||||
rev = version;
|
||||
hash = "sha256-OOSQgdtnEx6/5yKwavCGdY/5L0Mr3XW0Srmd42ZTdUk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -50,10 +51,13 @@ stdenv.mkDerivation {
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Spellcheck library for GTK 4";
|
||||
homepage = "https://gitlab.gnome.org/chergert/libspelling";
|
||||
license = licenses.lgpl21Plus;
|
||||
changelog = "https://gitlab.gnome.org/chergert/libspelling/-/raw/${version}/NEWS";
|
||||
maintainers = with maintainers; [ chuangzhu ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,12 +13,12 @@ let p2 = buildGoModule rec {
|
||||
owner = "gobuffalo";
|
||||
repo = "packr";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai";
|
||||
hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ=";
|
||||
}+"/v2";
|
||||
|
||||
subPackages = [ "packr2" ];
|
||||
|
||||
vendorSha256 = "12yq121b0bn8z12091fyqhhz421kgx4z1nskrkvbxlhyc47bwyrp";
|
||||
vendorHash = "sha256-N3u+DmEe0r72zFPb8El/MwjyIcTehQRE+MgusIII2Is=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -45,12 +45,12 @@ p1 = buildGoModule rec {
|
||||
owner = "gobuffalo";
|
||||
repo = "packr";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai";
|
||||
hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ=";
|
||||
};
|
||||
|
||||
subPackages = [ "packr" ];
|
||||
|
||||
vendorSha256 = "0m3yj8ww4a16j56p8d8w0sdnyx0g2bkd8zg0l4d8vb72mvg5asga";
|
||||
vendorHash = "sha256-6mlV3q7irI0aoeB91OYSD3RvmwYcNXRNkSYowjmSflQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -12,10 +12,10 @@ buildGoModule rec {
|
||||
owner = "markbates";
|
||||
repo = "pkger";
|
||||
rev = "v${version}";
|
||||
sha256 = "12zcvsd6bv581wwhahp1wy903495s51lw86b99cfihwmxc5qw6ww";
|
||||
hash = "sha256-nBuOC+uVw+hYSssgTkPRJZEBkufhQgU5D6jsZZre7Is=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp";
|
||||
vendorHash = "sha256-9+2s84bqoNU3aaxmWYzIuFKPA3Tw9phXu5Csaaq/L60=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aardwolf";
|
||||
version = "0.2.7";
|
||||
version = "0.2.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -33,14 +33,14 @@ buildPythonPackage rec {
|
||||
owner = "skelsec";
|
||||
repo = "aardwolf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xz3461QgZ2tySj2cTlKQ5faYQDSECvbk1U6QCbzM86w=";
|
||||
hash = "sha256-4kJsW0uwWfcgVruEdDw3QhbzfPDuLjmK+YvcLrgF4SI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/aardwolf/utils/rlers";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-JGXTCCyC20EuUX0pP3xSZG3qFB5jRL7+wW2YRC3EiCc=";
|
||||
hash = "sha256-i7fmdWOseRQGdvdBnlGi+lgWvhC2WFI2FwXU9JywYsc=";
|
||||
};
|
||||
|
||||
cargoRoot = "aardwolf/utils/rlers";
|
||||
|
||||
@ -8,15 +8,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amaranth-soc";
|
||||
version = "unstable-2021-12-10";
|
||||
version = "unstable-2023-09-15";
|
||||
# python setup.py --version
|
||||
realVersion = "0.1.dev49+g${lib.substring 0 7 src.rev}";
|
||||
realVersion = "0.1.dev70+g${lib.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaranth-lang";
|
||||
repo = "amaranth-soc";
|
||||
rev = "217d4ea76ad3b3bbf146980d168bc7b3b9d95a18";
|
||||
sha256 = "dMip82L7faUn16RDeG3NgMv0nougpwTwDWLX0doD2YA=";
|
||||
rev = "cce8a79a37498f4d5900be21a295ba77e51e6c9d";
|
||||
sha256 = "sha256-hfkJaqICuy3iSTwLM9lbUPvSMDBLW8GdxqswyAOsowo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, pdm
|
||||
, python3
|
||||
, pyvcd
|
||||
, jinja2
|
||||
, importlib-resources
|
||||
@ -20,52 +20,27 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amaranth";
|
||||
version = "0.3";
|
||||
# python setup.py --version
|
||||
realVersion = "0.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "pyproject";
|
||||
# python -m setuptools_scm
|
||||
version = "0.4.dev197+g${lib.substring 0 7 src.rev}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaranth-lang";
|
||||
repo = "amaranth";
|
||||
rev = "39a83f4d995d16364cc9b99da646ff8db6394166";
|
||||
sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0=";
|
||||
rev = "11d5bb19eb34463918c07dc5e2e0eac7dbf822b0";
|
||||
sha256 = "sha256-Ji5oYfF2hKSunAdAQTniv8Ajj6NE/bvW5cvadrGKa+U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-for-setuptools-64.0.2-preparation.patch";
|
||||
url = "https://github.com/amaranth-lang/amaranth/commit/64771a065a280fa683c1e6692383bec4f59f20fa.patch";
|
||||
hash = "sha256-Rsh9vVvUQj9nIcrsRirmR6XwFrfZ2VMaYJ4RCQ8sBE0=";
|
||||
# This commit removes support for Python 3.6, which is unnecessary to fix
|
||||
# the build when using new setuptools. Include only one file, which has a
|
||||
# harmless comment change so that the subsequent patch applies cleanly.
|
||||
includes = ["amaranth/_toolchain/cxx.py"];
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-for-setuptools-64.0.2.patch";
|
||||
url = "https://github.com/amaranth-lang/amaranth/pull/722/commits/e5a56b07c568e5f4cc2603eefebd14c5cc4e13d8.patch";
|
||||
hash = "sha256-C8FyMSKHA7XsEMpO9eYNZx/X5rGaK7p3eXP+jSb6wVg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "add-python-3.11-support.patch";
|
||||
url = "https://github.com/amaranth-lang/amaranth/commit/851546bf2d16db62663d7002bece51f07078d0a5.patch";
|
||||
hash = "sha256-eetlFCLqmpCfTKViD16OScJbkql1yhdi5uJGnfnpcCE=";
|
||||
})
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
pdm
|
||||
pyvcd
|
||||
setuptools
|
||||
python3.pkgs.pdm-backend
|
||||
] ++
|
||||
lib.optional (pythonOlder "3.9") importlib-resources ++
|
||||
lib.optional (pythonOlder "3.8") importlib-metadata;
|
||||
@ -77,17 +52,6 @@ buildPythonPackage rec {
|
||||
yosys
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "Jinja2~=2.11" "Jinja2>=2.11" \
|
||||
--replace "pyvcd~=0.2.2" "pyvcd" \
|
||||
--replace "amaranth-yosys>=0.10.*" "amaranth-yosys>=0.10"
|
||||
|
||||
# jinja2.contextfunction was removed in jinja2 v3.1
|
||||
substituteInPlace amaranth/build/plat.py \
|
||||
--replace "@jinja2.contextfunction" "@jinja2.pass_context"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "amaranth" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "3.1.3";
|
||||
version = "3.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Nd/9mUtEEhCiJSF677lsE5UhMrbWiIl3ktQ7FjtyYlQ=";
|
||||
hash = "sha256-3dftk/C6g6Hclc/N8LlsYcZfxA1I6bMiXkzRcUg69Oc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
25
pkgs/development/python-modules/django-types/default.nix
Normal file
25
pkgs/development/python-modules/django-types/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-types";
|
||||
version = "0.17.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wcQqt4h2xXxyg0LVqwYHJas3H8jcg7uFuuC+BoRqrXA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Type stubs for Django";
|
||||
homepage = "https://pypi.org/project/django-types";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ thubrecht ];
|
||||
};
|
||||
}
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fx2";
|
||||
version = "0.11";
|
||||
version = "unstable-2023-09-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "whitequark";
|
||||
repo = "libfx2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uJpXsUMFqJY7mjj1rtfc0XWEfNDxO1xXobgBDGFHnp4=";
|
||||
rev = "73fa811818d56a86b82c12e07327946aeddd2b3e";
|
||||
hash = "sha256-AGQPOVTdaUCUeVVNQTBmoNvz5CGxcBOK7+oL+X8AcIw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ sdcc ];
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.15.1";
|
||||
version = "3.15.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XihIFu8TUrZgQqJ43LJVB0vCIjf89MpGfmDXS5yUuoM=";
|
||||
hash = "sha256-GaGxn7Q5blqPWNWIl6pRV9lLzmGm5GGwqcyOuAWI0Ds=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skodaconnect";
|
||||
version = "1.3.6";
|
||||
version = "1.3.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "lendy007";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gV/+mt6XxY1UcA1H8zM4pG1ugrDo0m876e3XG1yV32A=";
|
||||
hash = "sha256-FJnByPP1hUs6ECuZh9aMJksq32xhPcWWolSFBzP7Zd8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "8.8.0";
|
||||
version = "8.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fWAVTaie+6lz5cX7hg0s22kHXelIfhh5FNTfxxbUEPw=";
|
||||
hash = "sha256-apdLWv4UV4MTAx+kyi/MaOibmBYjwMamaI9b6IGKIl0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "upcloud-api";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UpCloudLtd";
|
||||
repo = "upcloud-python-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-35vPODc/oL+JPMnStFutIRYVTUkYAXKRt/KXBW0Yc+U=";
|
||||
hash = "sha256-fMsI0aZ8jA08rrNPm8HmfYz/a3HLUExvvXIeDGPh2e8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9rXAFMFpKF+oIKXSFLVCLDfdpMF837xRIEe3aH7ditc=";
|
||||
hash = "sha256-7LFKqC8IHzXKKU5Pw6Qud9jqJFc0lSEJFn636T6CsfQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
# This package comes with its own version of goimports, gofmt and goreturns
|
||||
# but these binaries are outdated and are offered by other packages.
|
||||
|
||||
@ -4,7 +4,7 @@ assert dcompiler != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dub";
|
||||
version = "1.30.0";
|
||||
version = "1.33.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "dlang";
|
||||
repo = "dub";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iVl7bjblvIxvrUX7Phq6h4AIAmZjNVkGYYFA1hhsE7c=";
|
||||
sha256 = "sha256-4Mha7WF6cg3DIccfpvOnheuvgfziv/7wo8iFsPXO4yY=";
|
||||
};
|
||||
|
||||
dubvar = "\\$DUB";
|
||||
@ -137,6 +137,7 @@ stdenv.mkDerivation rec {
|
||||
rm -r test/path-subpackage-ref
|
||||
rm -r test/sdl-package-simple
|
||||
rm -r test/dpath-variable # requires execution of dpath-variable.sh
|
||||
rm -r test/use-c-sources
|
||||
|
||||
./test/run-unittest.sh
|
||||
'';
|
||||
@ -150,7 +151,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Package and build manager for D applications and libraries";
|
||||
homepage = "https://code.dlang.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ThomasMader ];
|
||||
maintainers = with maintainers; [ ThomasMader jtbx ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
|
||||
inherit (sharness) SHARNESS_TEST_SRCDIR;
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
modRoot = "./src";
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
hash = "sha256-HkvDJVSGve6t1gEek8FvfIK20r5TOHRJ71KsGUj95fM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace main.go --replace 0.0.0 ${version}
|
||||
|
||||
@ -8,10 +8,10 @@ buildGoModule rec {
|
||||
owner = "mathaou";
|
||||
repo = "termdbms";
|
||||
rev = "d46e72c796e8aee0def71b8e3499b0ebe5ca3385";
|
||||
sha256 = "1c3xgidhmvlcdw7v5gcqzv27cb58f1ix8sfd4r14rfz7c8kbv37v";
|
||||
hash = "sha256-+4y9JmLnu0xCJs1p1GNwqCx2xP6YvbIPb4zuClt8fbA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0h9aw68niizd9gs0i890g6ij13af04qgpfy1g5pskyr4ryx0gn26";
|
||||
vendorHash = "sha256-RtgHus8k+6lvecG7+zABTo0go3kgoQj0S+3HaJHhKkE=";
|
||||
|
||||
patches = [ ./viewer.patch ];
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ buildGoModule rec {
|
||||
hash = "sha256-wEC9kENcE3u+Mb7uLbx/VBUup6PBnCY5cxTYvkJcavg=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-G1/Wbz836yfGZ/1ArICrNbWU6eh4SHXDmo4FKkjUszY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
subPackages = ".";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ OpenGL AppKit ];
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-CoreqnMRuPuv+Ci1uyF3HJCJFwK2jwB79okynv6AHTA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeCheckInputs = with llvmPackages; [
|
||||
clang
|
||||
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/gocode $out/bin/gocode-gomod
|
||||
|
||||
@ -14,7 +14,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Calculate cyclomatic complexities of functions in Go source code";
|
||||
|
||||
@ -7,7 +7,7 @@ buildGoModule rec {
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ buildGoModule rec {
|
||||
version = "2019-02-28";
|
||||
rev = "b37376c5da6aeb900611837098f40f81972e63e4";
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-ebxz2uTH7XwD3j6JnsfET6aCGYjvsCjow/sU9pagg50=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simply tool to convert json to yaml written in Go";
|
||||
|
||||
@ -8,11 +8,12 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmos72";
|
||||
repo = "gomacro";
|
||||
sha256 = "0ci486zqrhzvs3njn2ygaxsgjx3fn8bbj2q3sd80xvjiyjvq866g";
|
||||
inherit rev;
|
||||
hash = "sha256-zxiEt/RR7g5Q0wMLuRaybnT5dFfPCyvt0PvDjL9BJDI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1ib4h57drikyy5aq4ms6vc1p29djlpjrh7xd3bgyykr9zmm2w1kx";
|
||||
vendorHash = "sha256-fQYuav0pT+/fGq0fmOWlsiVxA9tGV4JV8X7G3E6BZMU=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,16 +4,16 @@ buildGoModule rec {
|
||||
pname = "gopkgs";
|
||||
version = "2.1.2";
|
||||
|
||||
subPackages = [ "cmd/gopkgs" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "uudashr";
|
||||
repo = "gopkgs";
|
||||
sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln";
|
||||
hash = "sha256-ll5fhwzzCNL0UtMLNSGOY6Yyy0EqI8OZ1iqWad4KU8k=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1pwsc488ldw039by8nqpni801zry7dnf0rx4hhd73xpv2w7s8n2r";
|
||||
vendorHash = "sha256-WVikDxf79nEahKRn4Gw7Pv8AULQXW+RXGoA3ihBhmt8=";
|
||||
|
||||
subPackages = [ "cmd/gopkgs" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
# This is required for wrapProgram.
|
||||
allowGoReference = true;
|
||||
|
||||
@ -14,7 +14,7 @@ buildGoModule rec {
|
||||
hash = "sha256-WR6wLa/Za5MgcH1enHG/74uq/7PdaY/OzvJdgMgDFIk=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An idempotent command-line utility for managing your /etc/hosts* file.";
|
||||
|
||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
sha256 = "0r5hihzp2679ki9hr3p0f085rafy2hc8kpkdhnd4m5k4iibqib08";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
postPatch = ''
|
||||
V={newgidmap,newgidmap} \
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
sha256 = "sha256-vjb5wEiJw48s7FUarpA94ZauFC7iEgRDAkRTwRIZ8pA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls";
|
||||
};
|
||||
|
||||
vendorSha256 = null; #vendorSha256 = "";
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -8,17 +8,17 @@ buildGoModule rec {
|
||||
owner = "jlesquembre";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ib61af6fwsl35gmid9jj0fp8zxgzrw4qk32r03hxzkh9g7r3kla";
|
||||
hash = "sha256-is6Rz0tw/g4HyGJMTHj+r390HZAytVhfGVRzZ5wKZkU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UUMulGnqfIshN2WIejZgwrWWlywj5TpnAQ4A5/d0NCE=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}"
|
||||
];
|
||||
|
||||
vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -14,6 +14,8 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ ldc dub ];
|
||||
|
||||
HOME = "home";
|
||||
|
||||
installPhase = "install -D bin/lit $out/bin/lit";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user