mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-19 11:00:19 +03:00
Merge master into haskell-updates
This commit is contained in:
commit
d685083974
2
.github/workflows/basic-eval.yml
vendored
2
.github/workflows/basic-eval.yml
vendored
@ -16,7 +16,7 @@ jobs:
|
||||
# we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v16
|
||||
- uses: cachix/install-nix-action@v17
|
||||
- uses: cachix/cachix-action@v10
|
||||
with:
|
||||
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
|
||||
|
2
.github/workflows/editorconfig.yml
vendored
2
.github/workflows/editorconfig.yml
vendored
@ -28,7 +28,7 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v16
|
||||
- uses: cachix/install-nix-action@v17
|
||||
with:
|
||||
# nixpkgs commit is pinned so that it doesn't break
|
||||
# editorconfig-checker 2.4.0
|
||||
|
2
.github/workflows/manual-nixos.yml
vendored
2
.github/workflows/manual-nixos.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v16
|
||||
- uses: cachix/install-nix-action@v17
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
2
.github/workflows/manual-nixpkgs.yml
vendored
2
.github/workflows/manual-nixpkgs.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v16
|
||||
- uses: cachix/install-nix-action@v17
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
2
.github/workflows/nixos-manual.yml
vendored
2
.github/workflows/nixos-manual.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v16
|
||||
- uses: cachix/install-nix-action@v17
|
||||
- name: Check DocBook files generated from Markdown are consistent
|
||||
run: |
|
||||
nixos/doc/manual/md-to-db.sh
|
||||
|
@ -11,7 +11,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v16
|
||||
- uses: cachix/install-nix-action@v17
|
||||
- name: setup
|
||||
id: setup
|
||||
run: |
|
||||
|
@ -4502,6 +4502,12 @@
|
||||
githubId = 3217744;
|
||||
name = "Peter Ferenczy";
|
||||
};
|
||||
ghostbuster91 = {
|
||||
name = "Kasper Kondzielski";
|
||||
email = "kghost0@gmail.com";
|
||||
github = "ghostbuster91";
|
||||
githubId = 5662622;
|
||||
};
|
||||
ghuntley = {
|
||||
email = "ghuntley@ghuntley.com";
|
||||
github = "ghuntley";
|
||||
@ -8091,6 +8097,12 @@
|
||||
githubId = 20536514;
|
||||
name = "Magdalena Haselsteiner";
|
||||
};
|
||||
mh182 = {
|
||||
email = "mh182@chello.at";
|
||||
github = "mh182";
|
||||
githubId = 9980864;
|
||||
name = "Max Hofer";
|
||||
};
|
||||
mic92 = {
|
||||
email = "joerg@thalheim.io";
|
||||
matrix = "@mic92:nixos.dev";
|
||||
|
@ -219,6 +219,15 @@
|
||||
to be able to access the device.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/mozilla-mobile/mozilla-vpn-client">mozillavpn</link>,
|
||||
the client for the
|
||||
<link xlink:href="https://vpn.mozilla.org/">Mozilla VPN</link>
|
||||
service. Available as
|
||||
<link xlink:href="options.html#opt-services.mozillavpn">services.mozillavpn</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/mgumz/mtr-exporter">mtr-exporter</link>,
|
||||
@ -432,6 +441,12 @@
|
||||
new versions will release.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>security.klogd</literal> was removed. Logging of
|
||||
kernel messages is handled by systemd since Linux 3.5.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>services.kubernetes.addons.dashboard</literal> was
|
||||
@ -1465,6 +1480,15 @@
|
||||
takes a list of strings instead of a string.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>asterisk</literal> and
|
||||
<literal>asterisk-stable</literal> packages were switched from
|
||||
<literal>asterisk_18</literal> to the newly-packaged
|
||||
<literal>asterisk_19</literal>. Asterisk 13 and 17 have been
|
||||
removed as they have reached their end of life.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>services.unifi.openPorts</literal> option default
|
||||
@ -1800,6 +1824,17 @@
|
||||
desktop environments as needed.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
xfsprogs was update to version 5.15, which enables inobtcount
|
||||
and bigtime by default on filesystem creation. Support for
|
||||
these features was added in kernel 5.10 and deemed stable in
|
||||
kernel 5.15. If you want to be able to mount XFS filesystems
|
||||
created with this release of xfsprogs on kernel releases older
|
||||
than 5.10, you need to format them with
|
||||
<literal>mkfs.xfs -m bigtime=0 -m inobtcount=0</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>services.xserver.desktopManager.xfce</literal> now
|
||||
|
@ -65,6 +65,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](options.html#opt-programs.k4-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device.
|
||||
|
||||
- [mozillavpn](https://github.com/mozilla-mobile/mozilla-vpn-client), the client for the [Mozilla VPN](https://vpn.mozilla.org/) service. Available as [services.mozillavpn](options.html#opt-services.mozillavpn).
|
||||
|
||||
- [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable).
|
||||
|
||||
- [prometheus-pve-exporter](https://github.com/prometheus-pve/prometheus-pve-exporter), a tool that exposes information from the Proxmox VE API for use by Prometheus. Available as [services.prometheus.exporters.pve](options.html#opt-services.prometheus.exporters.pve).
|
||||
@ -141,6 +143,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
|
||||
`pkgs.emacsPackages.nongnuPackages` where the new versions will release.
|
||||
|
||||
- `security.klogd` was removed. Logging of kernel messages is handled
|
||||
by systemd since Linux 3.5.
|
||||
|
||||
- `services.kubernetes.addons.dashboard` was removed due to it being an outdated version.
|
||||
|
||||
- `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading.
|
||||
@ -517,6 +522,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string.
|
||||
|
||||
- The `asterisk` and `asterisk-stable` packages were switched from `asterisk_18` to the newly-packaged `asterisk_19`. Asterisk 13 and 17 have been removed as they have reached their end of life.
|
||||
|
||||
- The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
|
||||
Configurations using this default will print a warning when rebuilt.
|
||||
|
||||
@ -623,6 +630,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
|
||||
|
||||
- xfsprogs was update to version 5.15, which enables inobtcount and bigtime by default on filesystem creation. Support for these features was added in kernel 5.10 and deemed stable in kernel 5.15.
|
||||
If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than 5.10, you need to format them with `mkfs.xfs -m bigtime=0 -m inobtcount=0`.
|
||||
|
||||
- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver`.
|
||||
|
||||
- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
|
||||
|
@ -16,11 +16,6 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = singleton {
|
||||
assertion = versionAtLeast kernelPackages.kernel.version "3.19";
|
||||
message = "facetimehd is not supported for kernels older than 3.19";
|
||||
};
|
||||
|
||||
boot.kernelModules = [ "facetimehd" ];
|
||||
|
||||
boot.blacklistedKernelModules = [ "bdc_pci" ];
|
||||
|
@ -64,7 +64,8 @@ let
|
||||
filter =
|
||||
builtins.filterSource
|
||||
(n: t:
|
||||
(t == "directory" -> baseNameOf n != "tests")
|
||||
cleanSourceFilter n t
|
||||
&& (t == "directory" -> baseNameOf n != "tests")
|
||||
&& (t == "file" -> hasSuffix ".nix" n)
|
||||
);
|
||||
in
|
||||
|
@ -816,6 +816,7 @@
|
||||
./services/networking/mosquitto.nix
|
||||
./services/networking/monero.nix
|
||||
./services/networking/morty.nix
|
||||
./services/networking/mozillavpn.nix
|
||||
./services/networking/miredo.nix
|
||||
./services/networking/mstpd.nix
|
||||
./services/networking/mtprotoproxy.nix
|
||||
|
@ -1,38 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.klogd.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5";
|
||||
defaultText = literalExpression ''versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5"'';
|
||||
description = ''
|
||||
Whether to enable klogd, the kernel log message processing
|
||||
daemon. Since systemd handles logging of kernel messages on
|
||||
Linux 3.5 and later, this is only useful if you're running an
|
||||
older kernel.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.klogd.enable {
|
||||
systemd.services.klogd = {
|
||||
description = "Kernel Log Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ pkgs.sysklogd ];
|
||||
unitConfig.ConditionVirtualization = "!systemd-nspawn";
|
||||
script =
|
||||
"klogd -c 1 -2 -n " +
|
||||
"-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
|
||||
};
|
||||
};
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "security" "klogd" "enable" ] ''
|
||||
Logging of kernel messages is now handled by systemd.
|
||||
'')
|
||||
];
|
||||
}
|
||||
|
19
nixos/modules/services/networking/mozillavpn.nix
Normal file
19
nixos/modules/services/networking/mozillavpn.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
options.services.mozillavpn.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable the Mozilla VPN daemon.
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf config.services.mozillavpn.enable {
|
||||
environment.systemPackages = [ pkgs.mozillavpn ];
|
||||
services.dbus.packages = [ pkgs.mozillavpn ];
|
||||
systemd.packages = [ pkgs.mozillavpn ];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ andersk ];
|
||||
}
|
@ -344,6 +344,10 @@ in
|
||||
restartIfChanged = false;
|
||||
};
|
||||
|
||||
systemd.services.virtchd = {
|
||||
path = [ pkgs.cloud-hypervisor ];
|
||||
};
|
||||
|
||||
systemd.services.libvirt-guests = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = with pkgs; [ coreutils gawk cfg.package ];
|
||||
|
@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "callaudiod";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "mobian1";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WZ23jacCsZiNeMJfnYMaGdHXY9OCIBbeU9dWGDroaHE=";
|
||||
sha256 = "sha256-71+9ALz55aqxXRBRwOcs9fwiQK31pJ9E72pGRmt0OkE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -1,22 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, libtool, automake, pkg-config, git
|
||||
, bison, flex, postgresql, ripgrep }:
|
||||
, bison, flex, postgresql, ripgrep, libunwind }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stellar-core";
|
||||
version = "17.0.0";
|
||||
version = "18.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stellar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ngl8yjqb8xzhdwzlxzzxf14q2hgwy2ysb17sn5380rrn0jswin1";
|
||||
sha256 = "sha256-wEi22R4zb8d5CJV5eWb776Yob8B6Ok4FrbYI0SGM0H8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep ];
|
||||
|
||||
buildInputs = [ libunwind ];
|
||||
|
||||
propagatedBuildInputs = [ bison flex postgresql ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
# Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on
|
||||
# having the .git directory present, so directly provide the version
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -29,6 +30,16 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sha256 = "sha256-qNaljtuA5E/QaLJ9QILPRQCqOvKmX4ZGq/0z5unA8KA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61, can be removed on next update.
|
||||
# https://github.com/NixOS/nixpkgs/issues/167584
|
||||
(fetchpatch {
|
||||
url = "https://github.com/maoschanz/drawing/commit/6dd271089af76b69322500778e3ad6615a117dcc.patch";
|
||||
sha256 = "sha256-4pKWm3LYstVxZ4+gGsZDfM4K+7WBY8EYjylzc/CQZmo=";
|
||||
includes = [ "data/meson.build" "help/meson.build" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gtk3
|
||||
, gettext
|
||||
, json_c
|
||||
@ -31,6 +32,15 @@ in buildPythonApplication rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build due to setuptools issue.
|
||||
# https://github.com/mypaint/mypaint/pull/1183
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847.patch";
|
||||
sha256 = "OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
pkg-config
|
||||
|
@ -3,7 +3,6 @@
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, applet-window-buttons
|
||||
, karchive
|
||||
, kcoreaddons
|
||||
, ki18n
|
||||
@ -38,7 +37,6 @@ mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
applet-window-buttons
|
||||
karchive
|
||||
kcoreaddons
|
||||
ki18n
|
||||
|
@ -1,18 +1,17 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "mop";
|
||||
version = "0.2.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mop-tracker";
|
||||
repo = "mop";
|
||||
rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
|
||||
sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oe8RG8E7xcp3ZqdDXYvpOVF3AfeSBFMherHD1YYFE/M=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/michaeldv/mop";
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-kLQH7mMmBSsS9av+KnnEuBwiH6hzBOSozrn+1X+8774=";
|
||||
|
||||
preConfigure = ''
|
||||
for i in *.go **/*.go; do
|
||||
|
11
pkgs/applications/misc/mop/deps.nix
generated
11
pkgs/applications/misc/mop/deps.nix
generated
@ -1,11 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/nsf/termbox-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/nsf/termbox-go";
|
||||
rev = "9aecf65084a5754f12d27508fa2e6ed56851953b";
|
||||
sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh";
|
||||
};
|
||||
}
|
||||
]
|
@ -2,7 +2,7 @@
|
||||
, fetchurl
|
||||
, lib
|
||||
, makeWrapper
|
||||
, electron_16
|
||||
, electron_17
|
||||
, makeDesktopItem
|
||||
, graphicsmagick
|
||||
, writeScript
|
||||
@ -13,6 +13,7 @@ let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "0.14.2";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
homepage = "https://obsidian.md";
|
||||
@ -27,7 +28,6 @@ let
|
||||
sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3";
|
||||
};
|
||||
|
||||
linux = stdenv.mkDerivation rec {
|
||||
icon = fetchurl {
|
||||
url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
|
||||
sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2";
|
||||
@ -43,13 +43,14 @@ let
|
||||
mimeTypes = [ "x-scheme-handler/obsidian" ];
|
||||
};
|
||||
|
||||
inherit pname version src;
|
||||
meta.platforms = [ "x86_64-linux" ];
|
||||
linux = stdenv.mkDerivation {
|
||||
inherit pname version src desktopItem icon;
|
||||
meta = meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; };
|
||||
nativeBuildInputs = [ makeWrapper graphicsmagick ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${electron_16}/bin/electron $out/bin/obsidian \
|
||||
makeWrapper ${electron_17}/bin/electron $out/bin/obsidian \
|
||||
--add-flags $out/share/obsidian/app.asar
|
||||
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
|
||||
install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
|
||||
@ -71,10 +72,9 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
darwin = stdenv.mkDerivation rec {
|
||||
appname = "Obsidian";
|
||||
inherit pname version src;
|
||||
meta.platforms = [ "x86_64-darwin" "aarch64-darwin" ];
|
||||
darwin = stdenv.mkDerivation {
|
||||
inherit pname version src appname;
|
||||
meta = meta // { platforms = [ "x86_64-darwin" "aarch64-darwin" ]; };
|
||||
sourceRoot = "${appname}.app";
|
||||
nativeBuildInputs = [ makeWrapper undmg unzip ];
|
||||
installPhase = ''
|
||||
|
@ -5,7 +5,7 @@
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, stdenv
|
||||
, systemd
|
||||
, systemdSupport ? stdenv.isLinux, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -25,9 +25,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
|
||||
|
||||
buildInputs = [ systemd ];
|
||||
buildInputs = lib.optionals systemdSupport [ systemd ];
|
||||
|
||||
mesonFlags = [ "-Dlibseat-logind=systemd" "-Dlibseat-builtin=enabled" ];
|
||||
mesonFlags = [
|
||||
"-Dlibseat-logind=${if systemdSupport then "systemd" else "disabled"}"
|
||||
"-Dlibseat-builtin=enabled"
|
||||
"-Dserver=enabled"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A universal seat management library";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "driftctl";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snyk";
|
||||
repo = "driftctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cwI27hAfnSKT7P2rfM86tRtSKRR9bruRV9w440uGLIU=";
|
||||
sha256 = "sha256-C+3eXdSU4FdJVlFvZw8LH768Yx6xvlElV1wsKgoju4o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E=";
|
||||
vendorSha256 = "sha256-verxBwk83Xgg3XEMZpOXD3j3IgE7G4rHWJTj09BW74g=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
let
|
||||
# look for GO_LDFLAGS getting set in the Makefile
|
||||
version = "0.14.3";
|
||||
sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU=";
|
||||
vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk=";
|
||||
pkgsVersion = "v0.9.0-6-gbfcc795";
|
||||
extrasVersion = "v0.7.0-2-gb4c9d21";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-IqFnVOnmYqf2K3TX+gwFPmBBksYz+56Oy/t8xWhi7fc=";
|
||||
vendorSha256 = "sha256-GKdAMmU4HiOFYR0SFeFvwFGTXc2lmzO/fAlR1vCDfX4=";
|
||||
pkgsVersion = "v1.0.0-6-g7c293d5";
|
||||
extrasVersion = "v1.0.0";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
|
@ -21,19 +21,19 @@
|
||||
"owner": "aiven",
|
||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v2.7.0",
|
||||
"sha256": "12n97z3r5bz7hwgcz193x90n7ibk4fdph7pqxwwinrvlc6zb7hz6",
|
||||
"vendorSha256": "12lj7p74mhiy30fhc12ihbf827axlbxhbfzr10iwwhb0nydsfiyl",
|
||||
"version": "2.7.0"
|
||||
"rev": "v2.7.1",
|
||||
"sha256": "sha256-tXg9VpP3kj32Q9ktU5FrcQStIRlDtMLXYzn0RvLQCRk=",
|
||||
"vendorSha256": "sha256-1Eenm7dgQc4jCPm7BfuiXR2B3IJRBAYdGD7CSs49koo=",
|
||||
"version": "2.7.1"
|
||||
},
|
||||
"akamai": {
|
||||
"owner": "akamai",
|
||||
"provider-source-address": "registry.terraform.io/akamai/akamai",
|
||||
"repo": "terraform-provider-akamai",
|
||||
"rev": "v1.11.0",
|
||||
"sha256": "1ccliv8p36rh7f7zacjsa2x846d36nygbgs0vyjb0bpf5pl7grgd",
|
||||
"vendorSha256": "19n841mby0l7ipjmmqsl5vnfmsj6y8fci1vzi8z6dqy3xcjlhwgb",
|
||||
"version": "1.11.0"
|
||||
"rev": "v1.12.1",
|
||||
"sha256": "sha256-UQD1RiXIRcP0CvVO8Tx/qkBhRD3LFj/KI3WP/yKeBek=",
|
||||
"vendorSha256": "sha256-GZFLnKHk6YaMwFGgy79ric388EMIH6NUVw4JVLNxWZY=",
|
||||
"version": "1.12.1"
|
||||
},
|
||||
"alicloud": {
|
||||
"deleteVendor": true,
|
||||
@ -94,28 +94,28 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.8.0",
|
||||
"sha256": "sha256-Ere41qols4lNnoAIZGWQmituukLnPNbv5d8C/e3rQgI=",
|
||||
"vendorSha256": "sha256-ZXH9YlSii2z1s6Y/TfZVBje0/xQ2DXw3ZpgcBPeQZ2I=",
|
||||
"version": "4.8.0"
|
||||
"rev": "v4.9.0",
|
||||
"sha256": "sha256-VLw2bqL6VEKwqzXYkNJGJtIi8gg+3/oCwbBf9UtATE4=",
|
||||
"vendorSha256": "sha256-7pwwQHgtHO3GfcEAOHALo01i1pt9WsriZZkJjFzjwRE=",
|
||||
"version": "4.9.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.19.1",
|
||||
"sha256": "sha256-n5jDlcy5rwCcrqoL3ut+HThDLQ8hPj2mZ15d7hhALFw=",
|
||||
"rev": "v2.20.0",
|
||||
"sha256": "sha256-x1tSrejqsw3A/1n+PbG9wWx7q7qRciCjdwPAFT4lc2E=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.19.1"
|
||||
"version": "2.20.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.0.2",
|
||||
"sha256": "sha256-T24bfys9OxBnGN4YtJEsJmSUK26a5hMnbgZUANcpg3k=",
|
||||
"rev": "v3.1.0",
|
||||
"sha256": "sha256-idrGxmfhnMKvxtKJtjLs321D008Mcv27cHyhAjwCZfA=",
|
||||
"vendorSha256": null,
|
||||
"version": "3.0.2"
|
||||
"version": "3.1.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
@ -194,10 +194,10 @@
|
||||
"owner": "cloudflare",
|
||||
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v3.11.0",
|
||||
"sha256": "sha256-z7IjLXO/AHWENKYaCospJDcOwOubNcRHKDQzmRkhimw=",
|
||||
"vendorSha256": "sha256-Lx/faIdx4k399sm9p8BVqpiKZtNjZoThBhWWWgEuPyg=",
|
||||
"version": "3.11.0"
|
||||
"rev": "v3.12.0",
|
||||
"sha256": "sha256-y2qq0asEnhnOjthLBFxyQjf1N5KNlXXK0eXjT1/vCXg=",
|
||||
"vendorSha256": "sha256-v6fUzYwrYt4rk5LT0LyNd8e9X79r3dwtd3s1QIV/w/s=",
|
||||
"version": "3.12.0"
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"owner": "cloudfoundry-community",
|
||||
@ -411,20 +411,20 @@
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.15.0",
|
||||
"sha256": "sha256-BHtbBfCihy1zh/A9JB03CDh5KpzMWeR/mbuRErJkVUE=",
|
||||
"vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=",
|
||||
"version": "4.15.0"
|
||||
"rev": "v4.16.0",
|
||||
"sha256": "sha256-kp6AldlkjiNd3R3hz+wB2uBQ37TyZ0hoEhxQYiFmO7g=",
|
||||
"vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
|
||||
"version": "4.16.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.15.0",
|
||||
"sha256": "sha256-FTT6PS0OS4HPfkM2u4PZwOA/v5VzDwHLdO2s+qgRkW8=",
|
||||
"vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=",
|
||||
"version": "4.15.0"
|
||||
"rev": "v4.16.0",
|
||||
"sha256": "sha256-m5K2q83WbWVfjG7vhlh71k14GEXNs+2JfK/S1GnC5c0=",
|
||||
"vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
|
||||
"version": "4.16.0"
|
||||
},
|
||||
"grafana": {
|
||||
"owner": "grafana",
|
||||
@ -439,10 +439,10 @@
|
||||
"owner": "gridscale",
|
||||
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
|
||||
"repo": "terraform-provider-gridscale",
|
||||
"rev": "v1.14.2",
|
||||
"sha256": "sha256-gGwwyp3NgdcoE6YIBewiiajPoZpJbQ80/Zr2pIw8imE=",
|
||||
"rev": "v1.14.3",
|
||||
"sha256": "sha256-OGVIZ6q8qq4XkkWxjX5BQCJE9qubJ5Xnt2DrD23JGB8=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.14.2"
|
||||
"version": "1.14.3"
|
||||
},
|
||||
"hcloud": {
|
||||
"owner": "hetznercloud",
|
||||
@ -511,10 +511,10 @@
|
||||
"owner": "IBM-Cloud",
|
||||
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.40.0",
|
||||
"sha256": "sha256-msBfnPkClyOvqXcKHIpCxT1YDRHY7p491zl8Uvl8qOQ=",
|
||||
"vendorSha256": "sha256-YgRgm5S7cXHO9yqUUuVVkFRQL+pf0RMPJI9oUaWob2I=",
|
||||
"version": "1.40.0"
|
||||
"rev": "v1.40.1",
|
||||
"sha256": "sha256-7NdpMWEpkcqEwi7xAedc/NPJ6e+RZZ4HdrKtmb/H6xU=",
|
||||
"vendorSha256": "sha256-rVV6oeqIj4o9qxw2V67G3cgERJaccejaAAtEOJVLm4U=",
|
||||
"version": "1.40.1"
|
||||
},
|
||||
"icinga2": {
|
||||
"owner": "Icinga",
|
||||
@ -583,19 +583,19 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.9.0",
|
||||
"sha256": "sha256-w16pm2+8M59grW5HUBBtkKaCnvf5p4GQMEHtQa4DLXs=",
|
||||
"rev": "v2.10.0",
|
||||
"sha256": "sha256-pA0yI59iRBmiT3rdvoP4vkSz/+bH29O4eLGPCBjfiZU=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.9.0"
|
||||
"version": "2.10.0"
|
||||
},
|
||||
"launchdarkly": {
|
||||
"owner": "launchdarkly",
|
||||
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.5.0",
|
||||
"sha256": "1083w217y8l6clj3q31f1lanzngfinw682kdqpm0xfssqas7qzx6",
|
||||
"vendorSha256": "13vcxvw56bn7mdz917lvdryd2d7mcvi83ykbzjfbpxr4lzrrm9qw",
|
||||
"version": "2.5.0"
|
||||
"rev": "v2.6.0",
|
||||
"sha256": "sha256-Mf7oV5G5XjnE+3m8EDczDvrtn2s4nrNCTdAJz1n9v2Y=",
|
||||
"vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=",
|
||||
"version": "2.6.0"
|
||||
},
|
||||
"libvirt": {
|
||||
"owner": "dmacvicar",
|
||||
@ -634,13 +634,12 @@
|
||||
"version": "2.2.2"
|
||||
},
|
||||
"logicmonitor": {
|
||||
"deleteVendor": true,
|
||||
"owner": "logicmonitor",
|
||||
"provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor",
|
||||
"repo": "terraform-provider-logicmonitor",
|
||||
"rev": "v2.0.0",
|
||||
"sha256": "sha256-wamP36zV5HZ1qQlNZWIZyAYx/jOiRO1ODQpcd10Sl4w=",
|
||||
"vendorSha256": "sha256-ccLI662Z+B+xvyuQ5aRHUViREtcdccjOMM5EIJiEaU0=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"lxd": {
|
||||
@ -656,10 +655,10 @@
|
||||
"owner": "wgebis",
|
||||
"provider-source-address": "registry.terraform.io/wgebis/mailgun",
|
||||
"repo": "terraform-provider-mailgun",
|
||||
"rev": "v0.7.1",
|
||||
"sha256": "0sw4a5ch8izy9lw9qmbj6s5vxz7gxcarga1s1h3vlng9y1dpvp2r",
|
||||
"vendorSha256": "1qwd3jwdh5pzq9sdb62lpkbspfn54jii725p2jgvzg93xarv4n58",
|
||||
"version": "0.7.1"
|
||||
"rev": "v0.7.2",
|
||||
"sha256": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=",
|
||||
"vendorSha256": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=",
|
||||
"version": "0.7.2"
|
||||
},
|
||||
"matchbox": {
|
||||
"owner": "poseidon",
|
||||
@ -692,10 +691,10 @@
|
||||
"owner": "mongodb",
|
||||
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.3.0",
|
||||
"sha256": "0lrzbljd8iklyrmplc64lq4v8y7z5fw7l41y27nsfjl4rm0xz5bn",
|
||||
"vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz",
|
||||
"version": "1.3.0"
|
||||
"rev": "v1.3.1",
|
||||
"sha256": "sha256-X2Utt+MUboLc0/nAXB78ko3w2ieTIQaVsDK6MhbUKSQ=",
|
||||
"vendorSha256": "sha256-yZ/TgAVlBxHhrrZU6SH1KXNoZj8oWRqx3BjVHkTtI+Q=",
|
||||
"version": "1.3.1"
|
||||
},
|
||||
"namecheap": {
|
||||
"owner": "namecheap",
|
||||
@ -728,10 +727,10 @@
|
||||
"owner": "newrelic",
|
||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v2.41.2",
|
||||
"sha256": "sha256-LCA1K4md1wRRkB7oerUn1MM0TRLcqQBoVpvoxCMGSs8=",
|
||||
"rev": "v2.42.0",
|
||||
"sha256": "sha256-OD0wahsEw86E7TbUxIqEhoZ85An9yRwgTENtdoYnFB0=",
|
||||
"vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=",
|
||||
"version": "2.41.2"
|
||||
"version": "2.42.0"
|
||||
},
|
||||
"nomad": {
|
||||
"owner": "hashicorp",
|
||||
@ -783,10 +782,10 @@
|
||||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.69.0",
|
||||
"sha256": "sha256-VwL+i4HtvAJi3R57cjUrg+7rx1LxEUAMwkorCvJ9DcU=",
|
||||
"rev": "v4.70.0",
|
||||
"sha256": "sha256-KgpYl1DllCkpXbxYp8cqKE28l4digmaB75BoL6CpkQA=",
|
||||
"vendorSha256": null,
|
||||
"version": "4.69.0"
|
||||
"version": "4.70.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
@ -816,13 +815,12 @@
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"opennebula": {
|
||||
"deleteVendor": true,
|
||||
"owner": "OpenNebula",
|
||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||
"repo": "terraform-provider-opennebula",
|
||||
"rev": "v0.4.3",
|
||||
"sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=",
|
||||
"vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=",
|
||||
"vendorSha256": null,
|
||||
"version": "0.4.3"
|
||||
},
|
||||
"openstack": {
|
||||
@ -838,10 +836,10 @@
|
||||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.28.2",
|
||||
"sha256": "sha256-qp5H37Zf9oPYA2vvWKuEpfUeHIfK1NYE9Uk7dcX9izA=",
|
||||
"vendorSha256": "sha256-FMcPG7EJvU6XNKd2+8+xmjqSI0Ec9Xx/6gZvK9zJ3wg=",
|
||||
"version": "1.28.2"
|
||||
"rev": "v1.29.0",
|
||||
"sha256": "sha256-jhG2TyinnlPPIVA2K+ckOcxlqxeUFkp+WFJcJqYQ13k=",
|
||||
"vendorSha256": "sha256-qNJ1jkbGgFUxvHYUMPX9kBAwQSx4vfOr7eS0Z6J7X8Q=",
|
||||
"version": "1.29.0"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
@ -865,10 +863,10 @@
|
||||
"owner": "ovh",
|
||||
"provider-source-address": "registry.terraform.io/ovh/ovh",
|
||||
"repo": "terraform-provider-ovh",
|
||||
"rev": "v0.16.0",
|
||||
"sha256": "0vvxcm4ff6zw5ngwq9cia2ifjg8a2adyf66dyc2d8lavvfld22v9",
|
||||
"rev": "v0.17.1",
|
||||
"sha256": "sha256-bAwOxRexJuSw3Ntb8zXeTFPp23hCkCEI+zF4Q2SP3lA=",
|
||||
"vendorSha256": null,
|
||||
"version": "0.16.0"
|
||||
"version": "0.17.1"
|
||||
},
|
||||
"pagerduty": {
|
||||
"owner": "PagerDuty",
|
||||
@ -955,10 +953,10 @@
|
||||
"owner": "scaleway",
|
||||
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.2.1-rc.1",
|
||||
"sha256": "0f4sizgcy3000k67nb3axa8xhpczvzdla3bnpda27jdrx22ckyz8",
|
||||
"vendorSha256": "11g5v5kvs4qxdg34ai7fpinwbshrjwi9hxzav2vpnzhy8lfqpkzb",
|
||||
"version": "2.2.1-rc.1"
|
||||
"rev": "v2.2.1-rc.2",
|
||||
"sha256": "sha256-7T+J4T0qm7QMGWWjIT0nKHkHzd6wfFNP3suF7GitErc=",
|
||||
"vendorSha256": "sha256-kfr8YqLr8CXntkiMEHA5kosZqkloV4rGjEmdXosT7WU=",
|
||||
"version": "2.2.1-rc.2"
|
||||
},
|
||||
"secret": {
|
||||
"owner": "numtide",
|
||||
@ -1000,10 +998,10 @@
|
||||
"owner": "splunk-terraform",
|
||||
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
|
||||
"repo": "terraform-provider-signalfx",
|
||||
"rev": "v6.11.0",
|
||||
"sha256": "sha256-ezd4TzckY5yx/UjwGxH36VX+owI8fBUmxtQFztOsFvs=",
|
||||
"rev": "v6.11.1",
|
||||
"sha256": "sha256-37D4nblpGK8duohDiyY4UR0jn+T6QX7LnCfGtPdYQ3k=",
|
||||
"vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=",
|
||||
"version": "6.11.0"
|
||||
"version": "6.11.1"
|
||||
},
|
||||
"skytap": {
|
||||
"owner": "skytap",
|
||||
@ -1018,10 +1016,10 @@
|
||||
"owner": "chanzuckerberg",
|
||||
"provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.29.0",
|
||||
"sha256": "sha256-CdJHknGzEKfbxzrtqmevKwiYTs1UoRFRj6/ShQ9mdIc=",
|
||||
"rev": "v0.30.0",
|
||||
"sha256": "sha256-JHpwqMyt/oMZv6P4xEOlyV0pL32HQselDg+dP9JGRpg=",
|
||||
"vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=",
|
||||
"version": "0.29.0"
|
||||
"version": "0.30.0"
|
||||
},
|
||||
"sops": {
|
||||
"owner": "carlpett",
|
||||
@ -1036,10 +1034,10 @@
|
||||
"owner": "spotinst",
|
||||
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.70.0",
|
||||
"sha256": "sha256-jtoFXfHCnmGW2QVssngNtRLT6BfHaaNmNl4v2UIsmrI=",
|
||||
"vendorSha256": "sha256-yfWdyEf6ypF0QCdh9zspCaFyPJpt4DgYR1LBPTztOUw=",
|
||||
"version": "1.70.0"
|
||||
"rev": "v1.71.0",
|
||||
"sha256": "sha256-Fcx0KHTAAOQE/Qa+84p5l5ve5nrWXZHgRyc3xNYBJoQ=",
|
||||
"vendorSha256": "sha256-pI9jX/Wp6Nu1ix82ZE2CBZYu0j4S+HH2+dD5G679VrE=",
|
||||
"version": "1.71.0"
|
||||
},
|
||||
"stackpath": {
|
||||
"owner": "stackpath",
|
||||
@ -1081,10 +1079,10 @@
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.66.3",
|
||||
"sha256": "sha256-LwIL+GjyEyuTCKiKLrOKrH5S1s9L56PUaHu6ypSSnRQ=",
|
||||
"rev": "v1.67.0",
|
||||
"sha256": "sha256-61Fhh/BW1Iv/7wMU0lDMxPdB86Wqf43F90ZoWM990K0=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.66.3"
|
||||
"version": "1.67.0"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
@ -1117,10 +1115,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/tls",
|
||||
"repo": "terraform-provider-tls",
|
||||
"rev": "v3.1.0",
|
||||
"sha256": "0g2bgvw02ydwgb6blica5a139crnyp4hdhzxf433n3fflwyvl6r1",
|
||||
"vendorSha256": null,
|
||||
"version": "3.1.0"
|
||||
"rev": "v3.3.0",
|
||||
"sha256": "sha256-7A9AXZxTIltZdXXIpMpQGYKwgSdU6kRRNuvVaNtMFGw=",
|
||||
"vendorSha256": "sha256-bj2KpPFFnev5DAND9/HyUC4kOORAvnnpSihUECcHB/8=",
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"triton": {
|
||||
"deleteVendor": true,
|
||||
@ -1154,10 +1152,10 @@
|
||||
"owner": "cloudposse",
|
||||
"provider-source-address": "registry.terraform.io/cloudposse/utils",
|
||||
"repo": "terraform-provider-utils",
|
||||
"rev": "0.17.17",
|
||||
"sha256": "sha256-QJtdCEw8bnVku4fqAX5MBU9tkPv5jwjra9lGPfUPGQw=",
|
||||
"vendorSha256": "sha256-5EelFIfHVLRiRJig6EeJG6KGJuQ05LX3M5CNxUxQAas=",
|
||||
"version": "0.17.17"
|
||||
"rev": "0.17.19",
|
||||
"sha256": "sha256-FTZyri4/6QWkLKKectzx3av8fnoDkOIyAkAPasFU8sU=",
|
||||
"vendorSha256": "sha256-FA2Hev7RS3ZJ/cDTgyZ7uMFlQB/VdJ19GZUpkWTEPV8=",
|
||||
"version": "0.17.19"
|
||||
},
|
||||
"vault": {
|
||||
"owner": "hashicorp",
|
||||
|
@ -24,7 +24,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.37.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.38.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-hnRS/7CZPk1bbBjpHLAywKVu2u7jgg3p5/pxEdkzMJ8=";
|
||||
sha256 = "sha256-PmeJ6ZNjQjxuPl1UqunQT0q6uUZxt5gDFJS/WCcHE68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
55
pkgs/applications/radio/splat/default.nix
Normal file
55
pkgs/applications/radio/splat/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib, stdenv, fetchurl, groff, ncurses, bzip2, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "splat";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.qsl.net/kd2bd/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-ObCzFOLpJ73wDR7aS5hl79EouoUDBfmHrsBJxP1Yopw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
# configure script needs `clear`
|
||||
[ groff ncurses ];
|
||||
|
||||
buildInputs = [ bzip2 zlib ];
|
||||
|
||||
postPatch = "patchShebangs build utils/build";
|
||||
|
||||
configurePhase =
|
||||
# configure for maximum resolution
|
||||
''
|
||||
runHook preConfigure
|
||||
cat > std-params.h << EOF
|
||||
#define HD_MODE 1
|
||||
#define MAXPAGES 64
|
||||
EOF
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
./build all
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dt $out/bin splat
|
||||
find utils -type f -executable -exec install -Dt $out/bin {} \;
|
||||
install -Dt $out/share/man/man1 docs/english/man/*.1
|
||||
install -Dt $out/share/man/es/man1 docs/spanish/man/*.1
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz";
|
||||
license = licenses.gpl2Only;
|
||||
homepage = "https://www.qsl.net/kd2bd/splat.html";
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
@ -46,13 +46,13 @@ let
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "obs-studio";
|
||||
version = "27.2.1";
|
||||
version = "27.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obsproject";
|
||||
repo = "obs-studio";
|
||||
rev = version;
|
||||
sha256 = "sha256-RHPzSw7wjnAHk90N7g53LyIH3ozO/hyZV5hVZpZe+Ow=";
|
||||
sha256 = "sha256-iZekhsqvtlMeKX2bQ+w/womkOTDLbbP0MmoTzbvpNtU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "5.3.45";
|
||||
version = "6.6.96";
|
||||
in fetchFromGitHub {
|
||||
name = "material-design-icons-${version}";
|
||||
owner = "Templarian";
|
||||
@ -16,7 +16,7 @@ in fetchFromGitHub {
|
||||
cp fonts/*.woff $out/share/fonts/woff/
|
||||
cp fonts/*.woff2 $out/share/fonts/woff2/
|
||||
'';
|
||||
sha256 = "1nwha6dbj97ybiwlf69la57l3ibmwgnzs0nr104bfqnqxjs471sx";
|
||||
sha256 = "sha256-rfDb9meTF0Y0kiCQd11SgnntQnw34Ti/IXn35xaPO1M=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "4600+ Material Design Icons from the Community";
|
||||
@ -26,10 +26,7 @@ in fetchFromGitHub {
|
||||
color and size they need for any project.
|
||||
'';
|
||||
homepage = "https://materialdesignicons.com";
|
||||
license = with licenses; [
|
||||
asl20 # for icons from: https://github.com/google/material-design-icons
|
||||
ofl
|
||||
];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ vlaci ];
|
||||
};
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-xfce-icon-theme";
|
||||
version = "0.15.2";
|
||||
version = "0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shimmerproject";
|
||||
repo = "elementary-xfce";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E8f6UU/4Y9Nfk7LjDcdyV+TdeVj/zl3oFCyEu3Gz27w=";
|
||||
sha256 = "sha256-p6HQhYf+rw3obrc6e5lYqC02i4dK+5eXGwnTJj0+D+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arc-theme";
|
||||
version = "20220223";
|
||||
version = "20220405";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jnsh";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qsZdXDNxT1/gIlkUsC1cfVrULApC+dHreBXXjVTJQiA=";
|
||||
sha256 = "sha256-CBj/SpBWH5xdNCQSJquqIntcmfARI7Cud76Tp8txXL4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,12 +1,10 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gi-docgen
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, gnome
|
||||
, desktop-file-utils
|
||||
, appstream-glib
|
||||
@ -17,34 +15,20 @@
|
||||
, glib
|
||||
, atk
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghex";
|
||||
version = "4.beta.1";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sBS/9cY++uHLGCbLeex8ZW697JJn3dK+HaM6tHBdwJ4=";
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Ly11VO8SimxoAJ2YY5TiBMMWeMU+HUpAnyGQmNS/ybs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with -Werror=format-security
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/3d35359f3a12b6abb4a3d8a12a0f39b7221be408.patch";
|
||||
sha256 = "4z9nUd+/eBOUGwl3MErse+FKLzGqtWKwkIzej57CnYk=";
|
||||
})
|
||||
# Build devhelp index.
|
||||
# https://gitlab.gnome.org/GNOME/ghex/-/merge_requests/25
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/b26a7b1135ea2fe956a9bc0669b3b6ed818716c3.patch";
|
||||
sha256 = "nYjjxds9GNWkW/RhXEe5zJzPF4TnLMsCELEqYR4dXTk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
@ -53,9 +37,8 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
pkg-config
|
||||
gi-docgen
|
||||
python3
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -71,13 +54,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# mremap does not exist on darwin
|
||||
"-Dmmap-buffer-backend=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
|
@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-connections";
|
||||
version = "42.0";
|
||||
version = "42.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-L3s5u0OPS2oM3Jn2JjGpXbI+W7JC7Gg5pMlQKchwJO0=";
|
||||
hash = "sha256-owbNw637XJd8nVJs3hhbQ0Acs6XPihpz5ek3TqFxxAk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,28 +1,78 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
|
||||
, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, desktop-file-utils
|
||||
, itstool
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, gtk3
|
||||
, libgtop
|
||||
, dnsutils
|
||||
, iputils
|
||||
, nmap
|
||||
, inetutils
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-nettool";
|
||||
version = "3.8.1";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "pU8p7vIDiu5pVRyLGcpPdY5eueIJCkvGtWM9/wGIdR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
gtk3 wrapGAppsHook libgtop intltool itstool libxml2
|
||||
gnome.adwaita-icon-theme
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-nettool/-/commit/1124c3e1fdb8472d30b7636500229aa16cdc1244.patch";
|
||||
sha256 = "fbpfL8Xb1GsadpQzAdmu8FSPs++bsGCVdcwnzQWttGY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ nmap inetutils ];
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
itstool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libgtop
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x postinstall.py
|
||||
patchShebangs postinstall.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : "${lib.makeBinPath [
|
||||
dnsutils # for dig
|
||||
iputils # for ping
|
||||
nmap # for nmap
|
||||
inetutils # for ping6, traceroute, whois
|
||||
]}"
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
versionPolicy = "none";
|
||||
};
|
||||
};
|
||||
|
||||
@ -30,7 +80,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool";
|
||||
description = "A collection of networking tools";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -36,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "42.0.1";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "/PQ/L75NwEw6wq5QVjP+se8w2nDKleq8YeIAaxkuXlU=";
|
||||
sha256 = "hmE2yjKSL3zEJNOtxrHbp86+B6qWoZ+XyAdw4/Lupxs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zenity";
|
||||
version = "3.41.0";
|
||||
version = "3.42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "GbZ2w1EOIrrfzDIEBi1DK6U3QC9eCuJhKMDZDJVAN+E=";
|
||||
sha256 = "wkx/5rtDFjztit8jLVg7LgE9O6bCjetfz4B5hePete8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -143,9 +143,21 @@
|
||||
]
|
||||
},
|
||||
"42": {
|
||||
"applications-menu": [
|
||||
"apps-menu@gnome-shell-extensions.gcampax.github.com",
|
||||
"Applications_Menu@rmy.pobox.com"
|
||||
],
|
||||
"workspace-indicator": [
|
||||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com",
|
||||
"horizontal-workspace-indicator@tty2.io"
|
||||
],
|
||||
"lock-keys": [
|
||||
"lockkeys@vaina.lt",
|
||||
"lockkeys@fawtytoo"
|
||||
],
|
||||
"wireguard-indicator": [
|
||||
"wireguard-indicator@gregos.me",
|
||||
"wireguard-indicator@atareao.es"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@ -6,6 +6,15 @@
|
||||
# - Make a separate section for each GNOME version. Collisions will come back eventually
|
||||
# as the extensions are updated.
|
||||
{
|
||||
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
|
||||
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
|
||||
|
||||
"lockkeys@vaina.lt" = "lock-keys";
|
||||
"lockkeys@fawtytoo" = "lock-keys-2";
|
||||
|
||||
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
|
||||
"wireguard-indicator@atareao.es" = "wireguard-indicator";
|
||||
|
||||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
|
||||
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
|
||||
|
||||
@ -15,24 +24,15 @@
|
||||
|
||||
# ####### GNOME 41 #######
|
||||
|
||||
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
|
||||
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
|
||||
|
||||
"floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
|
||||
"floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";
|
||||
|
||||
"lockkeys@vaina.lt" = "lock-keys";
|
||||
"lockkeys@fawtytoo" = "lock-keys-2";
|
||||
|
||||
"unredirect@vaina.lt" = "disable-unredirect-fullscreen-windows";
|
||||
"unredirect@aunetx" = "disable-unredirect-fullscreen-windows-2";
|
||||
|
||||
"fuzzy-clock@keepawayfromfire.co.uk" = "fuzzy-clock-2";
|
||||
"FuzzyClock@johngoetz" = "fuzzy-clock";
|
||||
|
||||
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
|
||||
"wireguard-indicator@atareao.es" = "wireguard-indicator";
|
||||
|
||||
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
|
||||
# there seem to be upstream plans, so this should be checked periodically:
|
||||
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
|
||||
|
File diff suppressed because one or more lines are too long
@ -21,9 +21,9 @@
|
||||
let unwrapped = mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "thunar";
|
||||
version = "4.16.10";
|
||||
version = "4.16.11";
|
||||
|
||||
sha256 = "sha256-BeEy8+zEsJ5fJAbvP37tfekqF5LTHil0RDcE5RY0f64=";
|
||||
sha256 = "sha256-xan0HuHYLVArx3dGzzxsCjQ8eWsXNk0LtZGAejA2iGI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
|
@ -192,6 +192,15 @@ stdenv.mkDerivation (rec {
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
|
||||
sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
|
||||
})
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
|
||||
# Prevent the paths module from emitting symbols that we don't use
|
||||
# when building with separate outputs.
|
||||
#
|
||||
# These cause problems as they're not eliminated by GHC's dead code
|
||||
# elimination on aarch64-darwin. (see
|
||||
# https://github.com/NixOS/nixpkgs/issues/140774 for details).
|
||||
./cabal-paths.patch
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, hidapi
|
||||
@ -21,6 +22,15 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ hidapi libftdi1 libusb1 ]
|
||||
++ lib.optional stdenv.isLinux libgpiod;
|
||||
|
||||
patches = [
|
||||
# Patch is upstream, so can be removed when OpenOCD 0.12.0 or later is released.
|
||||
(fetchpatch
|
||||
{
|
||||
url = "https://github.com/openocd-org/openocd/commit/cff0e417da58adef1ceef9a63a99412c2cc87ff3.patch";
|
||||
sha256 = "Xxzf5miWy4S34sbQq8VQdAbY/oqGyhL/AJxiEPRuj3Q=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-jtag_vpi"
|
||||
"--enable-usb_blaster_libftdi"
|
||||
|
@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
version = "91.7.0";
|
||||
version = "91.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301";
|
||||
sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "applet-window-buttons";
|
||||
version = "0.10.1";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psifidotos";
|
||||
repo = "applet-window-buttons";
|
||||
rev = version;
|
||||
sha256 = "18h2g3jqzr88wkmws2iz71sgrz633zwkqvhn32sdi32sxxbrksgd";
|
||||
hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,27 +0,0 @@
|
||||
From a66b58d61caaae452785a2d69f5de9259ab27138 Mon Sep 17 00:00:00 2001
|
||||
From: James Almer <jamrial@gmail.com>
|
||||
Date: Sun, 16 Jan 2022 00:32:52 -0300
|
||||
Subject: [PATCH] fate/ffmpeg: add missing samples dependency to fate-shortest
|
||||
|
||||
Signed-off-by: James Almer <jamrial@gmail.com>
|
||||
(cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345)
|
||||
---
|
||||
tests/fate/ffmpeg.mak | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
|
||||
index 0b00bb5b23..b80467d02e 100644
|
||||
--- a/tests/fate/ffmpeg.mak
|
||||
+++ b/tests/fate/ffmpeg.mak
|
||||
@@ -86,7 +86,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \
|
||||
-guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \
|
||||
-f ac3 -flags +bitexact -c ac3_fixed
|
||||
|
||||
-FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \
|
||||
+FATE_SAMPLES_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \
|
||||
SINE_FILTER PCM_S16LE_DECODER RAWVIDEO_DECODER \
|
||||
ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER \
|
||||
AC3_FIXED_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \
|
||||
--
|
||||
2.33.1
|
||||
|
@ -5,10 +5,8 @@
|
||||
}@args:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
version = "5.0";
|
||||
version = "5.0.1";
|
||||
branch = version;
|
||||
sha256 = "1ndy6a2bhl6nvz9grmcaakh4xi0vss455466s47l6qy7na6hn4y0";
|
||||
sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY=";
|
||||
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
|
||||
|
||||
patches = [ ./0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch ];
|
||||
} // args)
|
||||
|
@ -14,14 +14,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk-frdp";
|
||||
version = "unstable-2021-10-28";
|
||||
version = "unstable-2022-04-07";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "a44d84ec687f41ad37e43697b28a018f65780780";
|
||||
sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM=";
|
||||
rev = "70cd7598cb201d58575445d4361263df9b864e73";
|
||||
sha256 = "ZyJoJl0WAwalPSkAQNkwDPnP+zLfMMP+ZdIKu2kdXVI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater {
|
||||
# The updater tries src.url by default, which does not exist for fetchFromGitHub (fetchurl).
|
||||
url = "${meta.homepage}.git";
|
||||
branch = "gtk-frdp-0-1";
|
||||
};
|
||||
};
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "args";
|
||||
version = "6.2.7";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taywee";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-I297qPXs8Fj7Ibq2PN6y/Eas3DiW5Ecvqot0ePwFNTI=";
|
||||
sha256 = "sha256-fEM9KNqqxYbafMcHCW46Y//8Hrvd7gZrCIQhH5lhpFc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -323,7 +323,9 @@ stdenv.mkDerivation rec {
|
||||
gettext() { "${gettext}/bin/gettext" "$@"; }
|
||||
'
|
||||
'' + optionalString isLinux ''
|
||||
substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
|
||||
for f in $out/lib/systemd/system/*.service ; do
|
||||
substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill
|
||||
done
|
||||
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
|
||||
wrapProgram $out/sbin/libvirtd \
|
||||
--prefix PATH : /run/libvirt/nix-emulators:${binPath}
|
||||
|
@ -65,7 +65,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.34.6";
|
||||
version = "2.36.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-a8j9A0qtBDKiRZzk/H7iWtZaSSTGGL+Nk7UrDBqEwfY=";
|
||||
sha256 = "sha256-uHfMofEFI19d1Xx6wrLCvjxraR/0RPk5JcclTPFWxk0=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ]
|
||||
++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ]
|
||||
++ lib.optionals (cudaSupport && lib.versionAtLeast cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ]
|
||||
++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ];
|
||||
|
||||
inherit doCheck;
|
||||
|
22
pkgs/development/php-packages/datadog_trace/default.nix
Normal file
22
pkgs/development/php-packages/datadog_trace/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ buildPecl, curl, fetchFromGitHub, lib, pcre2 }:
|
||||
|
||||
buildPecl rec {
|
||||
pname = "ddtrace";
|
||||
version = "0.70.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DataDog";
|
||||
repo = "dd-trace-php";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-AYRBzE0Detg/IHXYutZUfPRMtfthxdkSjqD0M+VcTpY=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl pcre2 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Datadog Tracing PHP Client";
|
||||
homepage = "https://github.com/DataDog/dd-trace-php";
|
||||
license = licenses.apsl20;
|
||||
maintainers = teams.php.members;
|
||||
};
|
||||
}
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -15,8 +15,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NDw2vqnOOeFpgvU9//1WIA0hI9zY7TkiquU6DJ70b5E=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mInpqQsH6GUyakA+74c3xvGRQvIFJ1rBa4bqWlJ9ea0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "autograd";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1i1ylf03b7220n8znk63zg6sgdd3py9wlh1pvqvy03g1fxsi8pd1";
|
||||
sha256 = "sha256-OD3g9TfvLji4X/lpJZOwz66JWMmzvUUbUsJV/ZFx/84=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy future ];
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awesomeversion";
|
||||
version = "22.2.0";
|
||||
version = "22.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FlJrk/PH3nBLakQfS+ruDwAPH/oo16JcfrtVRFgbUXY=";
|
||||
sha256 = "sha256-bloBP5cKZtvu96HSQ4AmZ5+VeSXGkmN/m4fuyHLrBws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudflare";
|
||||
version = "2.9.9";
|
||||
version = "2.9.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wou62Xro/hOU3pjGdJpe2kzY15+bcd14UOn4vsw9RcI=";
|
||||
hash = "sha256-LsUMB0zqlelHqWsgdmJ8v+Qn/reYuxCTKTODBT9K0bg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "9.1.12";
|
||||
version = "9.1.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-o3r2qZbSAAzyxfPdf9JNDhd/WKRhDdJFfnjCI8eTEE0=";
|
||||
sha256 = "sha256-TpE15UOwbuAvp+ffC9JUnR8yQb0DWvBMkSieMhQGjao=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elkm1-lib";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "gwww";
|
||||
repo = "elkm1";
|
||||
rev = version;
|
||||
hash = "sha256-Jr9f+essHB1FkzD6zM0G6jgE9C9lfDJuFIPrKRhVt+g=";
|
||||
hash = "sha256-JZohQ0xLFfLVMGlw89uC9OQF6SMddcCOsotshavynCk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "furo";
|
||||
version = "2022.3.4";
|
||||
version = "2022.4.7";
|
||||
format = "wheel";
|
||||
disable = pythonOlder "3.6";
|
||||
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
inherit pname version format;
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
sha256 = "sha256-bHGCk+v4d1XwufFIseaXyeOqvXr5VWRNS8ruXOddt4E=";
|
||||
sha256 = "sha256-fz49L7l3SDWQ+Oyyws1RG9gmYbecGO+yTelVi8nN8tc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c=";
|
||||
sha256 = "sha256-C2hAkWSb3h+lFC3pUIHlttme44Ugfae8opmFQbVWYTE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,8 +22,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8iLQpNax0xgjf+vUo6OcXMF1aZuaRFZBos8EC1gJEPA=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-mqB6Sal+gt2i9h9HHZNVJ/HXPrF7Fe4MC7EKpJR3JMY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,25 +1,48 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, hidapi
|
||||
, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, ecpy
|
||||
, fetchPypi
|
||||
, future
|
||||
, hidapi
|
||||
, pillow
|
||||
, protobuf
|
||||
, pycrypto
|
||||
, pycryptodomex
|
||||
, pythonOlder
|
||||
, python-u2flib-host
|
||||
, websocket-client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledgerblue";
|
||||
version = "0.1.41";
|
||||
version = "0.1.42";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7246a1a0442a63aff0b5de2796d306f0033e1937b3c9b9c2a92c9101cde4fe8d";
|
||||
hash = "sha256-UNquetZ1sCLO9T5p5b3jTSu+52xuc5XdyHNKsvvPdck=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client
|
||||
ecpy
|
||||
future
|
||||
hidapi
|
||||
pillow
|
||||
protobuf
|
||||
pycrypto
|
||||
pycryptodomex
|
||||
python-u2flib-host
|
||||
websocket-client
|
||||
];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "ledgerblue" ];
|
||||
pythonImportsCheck = [
|
||||
"ledgerblue"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to communicate with Ledger Blue/Nano S";
|
||||
|
@ -10,6 +10,7 @@
|
||||
, pyperclip
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, questionary
|
||||
, requests
|
||||
, requests-mock
|
||||
@ -17,13 +18,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "myjwt";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mBouamama";
|
||||
repo = "MyJWT";
|
||||
rev = version;
|
||||
sha256 = "sha256-kZkqFeaQPd56BVaYmCWAbVu1xwbPAIlQC3u5/x3dh7A=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-A9tsQ6L+y3doL5pJbau3yKnmQtX2IPXWyW/YCLhS7nc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -48,7 +52,9 @@ buildPythonPackage rec {
|
||||
sed -i -e "s/==[0-9.]*//" requirements.txt
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "myjwt" ];
|
||||
pythonImportsCheck = [
|
||||
"myjwt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)";
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycfmodel";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oP9u62PpnBCDAwE9LJHkm93f9eYyXbHai/gp62bL84M=";
|
||||
hash = "sha256-JZRM4CwO69BJBTm0LzA41oNv/iViIdU3Mq01Fa/KlUs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhaversion";
|
||||
version = "22.04.0";
|
||||
version = "22.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-ItemkSm85Sq3utEG28mvfS7gq95veeYwhHG6BpOUJJY=";
|
||||
sha256 = "sha256-adM6LUo8ycD/3G19JIl4DcuVK/f0/9V8AG82qgYO0uM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -3,22 +3,32 @@
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyplaato";
|
||||
version = "0.0.16";
|
||||
version = "0.0.17";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-0hbdwgkQhcjD9YbpG+bczAAi9u1QfrJdMn1g14EBPac=";
|
||||
hash = "sha256-fd7gHDah5yoqpH5d3bwEDsIfeflXzXevJLMD7lvz180=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp python-dateutil ];
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pyplaato" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyplaato"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API client for fetching Plaato data";
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-smarttub";
|
||||
version = "0.0.30";
|
||||
version = "0.0.31";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PzmE0j/sas1Dc/U022dS3krROm292xJlL37+EWPEs+g=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-tyE50HzwnrxXGWJ0+YRxCmSxtqrPnYmJzBH2ZDFJDZ4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmrepo";
|
||||
version = "0.0.16";
|
||||
version = "0.0.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,8 +22,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-gaZXQFZ1Vm8ruW42IXc6+fLA5856Oc0cGgtScwIr5f8=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eMtYVdKLiIaagDB1OEdYge6+McchOZPBcuIKGMzyvQQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,20 +2,21 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, six
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.0";
|
||||
pname = "slicerator";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18e60393e6765ca96986f801bbae62a617a1eba6ed57784e61b165ffc7dc1848";
|
||||
hash = "sha256-RAEKf1zYdoDAchO1yr6B0ftxJSlilD5Tc+59FGBdYEY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} run_tests.py
|
||||
'';
|
||||
@ -24,9 +25,9 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/soft-matter/slicerator";
|
||||
description = "A lazy-loading, fancy-sliceable iterable";
|
||||
homepage = "https://github.com/soft-matter/slicerator";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.10.7";
|
||||
version = "3.10.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OYor+DQJkkQx8C5E0pmeGaymiYEyKkuKBLp12jkrhS8=";
|
||||
sha256 = "sha256-SFG3wGGFxzZKfNyIQrpDGblL2vC0pQguWIYdwF0Mg5A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
@ -2,23 +2,34 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wasabi";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "152245d892030a3a7b511038e9472acff6d0e237cfe4123fef0d147f2d3274fc";
|
||||
sha256 = "sha256-rabxPptw7ya/lfrQ/r396+IAXimgitWPS7rjg6lymM8=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wasabi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight console printing and formatting toolkit";
|
||||
homepage = "https://github.com/ines/wasabi";
|
||||
changelog = "https://github.com/ines/wasabi/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tfsec";
|
||||
version = "1.15.4";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IYmS3Q2WWkOYISx0jI8yggArk0fhl3WQWrsc+Zfg8gU=";
|
||||
sha256 = "sha256-lQo3rhPjKZV9XuuKYxd3jXqSiElj+O0DdERtmsMZMEw=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
# "-extldflags '-fno-PIC -static'"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-dF7x3oA2q4IuoXn8tcQAdRKWooeLoeBsQ1sAhOGwwM8=";
|
||||
vendorSha256 = "sha256-n93ZP6sIyL5Q9UeDRXxm8KleDfUf2wd6JcTgSPtBGWg=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/tfsec"
|
||||
|
@ -1,22 +1,23 @@
|
||||
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:
|
||||
|
||||
let
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
assets = {
|
||||
x86_64-darwin = {
|
||||
asset = "scala-cli-x86_64-apple-darwin.gz";
|
||||
sha256 = "10453af2kz10k9vmcgdwpk10z36cnblnj6l09wkqngxwx9vxbf9q";
|
||||
sha256 = "UlDF2Eaaet62zZV0z6XOZvg/YeB//AXPDni8h3Wc6rw=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
asset = "scala-cli-x86_64-pc-linux.gz";
|
||||
sha256 = "0720c4s717hcssp4b3x295rhgac4ifjr95zn45bm1n70jr3xqzyj";
|
||||
sha256 = "086fi7ma4j9xy6gs0k7i06ql8ranjkjlrir2860q74kinfisk79a";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "scala-cli";
|
||||
inherit version;
|
||||
nativeBuildInputs = [ autoPatchelfHook installShellFiles ];
|
||||
nativeBuildInputs = [ installShellFiles ]
|
||||
++ lib.optional stdenv.isLinux autoPatchelfHook;
|
||||
buildInputs = [ coreutils zlib stdenv.cc.cc ];
|
||||
src =
|
||||
let
|
||||
@ -42,9 +43,9 @@ stdenv.mkDerivation {
|
||||
# We need to call autopatchelf before generating completions
|
||||
dontAutoPatchelf = true;
|
||||
|
||||
postFixup = ''
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
autoPatchelf $out
|
||||
|
||||
'' + ''
|
||||
# hack to ensure the completion function looks right
|
||||
# as $0 is used to generate the compdef directive
|
||||
PATH="$out/bin:$PATH"
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-iEjfp6QXMIk/ehq0Ypa8JXv3/u40w39NHz7HhC1KBms=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WL9bp77Q1cQakxaptw6ZHCq2+IAscMIDKkbQAHSCo1s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deadnix";
|
||||
version = "0.1.3";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astro";
|
||||
repo = "deadnix";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ddnxmcr9fncgrqg1vvqcbx49c3lccdpb40h9rvzyldzy9xynzi7";
|
||||
sha256 = "1fyagp6m6adwfcisi1zvs5dflcvrmpx4q1fr8pqzb93zv4m3ar84";
|
||||
};
|
||||
|
||||
cargoSha256 = "19vgjv70vxgxssrxvdjwfl16bwdbdrpb2wzb3fg9vlz4fhbj2lv9";
|
||||
cargoSha256 = "102akpvs2hvf5hl9rh5cspxzqly68wk7qhx0g1zhfp1ka58gnr4p";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find and remove unused code in .nix source files";
|
||||
|
@ -1,12 +1,9 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "delve";
|
||||
version = "1.8.2";
|
||||
|
||||
goPackagePath = "github.com/go-delve/delve";
|
||||
excludedPackages = [ "_fixtures" "scripts" "service/test" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-delve";
|
||||
repo = "delve";
|
||||
@ -14,10 +11,14 @@ buildGoPackage rec {
|
||||
sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "cmd/dlv" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
|
||||
postInstall = ''
|
||||
# fortify source breaks build since delve compiles with -O0
|
||||
wrapProgram $out/bin/dlv \
|
||||
|
@ -2,22 +2,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "errcheck";
|
||||
version = "1.6.0";
|
||||
version = "unstable-2022-03-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kisielk";
|
||||
repo = "errcheck";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Przf2c2jFNdkUq7IOUD7ChXHiSayAz4xTsNzajycYZ0=";
|
||||
rev = "e62617a91f7bd1abab2cbe7f28966188dd85eee0";
|
||||
sha256 = "sha256-RoPv6Odh8l9DF1S50pNEomLtI4uTDNjveOXZd4S52c0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc=";
|
||||
vendorSha256 = "sha256-fDugaI9Fh0L27yKSFNXyjYLMMDe6CRgE6kVLiJ3+Kyw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Program for checking for unchecked errors in go programs";
|
||||
description = "Checks for unchecked errors in go programs";
|
||||
homepage = "https://github.com/kisielk/errcheck";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, buildGo118Module, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGo118Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.8.1";
|
||||
|
||||
|
@ -1,22 +1,39 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "konstraint";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plexsystems";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UHdmC6UoDxl/GfvUOmuBctPpxIYljOurnm1J3eEPFHA=";
|
||||
sha256 = "sha256-BoH/lT+kYiwOtW82mmhhLZY3Xk2pRZHmNrEKJzPiG54=";
|
||||
};
|
||||
vendorSha256 = "sha256-UssvmmZhq+SO3cPpZi3Diji7tIxrpyhqNIBajqzRjh8=";
|
||||
vendorSha256 = "sha256-G6WigkkKZj/k+kYlKItSfnoXN8UZ60lFEkZcQaI9J5c=";
|
||||
|
||||
# Exclude go within .github folder
|
||||
excludedPackages = ".github";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/plexsystems/konstraint/internal/commands.version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd konstraint \
|
||||
--bash <($out/bin/konstraint completion bash) \
|
||||
--fish <($out/bin/konstraint completion fish) \
|
||||
--zsh <($out/bin/konstraint completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/konstraint --help
|
||||
$out/bin/konstraint --version | grep "${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/plexsystems/konstraint";
|
||||
changelog = "https://github.com/plexsystems/konstraint/releases/tag/v${version}";
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocamlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
pname = "opaline";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaapb";
|
||||
repo = "opaline";
|
||||
rev = "v${version}";
|
||||
sha256 = "1aj1fdqymq3pnr39h47hn3kxk5v9pnwx0jap1z2jzh78x970z21m";
|
||||
sha256 = "sha256-6htaiFIcRMUYWn0U7zTNfCyDaTgDEvPch2q57qzvND4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, genericUpdater
|
||||
, gitUpdater
|
||||
, common-updater-scripts
|
||||
, makeWrapper
|
||||
, rr
|
||||
@ -9,21 +9,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-rr";
|
||||
version = "0.1.3";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielzfranklin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "01m8fdz9as2fxnzs9csvbc76qxzbb98a66dh7w4a5q855v38g0zy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lQS+bp1u79iO8WGrkZSFEuonr1eYjxIQYhUvM/kBao4";
|
||||
};
|
||||
|
||||
cargoSha256 = "0fjs76n6bbbv83s213h2dgsszgxy4hbjsclyk9m81b3bfbmmb9sa";
|
||||
cargoSha256 = "sha256-PdKqWMxTtBJbNqITs3IjNcpijXy6MHitEY4jDp4jZro=";
|
||||
|
||||
passthru = {
|
||||
updateScript = genericUpdater {
|
||||
updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -7,8 +7,8 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "17.8.0";
|
||||
sha256 = "0jsf6sv42rzpizvil7g1gf9bskh8lx0gcxg0yzpr4hk7mx7i90br";
|
||||
version = "17.9.0";
|
||||
sha256 = "1q1rr9kvlk9rd35x3x206iy894hq2ywyhqxbb6grak6wcvdgcnan";
|
||||
patches = [
|
||||
./disable-darwin-v8-system-instrumentation.patch
|
||||
];
|
||||
|
76
pkgs/games/koules/default.nix
Normal file
76
pkgs/games/koules/default.nix
Normal file
@ -0,0 +1,76 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, imake
|
||||
, gccmakedep
|
||||
, libX11
|
||||
, libXext
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
let
|
||||
debian-extras = fetchzip {
|
||||
url = "mirror://debian/pool/main/k/koules/koules_1.4-27.debian.tar.xz";
|
||||
sha256 = "0bq1rr6vxqmx2k0dhyrqnwwfiw4h2ycbj576v66vwr0jaq5plil3";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "koules";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ucw.cz/~hubicka/koules/packages/${pname}${version}-src.tar.gz";
|
||||
sha256 = "06x2wkpns14kii9fxmxbmj5lma371qj00hgl7fc5kggfmzz96vy3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imake gccmakedep installShellFiles copyDesktopItems ];
|
||||
buildInputs = [ libX11 libXext ];
|
||||
|
||||
# Debian maintains lots of patches for koules. Let's include all of them.
|
||||
prePatch = ''
|
||||
patches="$patches $(cat ${debian-extras}/patches/series | sed 's|^|${debian-extras}/patches/|')"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# We do not want to depend on that particular font to be available in the
|
||||
# xserver, hence substitute it by a font which is always available
|
||||
sed -ie 's:-schumacher-clean-bold-r-normal--8-80-75-75-c-80-\*iso\*:fixed:' xlib/init.c
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cp xkoules.6 xkoules.man # else "make" will not succeed
|
||||
sed -ie "s:^SOUNDDIR\s*=.*:SOUNDDIR=$out/lib:" Makefile
|
||||
sed -ie "s:^KOULESDIR\s*=.*:KOULESDIR=$out:" Makefile
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 xkoules $out/bin/xkoules
|
||||
install -Dm755 koules.sndsrv.linux $out/lib/koules.sndsrv.linux
|
||||
install -m644 sounds/* $out/lib/
|
||||
install -Dm644 Koules.xpm $out/share/pixmaps/koules.xpm
|
||||
installManPage xkoules.6
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
desktopName = "Koules";
|
||||
name = "koules";
|
||||
exec = "xkoules";
|
||||
icon = "koules";
|
||||
comment = "Push your enemies away, but stay away from obstacles";
|
||||
categories = [ "Game" "ArcadeGame" ];
|
||||
}) ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast arcade game based on the fundamental law of body attraction";
|
||||
homepage = "https://www.ucw.cz/~hubicka/koules/English/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.iblech ];
|
||||
};
|
||||
}
|
@ -556,6 +556,10 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
tmux-thumbs = pkgs.callPackage ./tmux-thumbs {
|
||||
inherit mkTmuxPlugin;
|
||||
};
|
||||
|
||||
urlview = mkTmuxPlugin {
|
||||
pluginName = "urlview";
|
||||
version = "unstable-2016-01-06";
|
||||
|
29
pkgs/misc/tmux-plugins/tmux-thumbs/default.nix
Normal file
29
pkgs/misc/tmux-plugins/tmux-thumbs/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib, mkTmuxPlugin, fetchFromGitHub, thumbs, substituteAll }:
|
||||
|
||||
mkTmuxPlugin rec {
|
||||
pluginName = "tmux-thumbs";
|
||||
version = "0.7.1";
|
||||
rtpFilePath = "tmux-thumbs.tmux";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcsonline";
|
||||
repo = pluginName;
|
||||
rev = version;
|
||||
sha256 = "sha256-PH1nscmVhxJFupS7dlbOb+qEwG/Pa/2P6XFIbR/cfaQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix.patch;
|
||||
tmuxThumbsDir = "${thumbs}/bin";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/fcsonline/tmux-thumbs";
|
||||
description = "A lightning fast version of tmux-fingers written in Rust for copy pasting with vimium/vimperator like hints.";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ghostbuster91 ];
|
||||
};
|
||||
}
|
45
pkgs/misc/tmux-plugins/tmux-thumbs/fix.patch
Normal file
45
pkgs/misc/tmux-plugins/tmux-thumbs/fix.patch
Normal file
@ -0,0 +1,45 @@
|
||||
diff --git a/tmux-thumbs.sh b/tmux-thumbs.sh
|
||||
index 34dd528..8c05d54 100755
|
||||
--- a/tmux-thumbs.sh
|
||||
+++ b/tmux-thumbs.sh
|
||||
@@ -1,22 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeu -o pipefail
|
||||
|
||||
-VERSION=$(grep 'version =' Cargo.toml | grep -oe "[0-9]\+.[0-9]\+.[0-9]\+")
|
||||
-
|
||||
# Setup env variables to be compatible with compiled and bundled installations
|
||||
CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
-RELEASE_DIR="${CURRENT_DIR}/target/release"
|
||||
-
|
||||
-THUMBS_BINARY="${RELEASE_DIR}/thumbs"
|
||||
-TMUX_THUMBS_BINARY="${RELEASE_DIR}/tmux-thumbs"
|
||||
-
|
||||
-if [ ! -f "$THUMBS_BINARY" ]; then
|
||||
- tmux split-window "cd ${CURRENT_DIR} && bash ./tmux-thumbs-install.sh"
|
||||
- exit
|
||||
-elif [[ $(${THUMBS_BINARY} --version) != "thumbs ${VERSION}" ]]; then
|
||||
- tmux split-window "cd ${CURRENT_DIR} && bash ./tmux-thumbs-install.sh update"
|
||||
- exit
|
||||
-fi
|
||||
|
||||
function get-opt-value() {
|
||||
tmux show -vg "@thumbs-${1}" 2> /dev/null
|
||||
@@ -36,7 +22,7 @@ function get-opt-arg() {
|
||||
fi
|
||||
}
|
||||
|
||||
-PARAMS=(--dir "${CURRENT_DIR}")
|
||||
+PARAMS=(--dir @tmuxThumbsDir@)
|
||||
|
||||
function add-param() {
|
||||
local type opt arg
|
||||
@@ -51,4 +37,4 @@ add-param upcase-command string
|
||||
add-param multi-command string
|
||||
add-param osc52 boolean
|
||||
|
||||
-"${TMUX_THUMBS_BINARY}" "${PARAMS[@]}" || true
|
||||
+@tmuxThumbsDir@/tmux-thumbs "${PARAMS[@]}" || true
|
||||
|
||||
|
||||
|
@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/anbox/anbox-modules";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
broken = kernel.kernelOlder "4.4" || kernel.kernelAtLeast "5.5";
|
||||
broken = kernel.kernelAtLeast "5.5";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
}
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
|
||||
|
||||
assert lib.versionAtLeast kernel.version "3.5";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "digimend";
|
||||
version = "unstable-2019-06-18";
|
||||
|
@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.eelco ];
|
||||
platforms = platforms.linux;
|
||||
broken = kernel.kernelOlder "4.5" || kernel.kernelAtLeast "5.15";
|
||||
broken = kernel.kernelAtLeast "5.15";
|
||||
};
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, fetchFromGitHub, kernel }:
|
||||
|
||||
# facetimehd is not supported for kernels older than 3.19";
|
||||
assert lib.versionAtLeast kernel.version "3.19";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "facetimehd-${version}-${kernel.version}";
|
||||
version = "unstable-2020-04-16";
|
||||
|
||||
let
|
||||
# Note: When updating this revision:
|
||||
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
|
||||
# 2. Test the module and firmware change via:
|
||||
@ -14,29 +14,11 @@ let
|
||||
# e. see if the module loads back (apps using the camera won't
|
||||
# recover and will have to be restarted) and the camera
|
||||
# still works.
|
||||
srcParams = if (lib.versionAtLeast kernel.version "4.8") then
|
||||
{ # Use mainline branch
|
||||
version = "unstable-2020-04-16";
|
||||
rev = "82626d4892eeb9eb704538bf0dc49a00725ff451";
|
||||
sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx";
|
||||
}
|
||||
else
|
||||
{ # Use master branch (broken on 4.8)
|
||||
version = "unstable-2016-05-02";
|
||||
rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
|
||||
sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
|
||||
}
|
||||
;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "facetimehd-${version}-${kernel.version}";
|
||||
version = srcParams.version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patjak";
|
||||
repo = "bcwc_pcie";
|
||||
inherit (srcParams) rev sha256;
|
||||
rev = "82626d4892eeb9eb704538bf0dc49a00725ff451";
|
||||
sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -12,12 +12,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iwd";
|
||||
version = "1.25";
|
||||
version = "1.26";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
|
||||
rev = version;
|
||||
sha256 = "sha256-3IiRuILU2FKzXAQ0Q79DX2+nlNMcHNanS8m9GqjBBnU=";
|
||||
sha256 = "sha256-+BciYfb9++u9Ux4AdvPFFIFVq8j+TVoTLKqxzmn5p3o=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ]
|
||||
|
@ -2,8 +2,6 @@
|
||||
|
||||
with lib;
|
||||
|
||||
assert versionAtLeast linux.version "4.6";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gpio-utils";
|
||||
version = linux.version;
|
||||
|
@ -9,8 +9,6 @@
|
||||
|
||||
with lib;
|
||||
|
||||
assert versionAtLeast kernel.version "3.12";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "perf-linux";
|
||||
version = kernel.version;
|
||||
|
@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://wkz.github.io/ply/";
|
||||
license = [ licenses.gpl2Only ];
|
||||
maintainers = with maintainers; [ mic92 mbbx6spp ];
|
||||
broken = lib.versionOlder kernel.version "4.0";
|
||||
};
|
||||
}
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, kernel }:
|
||||
|
||||
assert lib.versionAtLeast kernel.version "4.4";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sch_cake";
|
||||
version = "unstable-2017-07-16";
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ lib, stdenv, fetchzip, kernel, perl, wireguard-tools, bc }:
|
||||
|
||||
# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
|
||||
assert lib.versionAtLeast kernel.version "3.10";
|
||||
# wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html
|
||||
assert lib.versionOlder kernel.version "5.6";
|
||||
|
||||
|
@ -216,7 +216,7 @@ in {
|
||||
# to be adapted
|
||||
zfsStable = common {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18";
|
||||
kernelCompatible = kernel.kernelOlder "5.18";
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_17;
|
||||
|
||||
# this package should point to the latest release.
|
||||
@ -227,7 +227,7 @@ in {
|
||||
|
||||
zfsUnstable = common {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18";
|
||||
kernelCompatible = kernel.kernelOlder "5.18";
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_17;
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
|
@ -100,17 +100,16 @@ let
|
||||
}) (lib.importJSON ./versions.json);
|
||||
|
||||
in {
|
||||
# Supported releases (as of 2020-10-26).
|
||||
# Supported releases (as of 2022-04-05).
|
||||
# Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
|
||||
# Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
|
||||
#
|
||||
# Series Type Rel. Date Sec. Fixes EOL
|
||||
# 13.x LTS 2014-10-24 2020-10-24 2021-10-24
|
||||
# 16.x LTS 2018-10-09 2022-10-09 2023-10-09
|
||||
# 17.x Standard 2019-10-28 2020-10-28 2021-10-28
|
||||
# 18.x LTS 2020-10-20 2024-10-20 2025-10-20
|
||||
# 19.x Standard 2021-11-02 2022-11-02 2023-11-02
|
||||
asterisk-lts = versions.asterisk_18;
|
||||
asterisk-stable = versions.asterisk_18;
|
||||
asterisk = versions.asterisk_18;
|
||||
asterisk-stable = versions.asterisk_19;
|
||||
asterisk = versions.asterisk_19;
|
||||
|
||||
} // versions
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user