Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
23c6d36ba0
@ -2469,6 +2469,12 @@
|
||||
githubId = 452652;
|
||||
name = "Kosyrev Serge";
|
||||
};
|
||||
DeeUnderscore = {
|
||||
email = "d.anzorge@gmail.com";
|
||||
github = "DeeUnderscore";
|
||||
githubId = 156239;
|
||||
name = "D Anzorge";
|
||||
};
|
||||
delan = {
|
||||
name = "Delan Azabani";
|
||||
email = "delan@azabani.com";
|
||||
@ -5490,6 +5496,12 @@
|
||||
githubId = 25607;
|
||||
name = "Raimon Grau";
|
||||
};
|
||||
kidonng = {
|
||||
email = "hi@xuann.wang";
|
||||
github = "kidonng";
|
||||
githubId = 44045911;
|
||||
name = "Kid";
|
||||
};
|
||||
kierdavis = {
|
||||
email = "kierdavis@gmail.com";
|
||||
github = "kierdavis";
|
||||
|
||||
@ -165,6 +165,20 @@ elsif (defined $expr) {
|
||||
my $hash = $fetch->{hash};
|
||||
my $name = $fetch->{name};
|
||||
|
||||
if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) {
|
||||
$algo = $1;
|
||||
$hash = `nix hash to-base16 $hash` or die;
|
||||
chomp $hash;
|
||||
}
|
||||
|
||||
next unless $algo =~ /^[a-z0-9]+$/;
|
||||
|
||||
# Convert non-SRI base-64 to base-16.
|
||||
if ($hash =~ /^[A-Za-z0-9+\/=]+$/) {
|
||||
$hash = `nix hash to-base16 --type '$algo' $hash` or die;
|
||||
chomp $hash;
|
||||
}
|
||||
|
||||
if (defined $ENV{DEBUG}) {
|
||||
print "$url $algo $hash\n";
|
||||
next;
|
||||
@ -184,7 +198,7 @@ elsif (defined $expr) {
|
||||
|
||||
my $storePath = makeFixedOutputPath(0, $algo, $hash, $name);
|
||||
|
||||
print STDERR "mirroring $url ($storePath)...\n";
|
||||
print STDERR "mirroring $url ($storePath, $algo, $hash)...\n";
|
||||
|
||||
if ($dryRun) {
|
||||
$mirrored++;
|
||||
|
||||
@ -105,6 +105,14 @@
|
||||
<link linkend="opt-services.hockeypuck.enable">services.hockeypuck</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/buildkite/buildkite-agent-metrics">buildkite-agent-metrics</link>,
|
||||
a command-line tool for collecting Buildkite agent metrics,
|
||||
now has a Prometheus exporter available as
|
||||
<link linkend="opt-services.prometheus.exporters.buildkite-agent.enable">services.prometheus.exporters.buildkite-agent</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-incompatibilities">
|
||||
|
||||
@ -32,6 +32,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [Hockeypuck](https://github.com/hockeypuck/hockeypuck), a OpenPGP Key Server. Available as [services.hockeypuck](#opt-services.hockeypuck.enable).
|
||||
|
||||
- [buildkite-agent-metrics](https://github.com/buildkite/buildkite-agent-metrics), a command-line tool for collecting Buildkite agent metrics, now has a Prometheus exporter available as [services.prometheus.exporters.buildkite-agent](#opt-services.prometheus.exporters.buildkite-agent.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
|
||||
|
||||
|
||||
@ -499,7 +499,7 @@ class Machine:
|
||||
output += out
|
||||
return output
|
||||
|
||||
def wait_until_succeeds(self, command: str) -> str:
|
||||
def wait_until_succeeds(self, command: str, timeout: int = 900) -> str:
|
||||
"""Wait until a command returns success and return its output.
|
||||
Throws an exception on timeout.
|
||||
"""
|
||||
@ -511,7 +511,7 @@ class Machine:
|
||||
return status == 0
|
||||
|
||||
with self.nested("waiting for success: {}".format(command)):
|
||||
retry(check_success)
|
||||
retry(check_success, timeout)
|
||||
return output
|
||||
|
||||
def wait_until_fails(self, command: str) -> str:
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{
|
||||
x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11";
|
||||
i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11";
|
||||
aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11";
|
||||
x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11";
|
||||
x86_64-linux = "/nix/store/qsgz2hhn6mzlzp53a7pwf9z2pq3l5z6h-nix-2.3.14";
|
||||
i686-linux = "/nix/store/1yw40bj04lykisw2jilq06lir3k9ga4a-nix-2.3.14";
|
||||
aarch64-linux = "/nix/store/32yzwmynmjxfrkb6y6l55liaqdrgkj4a-nix-2.3.14";
|
||||
x86_64-darwin = "/nix/store/06j0vi2d13w4l0p3jsigq7lk4x6gkycj-nix-2.3.14";
|
||||
aarch64-darwin = "/nix/store/77wi7vpbrghw5rgws25w30bwb8yggnk9-nix-2.3.14";
|
||||
}
|
||||
|
||||
@ -27,6 +27,7 @@ let
|
||||
"bird"
|
||||
"bitcoin"
|
||||
"blackbox"
|
||||
"buildkite-agent"
|
||||
"collectd"
|
||||
"dnsmasq"
|
||||
"domain"
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.buildkite-agent;
|
||||
in
|
||||
{
|
||||
port = 9876;
|
||||
extraOpts = {
|
||||
tokenPath = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
apply = final: if final == null then null else toString final;
|
||||
description = ''
|
||||
The token from your Buildkite "Agents" page.
|
||||
|
||||
A run-time path to the token file, which is supposed to be provisioned
|
||||
outside of Nix store.
|
||||
'';
|
||||
};
|
||||
interval = mkOption {
|
||||
type = types.str;
|
||||
default = "30s";
|
||||
example = "1min";
|
||||
description = ''
|
||||
How often to update metrics.
|
||||
'';
|
||||
};
|
||||
endpoint = mkOption {
|
||||
type = types.str;
|
||||
default = "https://agent.buildkite.com/v3";
|
||||
description = ''
|
||||
The Buildkite Agent API endpoint.
|
||||
'';
|
||||
};
|
||||
queues = mkOption {
|
||||
type = with types; nullOr (listOf str);
|
||||
default = null;
|
||||
example = literalExample ''[ "my-queue1" "my-queue2" ]'';
|
||||
description = ''
|
||||
Which specific queues to process.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
script =
|
||||
let
|
||||
queues = concatStringsSep " " (map (q: "-queue ${q}") cfg.queues);
|
||||
in
|
||||
''
|
||||
export BUILDKITE_AGENT_TOKEN="$(cat ${toString cfg.tokenPath})"
|
||||
exec ${pkgs.buildkite-agent-metrics}/bin/buildkite-agent-metrics \
|
||||
-backend prometheus \
|
||||
-interval ${cfg.interval} \
|
||||
-endpoint ${cfg.endpoint} \
|
||||
${optionalString (cfg.queues != null) queues} \
|
||||
-prometheus-addr "${cfg.listenAddress}:${toString cfg.port}" ${concatStringsSep " " cfg.extraFlags}
|
||||
'';
|
||||
serviceConfig = {
|
||||
DynamicUser = false;
|
||||
RuntimeDirectory = "buildkite-agent-metrics";
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -424,6 +424,7 @@ in
|
||||
taskserver = handleTest ./taskserver.nix {};
|
||||
telegraf = handleTest ./telegraf.nix {};
|
||||
tiddlywiki = handleTest ./tiddlywiki.nix {};
|
||||
tigervnc = handleTest ./tigervnc.nix {};
|
||||
timezone = handleTest ./timezone.nix {};
|
||||
tinc = handleTest ./tinc {};
|
||||
tinydns = handleTest ./tinydns.nix {};
|
||||
|
||||
53
nixos/tests/tigervnc.nix
Normal file
53
nixos/tests/tigervnc.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ system ? builtins.currentSystem
|
||||
, config ? {}
|
||||
, pkgs ? import ../.. { inherit system config; }
|
||||
}:
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
makeTest {
|
||||
name = "tigervnc";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ lheckemann ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
server = { pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
tigervnc # for Xvnc
|
||||
xorg.xwininfo
|
||||
imagemagickBig # for display with working label: support
|
||||
];
|
||||
networking.firewall.allowedTCPPorts = [ 5901 ];
|
||||
};
|
||||
|
||||
client = { pkgs, ... }: {
|
||||
imports = [ ./common/x11.nix ];
|
||||
# for vncviewer
|
||||
environment.systemPackages = [ pkgs.tigervnc ];
|
||||
};
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
for host in [server, client]:
|
||||
host.succeed("echo foobar | vncpasswd -f > vncpasswd")
|
||||
|
||||
server.succeed("Xvnc -geometry 720x576 :1 -PasswordFile vncpasswd &")
|
||||
server.wait_until_succeeds("nc -z localhost 5901", timeout=10)
|
||||
server.succeed("DISPLAY=:1 xwininfo -root | grep 720x576")
|
||||
server.execute("DISPLAY=:1 display -size 360x200 -font sans -gravity south label:'HELLO VNC WORLD' &")
|
||||
|
||||
client.wait_for_x()
|
||||
client.execute("vncviewer server:1 -PasswordFile vncpasswd &")
|
||||
client.wait_for_window(r"VNC")
|
||||
client.screenshot("screenshot")
|
||||
text = client.get_screen_text()
|
||||
# Displayed text
|
||||
assert 'HELLO VNC WORLD' in text
|
||||
# Client window title
|
||||
assert 'TigerVNC' in text
|
||||
'';
|
||||
}
|
||||
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = " https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz";
|
||||
url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz";
|
||||
sha256 = "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj";
|
||||
})
|
||||
(fetchurl {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -7,10 +7,10 @@ in
|
||||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
ffversion = "90.0";
|
||||
ffversion = "90.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "233ad59e4ab2f08d2253b49235b51b26fa32fb7c285928110573ccbe67c79965d9401a6c58a3af2ad22b8a58ca5d9b3154e3e8c9d29b153acd16152d9b75442c";
|
||||
sha512 = "9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -52,14 +52,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.2.1";
|
||||
version = "29.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
githubBase = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
sha256 = "0djjl79jrnny16p32db5w7pwwv0a24dc8mg1s1bnavhlvmmk52vq";
|
||||
sha256 = "1q0w1ffmdfk22df4p2ks4n55zmz44ir8fbcdn5a5h4ihy73nf6xp";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -88,19 +88,19 @@ let
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "10.0.18";
|
||||
version = "10.5.2";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
|
||||
sha256 = "15ni33mkg3awfmk3ynr0vi4max1h2k0s10xw3dpmdx6chzv4ll14";
|
||||
sha256 = "16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
|
||||
sha256 = "16lx8wkxli1fzq5f6gcw3im4p8k3xdmnmf6w0p7n8hd8681b1w5s";
|
||||
sha256 = "0xc3ac2y9xf7ff3pqrp5n6l9j8i5hk3y2y3zwykwhnycnfi6dfv4";
|
||||
};
|
||||
};
|
||||
in
|
||||
@ -311,6 +311,13 @@ stdenv.mkDerivation rec {
|
||||
# chance that TBB would continue using old font files.
|
||||
rm -rf "\$HOME/.cache/fontconfig"
|
||||
|
||||
# Manually specify data paths (by default TB attempts to create these in the store)
|
||||
{
|
||||
echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");"
|
||||
echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");"
|
||||
echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");"
|
||||
} >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js"
|
||||
|
||||
# Lift-off
|
||||
#
|
||||
# XAUTHORITY and DISPLAY are required for TBB to work at all.
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
sha256 = "sha256-jzLffTAGlNeglzoJ3AG4d0pwrkXmT5ttJxr2z4MwP90=";
|
||||
sha256 = "sha256-MHERRJ9t7EG4sd4gevUnZLA25UnRqZprCXFWkp5roms=";
|
||||
};
|
||||
vendorSha256 = "sha256-q/m1H6gcnn35ULi+e8fVuJg8eIXhzizGwXJmyf1Hfy4=";
|
||||
vendorSha256 = "sha256-lzRIXZXrNQOwgl774B9r6OW/O8QwykSk3Mv5oGmvDuY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.21.2";
|
||||
version = "1.21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GAX8ODjGj5LM44KgJC0N5uuOH4z33lDWoQgImOl8/xo=";
|
||||
sha256 = "sha256-GMigdVuqJN6eIN0nhY5PVUEnCqjAYUzitetk2QmX5wQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cqIIpdkQ6DF7DKXvwCoJBQKG0+lL8iP/Vx0q7rL8prg=";
|
||||
sha256 = "sha256-uYiGerxZb5GW1dOcflERF3wvgJ8VOtRmQkyzC/ztwjk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0+k1e7Sn+NYGAJDVUbUm0oedc1t2blezUhsjDIuIKvA=";
|
||||
vendorSha256 = "sha256-kGSibuXutyOvDkmajIQ0AqrwR3VUiWoM1Y2zk3MwwyU=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
||||
@ -21,13 +21,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "profanity";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "profanity-im";
|
||||
repo = "profanity";
|
||||
rev = version;
|
||||
sha256 = "0a9rzhnivxcr8v02xxzrbck7pvvv4c66ap2zy0gzxhri5p8ac03r";
|
||||
sha256 = "0xmzsh0szm8x3hgw65j0cd2bp8cmrnq5pjz49lqajircyzflsngm";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,29 +1,28 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
let version = "2.7.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logisim";
|
||||
inherit version;
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar";
|
||||
url = "mirror://sourceforge/project/circuit/${lib.versions.majorMinor version}.x/${version}/logisim-generic-${version}.jar";
|
||||
sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "http://ozark.hendrix.edu/~burch/logisim";
|
||||
description = "Educational tool for designing and simulating digital logic circuits";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ccextractor";
|
||||
version = "0.89";
|
||||
version = "0.90";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CCExtractor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-847yt6pUTsDnVbrMQQPJ0pqu6UnKmYmr8UtR8+TP11A=";
|
||||
sha256 = "sha256-NVFCwUZZVt8GrWXWyvoF8UrUZ/ix+GWubKtc3218k7o=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "streamlink";
|
||||
repo = "streamlink";
|
||||
rev = version;
|
||||
sha256 = "14vqh4pck3q766qln7c57n9bz8zrlgfqrpkdn8x0ac9zhlhfn1zm";
|
||||
sha256 = "1323v1pavmbb2vk3djdkxd8j6i3yrcgrkyl2d7xwkb7nwlla1x1v";
|
||||
};
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
homepage = "https://github.com/streamlink/streamlink";
|
||||
description = "CLI for extracting streams from various websites to video player of your choosing";
|
||||
longDescription = ''
|
||||
Streamlink is a CLI utility that pipes flash videos from online
|
||||
Streamlink is a CLI utility that pipes videos from online
|
||||
streaming services to a variety of video players such as VLC, or
|
||||
alternatively, a browser.
|
||||
|
||||
@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ dezgeg zraexy ];
|
||||
maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.21.1";
|
||||
version = "1.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WoQeZkHuCQGv//UKTpvucJXq7xI9Fkil8V1B1qTM75k=";
|
||||
sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk";
|
||||
sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitLab, gnome, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-fuzzy-app-search";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Czarlie";
|
||||
repo = "gnome-fuzzy-app-search";
|
||||
rev = "v${version}";
|
||||
sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a";
|
||||
};
|
||||
|
||||
passthru.extensionUuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com";
|
||||
|
||||
nativeBuildInputs = [ glib ];
|
||||
|
||||
makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fuzzy application search results for Gnome Search";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ rhoriguchi ];
|
||||
homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search";
|
||||
broken = versionOlder gnome.gnome-shell.version "3.18";
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,6 @@
|
||||
"EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { };
|
||||
"emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { };
|
||||
"freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { };
|
||||
"gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = callPackage ./fuzzy-app-search { };
|
||||
"gsconnect@andyholmes.github.io" = callPackage ./gsconnect { };
|
||||
"icon-hider@kalnitsky.org" = callPackage ./icon-hider { };
|
||||
"impatience@gfxmonk.net" = callPackage ./impatience { };
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin";
|
||||
version = "1.5.20";
|
||||
version = "1.5.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "12wa7blf7l4360rfm8fk5x36ij0x1m61wrjrxkvligdavmil5wzd";
|
||||
sha256 = "sha256-8zE6/dar8bjHXGKS9OQfLbr+/I9scnYse6mz2u712lk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
||||
@ -15,7 +15,7 @@ let
|
||||
x86_64-linux = "x64/libbass.so";
|
||||
};
|
||||
urlpath = "bass24-linux.zip";
|
||||
sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q";
|
||||
sha256 = "1lmysxfhy727zskavml3ibg5w876ir88923bm17c21s59w5lh7l8";
|
||||
};
|
||||
|
||||
bass_fx = {
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.5.11";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4CYbL+ICabKvpfjlALJ0wRbuwgy+JKJnKqYbQFsHQsI=";
|
||||
sha256 = "sha256-wtgD8txViYu7yXdnID6TTf4gCDmvebD19XRxFnubndY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,35 +1,32 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3, llvmPackages }:
|
||||
{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }:
|
||||
|
||||
let
|
||||
llvm = llvmPackages.llvm;
|
||||
clang = llvmPackages.clang;
|
||||
clang-unwrapped = llvmPackages.clang-unwrapped;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libclc-2019-06-09";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libclc";
|
||||
version = "11.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm-mirror";
|
||||
repo = "libclc";
|
||||
rev = "9f6204ec04a8cadb6bef57caa71e3161c4f398f2";
|
||||
sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7";
|
||||
owner = "llvm";
|
||||
repo = "llvm-project";
|
||||
rev = "llvmorg-${version}";
|
||||
sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags";
|
||||
};
|
||||
sourceRoot = "source/libclc";
|
||||
|
||||
nativeBuildInputs = [ python3 llvm ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch
|
||||
postPatch = ''
|
||||
sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py
|
||||
sed -i 's,cxx_compiler =.*,cxx_compiler = "${clang}/bin/clang++",' configure.py
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
|
||||
'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )'
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
${python3.interpreter} ./configure.py --prefix=$out
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ cmake ninja python3 ];
|
||||
buildInputs = [ llvm clang-unwrapped ];
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://libclc.llvm.org/";
|
||||
|
||||
@ -46,6 +46,17 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
fast-cli = super.fast-cli.override ({
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
prePatch = ''
|
||||
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
|
||||
'';
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/fast \
|
||||
--set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium
|
||||
'';
|
||||
});
|
||||
|
||||
hyperspace-cli = super."@hyperspace/cli".override {
|
||||
nativeBuildInputs = with pkgs; [
|
||||
makeWrapper
|
||||
@ -68,10 +79,6 @@ let
|
||||
meta.broken = since "10";
|
||||
};
|
||||
|
||||
"fast-cli-1.x" = super."fast-cli-1.x".override {
|
||||
meta.broken = since "10";
|
||||
};
|
||||
|
||||
jshint = super.jshint.override {
|
||||
buildInputs = [ pkgs.phantomjs2 ];
|
||||
};
|
||||
@ -94,14 +101,6 @@ let
|
||||
meta.mainProgram = "bw";
|
||||
});
|
||||
|
||||
fast-cli = super."fast-cli-1.x".override {
|
||||
preRebuild = ''
|
||||
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
|
||||
sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
|
||||
'';
|
||||
buildInputs = [ pkgs.phantomjs2 ];
|
||||
};
|
||||
|
||||
flood = super.flood.override {
|
||||
buildInputs = [ self.node-pre-gyp ];
|
||||
meta.mainProgram = "flood";
|
||||
|
||||
@ -90,7 +90,7 @@
|
||||
, "eslint_d"
|
||||
, "esy"
|
||||
, "expo-cli"
|
||||
, {"fast-cli": "1.x"}
|
||||
, "fast-cli"
|
||||
, "fauna-shell"
|
||||
, "firebase-tools"
|
||||
, "fixjson"
|
||||
|
||||
2225
pkgs/development/node-packages/node-packages.nix
generated
2225
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -28,11 +28,11 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-base";
|
||||
version = "2.10.11";
|
||||
version = "2.10.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0jr3cxqiami9k07g2kmvfp54iafbcnd1d66l8fdnaqka5bc19wdw";
|
||||
sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
||||
@ -23,17 +23,17 @@
|
||||
|
||||
let
|
||||
ansible-collections = callPackage ./collections.nix {
|
||||
version = "4.1.0";
|
||||
sha256 = "0rrivq1g0vizah8zmf012lzig2xxfk5x1371k16s3nn4zfkwqqgm";
|
||||
version = "4.2.0";
|
||||
sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-core";
|
||||
version = "2.11.2";
|
||||
version = "2.11.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1syadgzn5ww5bhq9s2py4h1hkh11h7aac5b37zi8rw2xfvdc7r2s";
|
||||
sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pycrypto
|
||||
, paramiko
|
||||
@ -18,13 +18,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible";
|
||||
version = "2.9.23";
|
||||
version = "2.9.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ansible";
|
||||
repo = "ansible";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mikykpzyqpmaiczz53f71mcyc4qvahi9ckn7wgfx7sw7s2z3skk";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
33
pkgs/development/python-modules/pylsp-mypy/default.nix
Normal file
33
pkgs/development/python-modules/pylsp-mypy/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, mypy
|
||||
, pytestCheckHook
|
||||
, python-lsp-server
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylsp-mypy";
|
||||
version = "0.5.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Richardk2n";
|
||||
repo = "pylsp-mypy";
|
||||
rev = version;
|
||||
sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook mock ];
|
||||
|
||||
propagatedBuildInputs = [ mypy python-lsp-server ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Richardk2n/pylsp-mypy";
|
||||
description = "Mypy plugin for the Python LSP Server";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
@ -1,26 +1,57 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, pyopengl
|
||||
, pyqt5
|
||||
, fetchFromGitHub
|
||||
, scipy
|
||||
, numpy
|
||||
, pyqt5
|
||||
, pyopengl
|
||||
, qt5
|
||||
, python
|
||||
, pytestCheckHook
|
||||
, freefont_ttf
|
||||
, makeFontsConf
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
fontsConf = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pyqtgraph";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d2ef3b5289184fb48dfe5f44ccb58d9d64ffb5452fc524a2bd7a640a36b3874d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyqtgraph";
|
||||
repo = "pyqtgraph";
|
||||
rev = "pyqtgraph-${version}";
|
||||
sha256 = "093kkxwj75nb508vz7px4x7lxrwpaff10pl15m4h74hjwyvbsg3d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ];
|
||||
# TODO: remove when updating to 0.12.3
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pyqtgraph/pyqtgraph/commit/2de5cd78da92b48e48255be2f41ae332cf8bb675.patch";
|
||||
sha256 = "1hy86psqyl6ipvbg23zvackkd6f7ajs6qll0mbs0x2zmrj92hk00";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = false; # tries to create windows (QApps) on collection, which fails (probably due to no display)
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pyqt5
|
||||
scipy
|
||||
pyopengl
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyqtgraph" ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
|
||||
export FONTCONFIG_FILE=${fontsConf}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scientific Graphics and GUI Library for Python";
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-pip10-compat.patch";
|
||||
url = " https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch";
|
||||
url = "https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch";
|
||||
sha256 = "1lvqi2qfa3kxdz05ab2lc7xnd3piyvvnz9kla2jl4pchi876z17c";
|
||||
})
|
||||
];
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "frugal";
|
||||
version = "3.14.5";
|
||||
version = "3.14.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Workiva";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Er9V6mSe4Pt/RzFAPa3ci3J7FQh5GLbh9CjYHx/HnYM=";
|
||||
sha256 = "sha256-MtQz/9+e2l4FQ1E299KtRzFpX67FynHdsvcMA4CqKUo=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-9M6SSxMQ8JMJ7ZNl8cjQuid/B0xc28/BuPozxftthe0=";
|
||||
vendorSha256 = "sha256-Y7lh+U4FKiht2PgACWSXwGTx+y8aJi22KEhqxHPooCw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Thrift improved";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strace";
|
||||
version = "5.12";
|
||||
version = "5.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-KRce350lL4nJiKTDQN/exmL0WMuMY9hUMdZLq1kR58Q=";
|
||||
sha256 = "sha256-Wsw0iIudUQrWrJFdSo3wj1HPGukg6iRkn2pLuYTQtlY=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
@ -27,8 +27,6 @@ let
|
||||
|
||||
outputs = [ "bin" "man" "doc" "out" ];
|
||||
|
||||
phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
|
||||
|
||||
buildPhase = ''
|
||||
pandoc -s -f markdown-smart -t man shellcheck.1.md -o shellcheck.1
|
||||
'';
|
||||
|
||||
@ -13,20 +13,20 @@
|
||||
},
|
||||
"5.10": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.50-hardened1.patch",
|
||||
"sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.51-hardened1.patch",
|
||||
"sha256": "0s9q7vlhnsd484kzg9mnqc7zab09ch3i3w654wvhkxk9zy4kgzhr",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.51-hardened1/linux-hardened-5.10.51-hardened1.patch"
|
||||
},
|
||||
"5.12": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.12.17-hardened1.patch",
|
||||
"sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch"
|
||||
"name": "linux-hardened-5.12.18-hardened1.patch",
|
||||
"sha256": "0mlff4ylnx1pvswamhsms9366jw618ic8w42rnzrwqhasfnwkqjb",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.18-hardened1/linux-hardened-5.12.18-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.132-hardened1.patch",
|
||||
"sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.133-hardened1.patch",
|
||||
"sha256": "0nnsyl2fxv7nnj7c47nnr753yh5x3wbny7ml8x23f5zdvjz43yfj",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.133-hardened1/linux-hardened-5.4.133-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.50";
|
||||
version = "5.10.51";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb";
|
||||
sha256 = "1qkssvqk29svn10ws3lrnzfbmlvzrixkf7r7lslc7k3lqa9yiflm";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.12.17";
|
||||
version = "5.12.18";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j";
|
||||
sha256 = "12sjscf53z6fc1jah3i2578r3a0i7rkw2jmqi0w328a22i0paakg";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.13.2";
|
||||
version = "5.13.3";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0dx9khk7fh003xyb3xix0kc0rmjncg7ric5p830zhadnrw4hv563";
|
||||
sha256 = "1ir80wn019kslv6ysiqxdvarrjlr8b3skk1s43cwki3x2cjnxskq";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.132";
|
||||
version = "5.4.133";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4";
|
||||
sha256 = "0c08jp5k5h4c2s4pbpyvnvzczr79jh833wy9jv15nkvqp3xnd8w9";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
|
||||
|
||||
42
pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
Normal file
42
pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "buildkite-agent-metrics";
|
||||
version = "5.2.1";
|
||||
|
||||
outputs = [ "out" "lambda" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "buildkite-agent-metrics";
|
||||
rev = "v${version}";
|
||||
sha256 = "XZYVCSJ/DIwoLrz37aQ3yW3RUhOhorY8L1AsAWxywcg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "UIkU3i45IEXWHdiakTj7f4W9kR49k4A93msfkqeXmQQ=";
|
||||
|
||||
patches = [
|
||||
# Necessary to support passing the agent token in an env var, rather than on
|
||||
# the command line. Should be removed upon the next release.
|
||||
(fetchpatch {
|
||||
name = "BUILDKITE_AGENT_TOKEN-env-var.patch";
|
||||
url = "https://github.com/buildkite/buildkite-agent-metrics/commit/6c40b478b95f0e05fc12b87158222a9ff68169e0.patch";
|
||||
sha256 = "Y4m9qGyPIROSqOY6G6xRQfFENEG4bFF3q5dZcHI4XiY=";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $lambda/bin
|
||||
mv $out/bin/lambda $lambda/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line tool (and Lambda) for collecting Buildkite agent metrics";
|
||||
homepage = "https://github.com/buildkite/buildkite-agent-metrics";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.determinatesystems.members;
|
||||
};
|
||||
}
|
||||
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
|
||||
cp -r * $out/
|
||||
ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
|
||||
rm -rf $out/installer
|
||||
# shut up updater
|
||||
rm $out/composer.json-dist
|
||||
'';
|
||||
|
||||
passthru.withPlugins = f: buildEnv {
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, xorg, xkeyboard_config, zlib
|
||||
, libjpeg_turbo, pixman, fltk
|
||||
, fontDirectories
|
||||
, cmake, gettext, libtool
|
||||
, libGLU
|
||||
, gnutls, pam, nettle
|
||||
, xterm, openssh, perl
|
||||
, makeWrapper
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
with lib;
|
||||
@ -22,17 +22,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-IX39oEhTyk7NV+9dD9mFtes22fBdMTAVIv5XkqFK560=";
|
||||
};
|
||||
|
||||
inherit fontDirectories;
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in
|
||||
fontPath=
|
||||
for i in $fontDirectories; do
|
||||
for j in $(find $i -name fonts.dir); do
|
||||
addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j)
|
||||
done
|
||||
done
|
||||
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver/vncserver.in
|
||||
substituteInPlace vncviewer/vncviewer.cxx \
|
||||
--replace '"/usr/bin/ssh' '"${openssh}/bin/ssh'
|
||||
'';
|
||||
@ -98,6 +91,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs;
|
||||
|
||||
passthru.tests.tigervnc = nixosTests.vnc.testTigerVNC;
|
||||
|
||||
meta = {
|
||||
homepage = "https://tigervnc.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtools";
|
||||
version = "4.0.31";
|
||||
version = "4.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "11nm5mhsq700f3dzvzjpcik89cfcn38mb249yc0sjbwggwkrk2ak";
|
||||
sha256 = "0m5rx8djvg4jfvdgs4dxjkfd2na55wkdpid9xa32yc103s70zc8w";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ditaa-0.11.0";
|
||||
pname = "ditaa";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar";
|
||||
url = "https://github.com/stathissideris/ditaa/releases/download/v${version}/ditaa-${version}-standalone.jar";
|
||||
sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
mkdir -p "$out/lib"
|
||||
mkdir -p $out/bin $out/lib
|
||||
|
||||
cp ${src} "$out/lib/ditaa.jar"
|
||||
|
||||
|
||||
36
pkgs/tools/graphics/lsix/default.nix
Normal file
36
pkgs/tools/graphics/lsix/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, imagemagick }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lsix";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hackerb9";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-mOueSNhf1ywG4k1kRODBaWRjy0L162BAO1HRPaMMbFM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 lsix -t $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/lsix \
|
||||
--prefix PATH : ${lib.makeBinPath [ imagemagick ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Shows thumbnails in terminal using sixel graphics";
|
||||
homepage = "https://github.com/hackerb9/lsix";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ kidonng ];
|
||||
};
|
||||
}
|
||||
2
pkgs/tools/misc/elfcat/Cargo.lock
generated
2
pkgs/tools/misc/elfcat/Cargo.lock
generated
@ -4,4 +4,4 @@ version = 3
|
||||
|
||||
[[package]]
|
||||
name = "elfcat"
|
||||
version = "0.1.3"
|
||||
version = "0.1.4"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elfcat";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ruslashev";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-s56FyRoD2IhgdwEV63jMaB265CodHUlvmrWzmXAmonY=";
|
||||
sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY=";
|
||||
};
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "7e0e12afa45ef5ed8025e5f2c6deea0ff5f512644a721f7b1b95b63406a8f7ce";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
|
||||
@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "07j3sv9ar9l074krajw8nfmsfmdp836irsbd053dbqk2v880gfm6";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/bash-completion/completions
|
||||
cp gibo $out/bin
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
phases = [ "installPhase" "fixupPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm +x $src $out/bin/ix
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
make PREFIX="$out" install
|
||||
|
||||
@ -1,20 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ponysay-3.0.3";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ponysay";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz";
|
||||
sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erkin";
|
||||
repo = "ponysay";
|
||||
rev = version;
|
||||
sha256 = "sha256-R2B0TU3ZSEncGsijKgvhaHIbcZa5Dx/jVPxrILBaoVw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ python3 texinfo ];
|
||||
buildInputs = [ python3 texinfo ];
|
||||
|
||||
inherit python3;
|
||||
|
||||
phases = "unpackPhase installPhase fixupPhase";
|
||||
|
||||
installPhase = ''
|
||||
find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g"
|
||||
substituteInPlace setup.py --replace \
|
||||
@ -25,11 +26,11 @@ stdenv.mkDerivation {
|
||||
--with-bash
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Cowsay reimplemention for ponies";
|
||||
homepage = "https://github.com/erkin/ponysay";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ bodil ];
|
||||
platforms = with lib.platforms; unix;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ bodil ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "powerline-go";
|
||||
version = "1.21.0";
|
||||
version = "unstable-2021-07-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "justjanne";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE=";
|
||||
rev = "f27435b26b5001c52ffb1aee454572c59494c81b";
|
||||
sha256 = "sha256-YB/WMprjXA5ZN6baT5nWahNj0xwbP8kzS7X/1tCwWiE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg=";
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
{ stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript, xsel, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pws-${(import ./gemset.nix).pws.version}";
|
||||
pname = "pws";
|
||||
version = (import ./gemset.nix).pws.version;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
phases = ["installPhase"];
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = let
|
||||
env = bundlerEnv {
|
||||
name = "${name}-gems";
|
||||
name = "${pname}-gems";
|
||||
|
||||
inherit ruby;
|
||||
|
||||
|
||||
@ -27,7 +27,8 @@ let
|
||||
in mkDerivation {
|
||||
name = "${src.name}-patched";
|
||||
inherit src;
|
||||
phases = [ "unpackPhase" "patchPhase" ];
|
||||
|
||||
dontInstall = true;
|
||||
|
||||
patchPhase = with lib; ''
|
||||
# we don’t want prebuild binaries checked into version control!
|
||||
|
||||
@ -7,7 +7,8 @@ let
|
||||
gemdir = ./.;
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
name = "maphosts-${env.gems.maphosts.version}";
|
||||
pname = "maphosts";
|
||||
version = env.gems.maphosts.version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec {
|
||||
sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec {
|
||||
sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "3.7.13";
|
||||
version = "3.8.2";
|
||||
in
|
||||
fetchFromGitHub {
|
||||
name = "stevenblack-blocklist-${version}";
|
||||
@ -9,7 +9,7 @@ fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
rev = version;
|
||||
sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw=";
|
||||
sha256 = "sha256-rkyAF1/kPI34nZ57Hqg8QivK0YERZ54jZ1HQ5oXYgxc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unified hosts file with base extensions";
|
||||
|
||||
@ -2,10 +2,7 @@
|
||||
, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
|
||||
, gnugrep, gnused, jq, nix }:
|
||||
|
||||
let
|
||||
binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-prefetch";
|
||||
version = "0.4.1";
|
||||
|
||||
@ -55,7 +52,7 @@ in stdenv.mkDerivation rec {
|
||||
install -Dm555 -t $lib src/*.sh
|
||||
install -Dm444 -t $lib lib/*
|
||||
makeWrapper $lib/main.sh $out/bin/${pname} \
|
||||
--prefix PATH : ${binPath}
|
||||
--prefix PATH : ${lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]}
|
||||
|
||||
installManPage doc/nix-prefetch.?
|
||||
|
||||
@ -69,7 +66,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Prefetch any fetcher function call, e.g. package sources";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ msteen ];
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/msteen/nix-prefetch";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -193,38 +193,57 @@ common =
|
||||
|
||||
preBuild = "unset NIX_INDENT_MAKE";
|
||||
});
|
||||
inherit boehmgc;
|
||||
};
|
||||
};
|
||||
in nix;
|
||||
|
||||
boehmgc_nix = boehmgc.override {
|
||||
enableLargeConfig = true;
|
||||
};
|
||||
|
||||
boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: {
|
||||
patches = (drv.patches or []) ++ [
|
||||
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
|
||||
(fetchpatch {
|
||||
url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
|
||||
sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
in rec {
|
||||
|
||||
nix = nixStable;
|
||||
|
||||
nixStable = callPackage common (rec {
|
||||
pname = "nix";
|
||||
version = "2.3.12";
|
||||
version = "2.3.14";
|
||||
src = fetchurl {
|
||||
url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10=";
|
||||
sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk=";
|
||||
};
|
||||
|
||||
inherit storeDir stateDir confDir boehmgc;
|
||||
boehmgc = boehmgc_nix;
|
||||
|
||||
inherit storeDir stateDir confDir;
|
||||
});
|
||||
|
||||
nixUnstable = lib.lowPrio (callPackage common rec {
|
||||
pname = "nix";
|
||||
version = "2.4${suffix}";
|
||||
suffix = "pre20210601_5985b8b";
|
||||
suffix = "pre20210707_02dd6bb";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d";
|
||||
sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc=";
|
||||
rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2";
|
||||
sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA=";
|
||||
};
|
||||
|
||||
inherit storeDir stateDir confDir boehmgc;
|
||||
boehmgc = boehmgc_nixUnstable;
|
||||
|
||||
inherit storeDir stateDir confDir;
|
||||
|
||||
});
|
||||
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sshuttle";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fff1c88669a20bb6a4e7331960673a3a02a2e04ff163e4c9299496646edcf61";
|
||||
sha256 = "fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd";
|
||||
};
|
||||
|
||||
patches = [ ./sudo.patch ];
|
||||
@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.psutil ];
|
||||
|
||||
checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ];
|
||||
|
||||
postInstall = ''
|
||||
@ -42,7 +44,7 @@ python3Packages.buildPythonApplication rec {
|
||||
target network (though it does require Python 2.7, Python 3.5 or later at both ends).
|
||||
Works with Linux and Mac OS and supports DNS tunneling.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ domenkozar carlosdagos ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "reckon";
|
||||
version = (import ./gemset.nix).reckon.version;
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -1646,6 +1646,8 @@ in
|
||||
|
||||
lesspass-cli = callPackage ../tools/security/lesspass-cli { };
|
||||
|
||||
lsix = callPackage ../tools/graphics/lsix { };
|
||||
|
||||
mpdevil = callPackage ../applications/audio/mpdevil { };
|
||||
|
||||
pacparser = callPackage ../tools/networking/pacparser { };
|
||||
@ -9880,9 +9882,7 @@ in
|
||||
|
||||
tftp-hpa = callPackage ../tools/networking/tftp-hpa {};
|
||||
|
||||
tigervnc = callPackage ../tools/admin/tigervnc {
|
||||
fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ];
|
||||
};
|
||||
tigervnc = callPackage ../tools/admin/tigervnc {};
|
||||
|
||||
tightvnc = callPackage ../tools/admin/tightvnc {
|
||||
fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
|
||||
@ -13202,6 +13202,8 @@ in
|
||||
buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)";
|
||||
buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { };
|
||||
|
||||
buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };
|
||||
|
||||
buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
|
||||
|
||||
bump = callPackage ../development/tools/github/bump { };
|
||||
@ -31165,7 +31167,6 @@ in
|
||||
inherit (callPackage ../tools/package-management/nix {
|
||||
storeDir = config.nix.storeDir or "/nix/store";
|
||||
stateDir = config.nix.stateDir or "/nix/var";
|
||||
boehmgc = boehmgc.override { enableLargeConfig = true; };
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
})
|
||||
nix
|
||||
|
||||
@ -296,7 +296,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
|
||||
sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
dontBuild = true;
|
||||
|
||||
outputFiles = [ "*" ];
|
||||
dllFiles = [ "NuGet*.dll" ];
|
||||
|
||||
@ -6182,6 +6182,8 @@ in {
|
||||
|
||||
pyls-spyder = callPackage ../development/python-modules/pyls-spyder { };
|
||||
|
||||
pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { };
|
||||
|
||||
PyLTI = callPackage ../development/python-modules/pylti { };
|
||||
|
||||
pylutron = callPackage ../development/python-modules/pylutron { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user