Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
360ff20100
|
|
@ -59,7 +59,7 @@ let
|
|||
listen-on-v6 { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} };
|
||||
allow-query { cachenetworks; };
|
||||
blackhole { badnetworks; };
|
||||
forward first;
|
||||
forward ${cfg.forward};
|
||||
forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };
|
||||
directory "${cfg.directory}";
|
||||
pid-file "/run/named/named.pid";
|
||||
|
|
@ -151,6 +151,14 @@ in
|
|||
";
|
||||
};
|
||||
|
||||
forward = mkOption {
|
||||
default = "first";
|
||||
type = types.enum ["first" "only"];
|
||||
description = "
|
||||
Whether to forward 'first' (try forwarding but lookup directly if forwarding fails) or 'only'.
|
||||
";
|
||||
};
|
||||
|
||||
listenOn = mkOption {
|
||||
default = [ "any" ];
|
||||
type = types.listOf types.str;
|
||||
|
|
|
|||
84
nixos/tests/k3s-single-node-docker.nix
Normal file
84
nixos/tests/k3s-single-node-docker.nix
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
let
|
||||
imageEnv = pkgs.buildEnv {
|
||||
name = "k3s-pause-image-env";
|
||||
paths = with pkgs; [ tini (hiPrio coreutils) busybox ];
|
||||
};
|
||||
pauseImage = pkgs.dockerTools.streamLayeredImage {
|
||||
name = "test.local/pause";
|
||||
tag = "local";
|
||||
contents = imageEnv;
|
||||
config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ];
|
||||
};
|
||||
# Don't use the default service account because there's a race where it may
|
||||
# not be created yet; make our own instead.
|
||||
testPodYaml = pkgs.writeText "test.yml" ''
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: test
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: test
|
||||
spec:
|
||||
serviceAccountName: test
|
||||
containers:
|
||||
- name: test
|
||||
image: test.local/pause:local
|
||||
imagePullPolicy: Never
|
||||
command: ["sh", "-c", "sleep inf"]
|
||||
'';
|
||||
in
|
||||
{
|
||||
name = "k3s";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ euank ];
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ k3s gzip ];
|
||||
|
||||
# k3s uses enough resources the default vm fails.
|
||||
virtualisation.memorySize = 1536;
|
||||
virtualisation.diskSize = 4096;
|
||||
|
||||
services.k3s = {
|
||||
enable = true;
|
||||
role = "server";
|
||||
docker = true;
|
||||
# Slightly reduce resource usage
|
||||
extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local";
|
||||
};
|
||||
|
||||
users.users = {
|
||||
noprivs = {
|
||||
isNormalUser = true;
|
||||
description = "Can't access k3s by default";
|
||||
password = "*";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("k3s")
|
||||
machine.succeed("k3s kubectl cluster-info")
|
||||
machine.fail("sudo -u noprivs k3s kubectl cluster-info")
|
||||
# FIXME: this fails with the current nixos kernel config; once it passes, we should uncomment it
|
||||
# machine.succeed("k3s check-config")
|
||||
|
||||
machine.succeed(
|
||||
"${pauseImage} | docker load"
|
||||
)
|
||||
|
||||
machine.succeed("k3s kubectl apply -f ${testPodYaml}")
|
||||
machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test")
|
||||
machine.succeed("k3s kubectl delete -f ${testPodYaml}")
|
||||
|
||||
machine.shutdown()
|
||||
'';
|
||||
})
|
||||
82
nixos/tests/k3s-single-node.nix
Normal file
82
nixos/tests/k3s-single-node.nix
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
let
|
||||
imageEnv = pkgs.buildEnv {
|
||||
name = "k3s-pause-image-env";
|
||||
paths = with pkgs; [ tini (hiPrio coreutils) busybox ];
|
||||
};
|
||||
pauseImage = pkgs.dockerTools.streamLayeredImage {
|
||||
name = "test.local/pause";
|
||||
tag = "local";
|
||||
contents = imageEnv;
|
||||
config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ];
|
||||
};
|
||||
# Don't use the default service account because there's a race where it may
|
||||
# not be created yet; make our own instead.
|
||||
testPodYaml = pkgs.writeText "test.yml" ''
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: test
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: test
|
||||
spec:
|
||||
serviceAccountName: test
|
||||
containers:
|
||||
- name: test
|
||||
image: test.local/pause:local
|
||||
imagePullPolicy: Never
|
||||
command: ["sh", "-c", "sleep inf"]
|
||||
'';
|
||||
in
|
||||
{
|
||||
name = "k3s";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ euank ];
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ k3s gzip ];
|
||||
|
||||
# k3s uses enough resources the default vm fails.
|
||||
virtualisation.memorySize = 1536;
|
||||
virtualisation.diskSize = 4096;
|
||||
|
||||
services.k3s.enable = true;
|
||||
services.k3s.role = "server";
|
||||
services.k3s.package = pkgs.k3s;
|
||||
# Slightly reduce resource usage
|
||||
services.k3s.extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local";
|
||||
|
||||
users.users = {
|
||||
noprivs = {
|
||||
isNormalUser = true;
|
||||
description = "Can't access k3s by default";
|
||||
password = "*";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("k3s")
|
||||
machine.succeed("k3s kubectl cluster-info")
|
||||
machine.fail("sudo -u noprivs k3s kubectl cluster-info")
|
||||
# FIXME: this fails with the current nixos kernel config; once it passes, we should uncomment it
|
||||
# machine.succeed("k3s check-config")
|
||||
|
||||
machine.succeed(
|
||||
"${pauseImage} | k3s ctr image import -"
|
||||
)
|
||||
|
||||
machine.succeed("k3s kubectl apply -f ${testPodYaml}")
|
||||
machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test")
|
||||
machine.succeed("k3s kubectl delete -f ${testPodYaml}")
|
||||
|
||||
machine.shutdown()
|
||||
'';
|
||||
})
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
let
|
||||
# A suitable k3s pause image, also used for the test pod
|
||||
pauseImage = pkgs.dockerTools.buildImage {
|
||||
name = "test.local/pause";
|
||||
tag = "local";
|
||||
contents = with pkgs; [ tini coreutils busybox ];
|
||||
config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ];
|
||||
};
|
||||
testPodYaml = pkgs.writeText "test.yml" ''
|
||||
# Don't use the default service account because there's a race where it may
|
||||
# not be created yet; make our own instead.
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: test
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: test
|
||||
spec:
|
||||
serviceAccountName: test
|
||||
containers:
|
||||
- name: test
|
||||
image: test.local/pause:local
|
||||
imagePullPolicy: Never
|
||||
command: ["sh", "-c", "sleep inf"]
|
||||
'';
|
||||
in
|
||||
{
|
||||
name = "k3s";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ euank ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
k3s =
|
||||
{ pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.k3s pkgs.gzip ];
|
||||
|
||||
# k3s uses enough resources the default vm fails.
|
||||
virtualisation.memorySize = pkgs.lib.mkDefault 1536;
|
||||
virtualisation.diskSize = pkgs.lib.mkDefault 4096;
|
||||
|
||||
services.k3s.enable = true;
|
||||
services.k3s.role = "server";
|
||||
services.k3s.package = pkgs.k3s;
|
||||
# Slightly reduce resource usage
|
||||
services.k3s.extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local";
|
||||
|
||||
users.users = {
|
||||
noprivs = {
|
||||
isNormalUser = true;
|
||||
description = "Can't access k3s by default";
|
||||
password = "*";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
k3s.wait_for_unit("k3s")
|
||||
k3s.succeed("k3s kubectl cluster-info")
|
||||
k3s.fail("sudo -u noprivs k3s kubectl cluster-info")
|
||||
# k3s.succeed("k3s check-config") # fails with the current nixos kernel config, uncomment once this passes
|
||||
|
||||
k3s.succeed(
|
||||
"zcat ${pauseImage} | k3s ctr image import -"
|
||||
)
|
||||
|
||||
k3s.succeed("k3s kubectl apply -f ${testPodYaml}")
|
||||
k3s.succeed("k3s kubectl wait --for 'condition=Ready' pod/test")
|
||||
'';
|
||||
})
|
||||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "pithos";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "10nnm55ql86x1qfmq6dx9a1igf7myjxibmvyhd7fyv06vdhfifgy";
|
||||
sha256 = "03j04b1mk2fq0ni2ydpw40fdd36k545z8a1pq9x5c779080cwpla";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,19 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.8.9.9";
|
||||
version = "0.8.9.10";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
requests
|
||||
psutil
|
||||
dnspython
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "04asw5alkkf2q5iixswarj6ddb0y4a6ixm7cckl6204jiyxpv6kc";
|
||||
sha256 = "1cvrvy5ll97yyrzakxr8lb25qxmzk9fvcabsgc98jf89ikxgax4w";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snd";
|
||||
version = "21.8";
|
||||
version = "22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
|
||||
sha256 = "sha256-sI2xa37eSBDr/ucQ7RF3YfsszKfWcmOCoAJENALSlTo=";
|
||||
sha256 = "sha256-QK5lq2ek1yn3G0Ecs+TFIG5ST3lAETiyxuXIic3v1ik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "469";
|
||||
version = "470b";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1E85SIsLXeG+AUqQYCJxOlSwiT26OG+n/d9GbyryGCE=";
|
||||
sha256 = "0v52krjcqykrm3zqj6idzvbpjv4fhbgvq2jr8k0g63f7db7p08h9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,79 +1,79 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
|
||||
, xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick
|
||||
, libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }:
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, cmake, ninja, pkg-config, m4, bash
|
||||
, xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz
|
||||
, IOKit, Carbon, Cocoa, AudioToolbox, OpenGL
|
||||
, withTTYX ? true, libX11
|
||||
, withGUI ? true, wxGTK30, wxmac
|
||||
, withUCD ? true, libuchardet
|
||||
|
||||
# Plugins
|
||||
, withColorer ? true, spdlog, xercesc
|
||||
, withMultiArc ? true, libarchive, pcre
|
||||
, withNetRocks ? true, openssl, libssh, samba, libnfs, neon
|
||||
, withPython ? false, python3Packages
|
||||
}:
|
||||
|
||||
let
|
||||
wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK30);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "far2l";
|
||||
version = "2020-12-30.git${builtins.substring 0 7 src.rev}";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elfmz";
|
||||
repo = "far2l";
|
||||
rev = "52c1372441443aafd1a7dff6f17969a6ec19885d";
|
||||
sha256 = "0s7427fgxzj5zkyy6mhb4y5hqa6adsr30m0bigycp12b0495ryx0";
|
||||
rev = "v_${version}";
|
||||
sha256 = "sha256-nfoAElPLQ97lj65MBX4JMEdgTFbkdEbR1BazYZgV/lg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ];
|
||||
patches = [ ./python_prebuild.patch ];
|
||||
|
||||
buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build
|
||||
++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats
|
||||
#++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below
|
||||
nativeBuildInputs = [ cmake ninja pkg-config m4 makeWrapper ];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace far2l/bootstrap/trash.sh \
|
||||
--replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash'
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace far2l/CMakeLists.txt \
|
||||
--replace "-framework System" -lSystem
|
||||
'' + ''
|
||||
echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh
|
||||
substituteInPlace far2l/bootstrap/open.sh \
|
||||
--replace 'xdg-open' '${xdg-utils}/bin/xdg-open'
|
||||
substituteInPlace far2l/vtcompletor.cpp \
|
||||
buildInputs = lib.optional withTTYX libX11
|
||||
++ lib.optional withGUI wxWidgets
|
||||
++ lib.optional withUCD libuchardet
|
||||
++ lib.optionals withColorer [ spdlog xercesc ]
|
||||
++ lib.optionals withMultiArc [ libarchive pcre ]
|
||||
++ lib.optionals withNetRocks [ openssl libssh libnfs neon ]
|
||||
++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin
|
||||
++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ])
|
||||
++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs python/src/prebuild.sh
|
||||
substituteInPlace far2l/src/vt/vtcompletor.cpp \
|
||||
--replace '"/bin/bash"' '"${bash}/bin/bash"'
|
||||
substituteInPlace far2l/src/cfg/config.cpp \
|
||||
--replace '"/bin/bash"' '"${bash}/bin/bash"'
|
||||
substituteInPlace multiarc/src/formats/zip/zip.cpp \
|
||||
--replace '"unzip ' '"${unzip}/bin/unzip ' \
|
||||
--replace '"zip ' '"${zip}/bin/zip '
|
||||
substituteInPlace multiarc/src/formats/7z/7z.cpp \
|
||||
--replace '"^7z ' '"^${p7zip}/lib/p7zip/7z ' \
|
||||
--replace '"7z ' '"${p7zip}/lib/p7zip/7z '
|
||||
substituteInPlace multiarc/src/formats/targz/targz.cpp \
|
||||
--replace '"xz ' '"${xz}/bin/xz ' \
|
||||
--replace '"gzip ' '"${gzip}/bin/gzip ' \
|
||||
--replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \
|
||||
--replace '"tar ' '"${gnutar}/bin/tar '
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/scalable/apps
|
||||
cp -dpR install $out/share/far2l
|
||||
mv $out/share/far2l/far2l $out/bin/
|
||||
ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_askpass
|
||||
ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_sudoapp
|
||||
|
||||
cp ../far2l/DE/far2l.desktop $out/share/applications/far2l.desktop
|
||||
substituteInPlace $out/share/applications/far2l.desktop --replace \''${CMAKE_INSTALL_PREFIX} "$out"
|
||||
|
||||
cp ../far2l/DE/icons/hicolor/1024x1024/apps/far2l.svg $out/share/icons/hicolor/scalable/apps/
|
||||
convert -size 128x128 ../far2l/DE/icons/far2l.svg $out/share/icons/far2l.png
|
||||
for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024; do
|
||||
mkdir -p $out/share/icons/hicolor/$size/apps
|
||||
convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png
|
||||
done
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
wrapProgram $out/bin/far2l --argv0 $out/bin/far2l
|
||||
substituteInPlace WinPort/src/Backend/WX/CMakeLists.txt \
|
||||
--replace "-framework System" -lSystem
|
||||
'';
|
||||
|
||||
stripDebugList = [ "bin" "share" ];
|
||||
cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "yes" else "no"}") {
|
||||
TTYX = withTTYX;
|
||||
USEWX = withGUI;
|
||||
USEUCD = withUCD;
|
||||
COLORER = withColorer;
|
||||
MULTIARC = withMultiArc;
|
||||
NETROCKS = withNetRocks;
|
||||
PYTHON = withPython;
|
||||
};
|
||||
|
||||
runtimeDeps = [ unzip zip p7zip xz gzip bzip2 gnutar xdg-utils ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/far2l \
|
||||
--argv0 $out/bin/far2l \
|
||||
--prefix PATH : ${lib.makeBinPath runtimeDeps}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems";
|
||||
homepage = "https://github.com/elfmz/far2l";
|
||||
license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time
|
||||
maintainers = with maintainers; [ volth hypersw ];
|
||||
platforms = platforms.all;
|
||||
# fails to compile with:
|
||||
# error: no member named 'st_ctim' in 'stat'
|
||||
broken = stdenv.isDarwin;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
20
pkgs/applications/misc/far2l/python_prebuild.patch
Normal file
20
pkgs/applications/misc/far2l/python_prebuild.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
diff --git i/python/src/prebuild.sh w/python/src/prebuild.sh
|
||||
index d2847ee5..aa1ecc53 100755
|
||||
--- i/python/src/prebuild.sh
|
||||
+++ w/python/src/prebuild.sh
|
||||
@@ -12,9 +12,6 @@ mkdir -p "$DST/incpy"
|
||||
if [ ! -f "$DST/python/.prepared" ]; then
|
||||
echo "Preparing python virtual env at $DST/python using $PYTHON"
|
||||
mkdir -p "$DST/python"
|
||||
- $PYTHON -m venv --system-site-packages "$DST/python"
|
||||
- "$DST/python/bin/python" -m pip install --upgrade pip || true
|
||||
- "$DST/python/bin/python" -m pip install --ignore-installed cffi debugpy pcpp
|
||||
$PREPROCESSOR "$SRC/python/src/consts.gen" | sh > "${DST}/incpy/consts.h"
|
||||
|
||||
echo "1" > "$DST/python/.prepared"
|
||||
@@ -26,4 +23,4 @@ cp -f -R \
|
||||
"$SRC/python/configs/plug/far2l/"* \
|
||||
"$DST/incpy/"
|
||||
|
||||
-"$DST/python/bin/python" "$SRC/python/src/pythongen.py" "${SRC}" "${DST}/incpy"
|
||||
+"python" "$SRC/python/src/pythongen.py" "${SRC}" "${DST}/incpy"
|
||||
|
|
@ -14,13 +14,13 @@ let
|
|||
]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "wike";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hugolabe";
|
||||
repo = "Wike";
|
||||
rev = version;
|
||||
sha256 = "sha256-yyifRUf7oITV9lpnHnadZwHOKHr0Z+4bjCV/WoYs6vY=";
|
||||
sha256 = "sha256-Cv4gmAUqViHJEAgueLOUX+cI775QopfRA6vmHgQvCUY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xplr";
|
||||
version = "0.15.2";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sayanarijit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1znb6n9xbzbi9sif76xlwnqrzkh50g9yz6k36m0hm5iacd1fapab";
|
||||
sha256 = "sha256-eRA9v5C6FFYs01a8cwnaVGliuNj026/ANSPC2FxEUws=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
cargoSha256 = "0gbhkpha02ymr861av0fmyz6h007ajwkqcajq8hrnfzjk8rii47m";
|
||||
cargoSha256 = "sha256-xali/nvYVpvKIFRlOZpDNE/rv7iUHJCU9QV6RctJSO8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hackable, minimal, fast TUI file explorer";
|
||||
|
|
|
|||
|
|
@ -44,12 +44,12 @@ assert with lib.strings; (
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.4.3";
|
||||
version = "29.4.4";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
|
||||
sha256 = "sha256-9Qut7zgzDrU6T/sWbSF2Me7E02VJVL/B2bzJw14KWFs=";
|
||||
sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "widevine";
|
||||
version = "4.10.1582.1";
|
||||
version = "4.10.2391.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
|
||||
sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r";
|
||||
sha256 = "sha256-7gH808C67m/s09e4rQUQHb/t+iGVdzW+YzrB1ZxGIdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helm-docs";
|
||||
version = "1.5.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norwoodj";
|
||||
repo = "helm-docs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eyFuF03rqwfXyjEkqNRkjrJlHBazGYij1EtN0LAKdFk=";
|
||||
sha256 = "sha256-TXwEVyRYRiVqCDL7IR+DIu1iKqaq81W5xkvz+laxVek=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aAn969C4UhFGu5/qXIG/rc1cErQIDtPwEA+f0d43y0w=";
|
||||
vendorSha256 = "sha256-XTV0gyUWe6G5gxucsXOaDOUQoKMCfhrWzlKwUOaA6y4=";
|
||||
|
||||
subPackages = [ "cmd/helm-docs" ];
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.35.16";
|
||||
version = "0.35.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m32QhQUG3Dkh0odfqYhNmJ5Rrt0qf5wCvxePPusyRyI=";
|
||||
sha256 = "sha256-iSD036rDZvvMUGMHnjKh69eVUVQakI8muSCCq2ytODM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg=";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tixati";
|
||||
version = "2.87";
|
||||
version = "2.88";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
|
||||
sha256 = "sha256-URWLuZ/gtv/sX5+11ORu9SUZFIZUuKPn0CUQ1xaSQcQ=";
|
||||
sha256 = "sha256-9d9Z+3Uyxy4Bj8STtzHWwyyhWeMv3wo0IH6uxGTaA0I=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt
|
||||
index b33569d39..fdbfa10a9 100644
|
||||
--- a/libgnucash/quotes/CMakeLists.txt
|
||||
+++ b/libgnucash/quotes/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
set(_BIN_FILES "")
|
||||
-foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump.in)
|
||||
+foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-dump.in)
|
||||
string(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file})
|
||||
set(_ABS_OUTPUT_FILE ${BINDIR_BUILD}/${_OUTPUT_FILE_NAME})
|
||||
configure_file( ${file} ${_ABS_OUTPUT_FILE} @ONLY)
|
||||
@@ -26,4 +26,4 @@ add_custom_target(quotes-bin ALL DEPENDS ${_BIN_FILES})
|
||||
install(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
|
||||
install(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
-set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in gnc-fq-update.in Quote_example.pl README)
|
||||
+set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in Quote_example.pl README)
|
||||
35
pkgs/applications/office/gnucash/0003-remove-valgrind.patch
Normal file
35
pkgs/applications/office/gnucash/0003-remove-valgrind.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
|
||||
index 8e6e339d1..3936a8cb6 100644
|
||||
--- a/gnucash/CMakeLists.txt
|
||||
+++ b/gnucash/CMakeLists.txt
|
||||
@@ -163,13 +163,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash")
|
||||
|
||||
set(VALGRIND_OUTDIR ${BINDIR_BUILD})
|
||||
|
||||
-configure_file(gnucash-valgrind.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind @ONLY)
|
||||
-
|
||||
-file(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind
|
||||
- DESTINATION ${VALGRIND_OUTDIR}
|
||||
- FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
||||
-)
|
||||
-
|
||||
## Create the environment file
|
||||
|
||||
file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN)
|
||||
@@ -253,7 +246,6 @@ file(COPY ${ENV_FILE_OUT}
|
||||
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
||||
)
|
||||
|
||||
-install(FILES ${SCRIPT_LIST} ${VALGRIND_OUTDIR}/gnucash-valgrind DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION
|
||||
${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash)
|
||||
|
||||
@@ -274,7 +266,7 @@ gnc_add_scheme_targets(price-quotes
|
||||
|
||||
set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script
|
||||
gnucash.cpp gnucash-commands.cpp gnucash-cli.cpp gnucash-core-app.cpp
|
||||
- gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-valgrind.in
|
||||
+ gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in
|
||||
gnucash-gresources.xml ${gresource_files} price-quotes.scm
|
||||
${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST})
|
||||
|
||||
|
|
@ -1,106 +1,190 @@
|
|||
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest
|
||||
, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales
|
||||
, webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
|
||||
, libdbiDrivers, guile, perl, perlPackages
|
||||
{ fetchurl
|
||||
, lib
|
||||
, stdenv
|
||||
, aqbanking
|
||||
, boost
|
||||
, cmake
|
||||
, glib
|
||||
, glibcLocales
|
||||
, gtest
|
||||
, guile
|
||||
, gwenhywfar
|
||||
, icu
|
||||
, libdbi
|
||||
, libdbiDrivers
|
||||
, libofx
|
||||
, libxml2
|
||||
, libxslt
|
||||
, makeWrapper
|
||||
, perl
|
||||
, perlPackages
|
||||
, pkg-config
|
||||
, swig
|
||||
, webkitgtk
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
# Enable gnc-fq-* to run in command line.
|
||||
perlWrapper = stdenv.mkDerivation {
|
||||
name = perl.name + "-wrapper-for-gnucash";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]);
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
for script in ${perl}/bin/*; do
|
||||
makeWrapper $script $out''${script#${perl}} \
|
||||
--prefix "PERL5LIB" ":" "$PERL5LIB"
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-mlUcMMG3EhmfwiJ6EJr7mE177xjhOBcLvHIlxsH6ty0=";
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2";
|
||||
sha256 = "0bdpzb0wc9bjph5iff7133ppnkcqzfd10yi2qagij4mpq4q1qmcs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost icu libxml2 libxslt gettext isocodes gtk3 glibcLocales
|
||||
webkitgtk dconf libofx aqbanking gwenhywfar libdbi
|
||||
libdbiDrivers guile
|
||||
perlWrapper perl
|
||||
aqbanking
|
||||
boost
|
||||
glib
|
||||
glibcLocales
|
||||
gtest
|
||||
guile
|
||||
gwenhywfar
|
||||
icu
|
||||
libdbi
|
||||
libdbiDrivers
|
||||
libofx
|
||||
libxml2
|
||||
libxslt
|
||||
perl
|
||||
pkg-config
|
||||
swig
|
||||
webkitgtk
|
||||
] ++ (with perlPackages; [ FinanceQuote DateManip ]);
|
||||
|
||||
propagatedUserEnvPkgs = [ dconf ];
|
||||
patches = [
|
||||
# this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges
|
||||
./0001-disable-date-and-time-tests.patch
|
||||
# this patch prevents the building of gnc-fq-update, a utility which updates the GnuCash cli utils
|
||||
./0002-disable-gnc-fq-update.patch
|
||||
# this patch prevents the building of gnucash-valgrind
|
||||
./0003-remove-valgrind.patch
|
||||
];
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
|
||||
# this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges
|
||||
patches = [ ./0001-changes.patch ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
preConfigure = ''
|
||||
export GUILE_AUTO_COMPILE=0 # this needs to be an env variable and not a cmake flag to suppress guile warning
|
||||
'';
|
||||
|
||||
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
||||
|
||||
postInstall = ''
|
||||
# Auto-updaters don't make sense in Nix.
|
||||
rm $out/bin/gnc-fq-update
|
||||
|
||||
# Unnecessary in the release build.
|
||||
rm $out/bin/gnucash-valgrind
|
||||
|
||||
wrapProgram "$out/bin/gnucash" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" \
|
||||
--prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
|
||||
--prefix PERL5LIB ":" "$PERL5LIB" \
|
||||
--set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd \
|
||||
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
/*
|
||||
GNUcash's `make check` target does not define its prerequisites but expects them to have already been built.
|
||||
The list of targets below was built through trial and error based on failing tests.
|
||||
*/
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$PWD/lib/gnucash/test/future''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
||||
export NIX_CFLAGS_LINK="-lgtest -lgtest_main"
|
||||
make test-scm-query test-split-register-copy-ops test-link-ofx test-import-backend test-import-account-matcher test-import-pending-matches test-qofquerycore test-import-map test-gnc-numeric test-gnc-rational test-gnc-int128 test-qofsession test-kvp-value test-gnc-guid test-numeric test-vendor test-job test-employee test-customer test-address test-business test-recurrence test-transaction-voiding test-transaction-reversal test-split-vs-account test-tokenizer test-aqb test-import-parse test-link-module-tax-us test-dynload test-agedver test-incompatdep test-modsysver test-load-c test-gnc-path-util test-xml2-is-file test-load-example-account test-query test-querynew test-lots test-group-vs-book test-account-object test-engine test-qof test-commodities test-object test-guid test-load-engine test-userdata-dir-invalid-home test-userdata-dir test-resolve-file-path test-gnc-glib-utils test-sqlbe test-column-types test-backend-dbi test-xml-transaction test-xml-pricedb test-xml-commodity test-xml-account test-string-converters test-load-backend test-kvp-frames test-dom-converters1 test-autoclear test-sx test-print-parse-amount gncmod-futuremodsys
|
||||
'';
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Personal and small-business financial-accounting application";
|
||||
/*
|
||||
GNUcash's `make check` target does not define its prerequisites but expects them to have already been built.
|
||||
The list of targets below was built through trial and error based on failing tests.
|
||||
*/
|
||||
preCheck = ''
|
||||
make \
|
||||
test-account-object \
|
||||
test-address \
|
||||
test-agedver \
|
||||
test-app-utils \
|
||||
test-aqb \
|
||||
test-autoclear \
|
||||
test-backend-dbi \
|
||||
test-business \
|
||||
test-column-types \
|
||||
test-commodities \
|
||||
test-customer \
|
||||
test-dom-converters1 \
|
||||
test-dynload \
|
||||
test-employee \
|
||||
test-engine \
|
||||
test-exp-parser \
|
||||
test-gnc-glib-utils \
|
||||
test-gnc-guid \
|
||||
test-gnc-int128 \
|
||||
test-gnc-numeric \
|
||||
test-gnc-path-util \
|
||||
test-gnc-rational \
|
||||
test-group-vs-book \
|
||||
test-guid \
|
||||
test-import-account-matcher \
|
||||
test-import-backend \
|
||||
test-import-map \
|
||||
test-import-parse \
|
||||
test-import-pending-matches \
|
||||
test-incompatdep \
|
||||
test-job \
|
||||
test-kvp-frames \
|
||||
test-kvp-value \
|
||||
test-link-module-tax-us \
|
||||
test-link-ofx \
|
||||
test-load-backend \
|
||||
test-load-c \
|
||||
test-load-engine \
|
||||
test-load-example-account \
|
||||
test-load-xml2 \
|
||||
test-lots \
|
||||
test-modsysver \
|
||||
test-numeric \
|
||||
test-object \
|
||||
test-print-parse-amount \
|
||||
test-qof \
|
||||
test-qofquerycore \
|
||||
test-qofsession \
|
||||
test-query \
|
||||
test-querynew \
|
||||
test-recurrence \
|
||||
test-resolve-file-path \
|
||||
test-scm-query \
|
||||
test-scm-query-string \
|
||||
test-split-register-copy-ops \
|
||||
test-split-vs-account \
|
||||
test-sqlbe \
|
||||
test-string-converters \
|
||||
test-sx \
|
||||
test-tokenizer \
|
||||
test-transaction-reversal \
|
||||
test-transaction-voiding \
|
||||
test-userdata-dir \
|
||||
test-userdata-dir-invalid-home \
|
||||
test-vendor \
|
||||
test-xml-account \
|
||||
test-xml-commodity \
|
||||
test-xml-pricedb \
|
||||
test-xml-transaction \
|
||||
test-xml2-is-file
|
||||
|
||||
export LD_LIBRARY_PATH="$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$PWD/lib/gnucash/test/future"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # specify where db drivers are
|
||||
--set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} # specify where nix puts the gnome settings schemas
|
||||
)
|
||||
'';
|
||||
|
||||
# wrapGAppsHook would wrap all binaries including the cli utils which need Perl wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
# gnucash is wrapped using the args constructed for wrapGAppsHook.
|
||||
# gnc-fq-* are cli utils written in Perl hence the extra wrapping
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}"
|
||||
|
||||
for file in $out/bin/gnc-fq-check $out/bin/gnc-fq-dump $out/bin/gnc-fq-helper; do
|
||||
wrapProgram $file \
|
||||
--prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ DateManip FinanceQuote ]}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Personal and small business double entry accounting application.";
|
||||
longDescription = ''
|
||||
GnuCash is personal and small-business financial-accounting software,
|
||||
freely licensed under the GNU GPL and available for GNU/Linux, BSD,
|
||||
Solaris, macOS and Microsoft Windows.
|
||||
|
||||
Designed to be easy to use, yet powerful and flexible, GnuCash allows
|
||||
you to track bank accounts, stocks, income and expenses. As quick and
|
||||
intuitive to use as a checkbook register, it is based on professional
|
||||
accounting principles to ensure balanced books and accurate reports.
|
||||
Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses.
|
||||
As quick and intuitive to use as a checkbook register, it is based on professional accounting principles to ensure balanced books and accurate reports.
|
||||
'';
|
||||
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
homepage = "http://www.gnucash.org/";
|
||||
|
||||
maintainers = [ lib.maintainers.domenkozar ];
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
homepage = "https://www.gnucash.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.domenkozar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "0.61";
|
||||
version = "0.62";
|
||||
in fetchzip {
|
||||
name = "sudo-font-${version}";
|
||||
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
|
||||
sha256 = "sha256-4GDlx2zhwkcsxJPq0IrS1owmw+RKy09X3Q0zzA9l79w=";
|
||||
sha256 = "sha256-I0E2zYbfEFBEIBNC7nnJb+hOaBgGZkAIg08YpA8awso=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
|
|
|||
|
|
@ -215,12 +215,12 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library";
|
||||
xinitrc = xfce4-session.xinitrc;
|
||||
inherit (pkgs.gnome2) libglade;
|
||||
inherit (pkgs.gnome) vte gtksourceview;
|
||||
inherit (pkgs.gnome) gtksourceview;
|
||||
xfce4-mixer-pulse = xfce4-mixer;
|
||||
thunar-bare = thunar.override {
|
||||
thunarPlugins = [];
|
||||
};
|
||||
|
||||
# added 2019-11-30
|
||||
inherit (pkgs) dconf;
|
||||
inherit (pkgs) dconf vte;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-watcom-v2";
|
||||
version = "unstable-2021-12-10";
|
||||
version = "unstable-2022-01-18";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "ca685c1b780149f7210426f0bb78dd7b67b19e6d";
|
||||
sha256 = "1nmmj94z5hips2426rcdqdcsm8015jjj51rm9fnx81qagdj52j5d";
|
||||
rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0";
|
||||
sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "amdvlk";
|
||||
version = "2021.Q4.3";
|
||||
version = "2022.Q1.1";
|
||||
|
||||
src = fetchRepoProject {
|
||||
name = "${pname}-src";
|
||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||
rev = "refs/tags/v-${version}";
|
||||
sha256 = "M+58gJjP33yOuq6RYN73HG7wACPaYRz7WFC/AFFGMzw=";
|
||||
sha256 = "jdAFIC2JYPqCADx/73KM6E3rLFWF4SlEdY9lCK1NOhU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -87,11 +87,11 @@ in stdenv.mkDerivation rec {
|
|||
#!nix-shell -i bash -p coreutils curl gnused jq common-updater-scripts
|
||||
|
||||
function setHash() {
|
||||
sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's,sha256 = "[^.'"'"']*",sha256 = "'"$1"'",'
|
||||
sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's,sha256 = "[^'"'"'"]*",sha256 = "'"$1"'",'
|
||||
}
|
||||
|
||||
version="$(curl -sL "https://api.github.com/repos/GPUOpen-Drivers/AMDVLK/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
|
||||
sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's/version = "[^.'"'"']*"/version = "'"$version"'"/'
|
||||
sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's/version = "[^'"'"'"]*"/version = "'"$version"'"/'
|
||||
|
||||
setHash "$(nix-instantiate --eval -A lib.fakeSha256 | xargs echo)"
|
||||
hash="$(nix to-base64 $(nix-build -A amdvlk 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true))"
|
||||
|
|
|
|||
|
|
@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.xaverdh ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jabcode.x86_64-darwin
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfyaml";
|
||||
version = "0.7.3";
|
||||
version = "0.7.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantoniou";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RxaeDtsdPtcTYJ7qMVmBCm1TsMI7YsXCz2w/Bq2RmaA=";
|
||||
sha256 = "sha256-gmVjiwf8PsDYRt8jmXNrd+hJSL099hbLjq8Z0c1u2HE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
since = (version: pkgs.lib.versionAtLeast nodejs.version version);
|
||||
before = (version: pkgs.lib.versionOlder nodejs.version version);
|
||||
since = version: pkgs.lib.versionAtLeast nodejs.version version;
|
||||
before = version: pkgs.lib.versionOlder nodejs.version version;
|
||||
super = import ./composition.nix {
|
||||
inherit pkgs nodejs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -47,7 +47,7 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
carbon-now-cli = super.carbon-now-cli.override ({
|
||||
carbon-now-cli = super.carbon-now-cli.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
prePatch = ''
|
||||
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
|
||||
|
|
@ -56,13 +56,13 @@ let
|
|||
wrapProgram $out/bin/carbon-now \
|
||||
--set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium
|
||||
'';
|
||||
});
|
||||
};
|
||||
|
||||
deltachat-desktop = super."deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop".override {
|
||||
meta.broken = true; # use the top-level package instead
|
||||
};
|
||||
|
||||
fast-cli = super.fast-cli.override ({
|
||||
fast-cli = super.fast-cli.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
prePatch = ''
|
||||
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
|
||||
|
|
@ -71,7 +71,7 @@ let
|
|||
wrapProgram $out/bin/fast \
|
||||
--set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium
|
||||
'';
|
||||
});
|
||||
};
|
||||
|
||||
hyperspace-cli = super."@hyperspace/cli".override {
|
||||
nativeBuildInputs = with pkgs; [
|
||||
|
|
@ -360,6 +360,19 @@ let
|
|||
meta.broken = since "10";
|
||||
};
|
||||
|
||||
tailwindcss = super.tailwindcss.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/tailwind" \
|
||||
--prefix NODE_PATH : ${self.postcss}/lib/node_modules
|
||||
wrapProgram "$out/bin/tailwindcss" \
|
||||
--prefix NODE_PATH : ${self.postcss}/lib/node_modules
|
||||
'';
|
||||
passthru.tests = {
|
||||
simple-execution = pkgs.callPackage ./package-tests/tailwindcss.nix { inherit (self) tailwindcss; };
|
||||
};
|
||||
};
|
||||
|
||||
tedicross = super."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
|
|
|
|||
8032
pkgs/development/node-packages/node-packages.nix
generated
8032
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
15
pkgs/development/node-packages/package-tests/tailwindcss.nix
Normal file
15
pkgs/development/node-packages/package-tests/tailwindcss.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ runCommand, tailwindcss }:
|
||||
|
||||
let
|
||||
inherit (tailwindcss) packageName version;
|
||||
in
|
||||
|
||||
runCommand "${packageName}-tests" { meta.timeout = 60; }
|
||||
''
|
||||
# Ensure CLI runs
|
||||
${tailwindcss}/bin/tailwind --help > /dev/null
|
||||
${tailwindcss}/bin/tailwindcss --help > /dev/null
|
||||
|
||||
# Needed for Nix to register the command as successful
|
||||
touch $out
|
||||
''
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "0.6.4";
|
||||
version = "0.6.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+W1nsJsiVL4hjtNUyKOsQNyX0Bki/C1FvmoD2OCwqeM=";
|
||||
sha256 = "03p6waxz9pqh0faq0lifwgz0ivdlk9di2wa9gv81iljs6v0vr85v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioshelly";
|
||||
version = "1.0.5";
|
||||
version = "1.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AaEnVMup/sGR3ENtN6NF/CzG05P4Er5LI8mG5LNVzAo=";
|
||||
sha256 = "1jx2m03c8f76nn8r14vk0v7qq2kijgjhqcqwl95kih50cgmj0yzf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "3.8.0";
|
||||
version = "3.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atlassian-api";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-J0/CtfBtOdWReKQS/VvOL/3r+j4zJfnv/ICIXepKUvc=";
|
||||
sha256 = "0akrwvq1f87lyckzwgpd16aljsbqjwwliv7j9czal7f216nbkvv6";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -1,22 +1,29 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "AWSIoTPythonSDK";
|
||||
version = "1.4.9";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-iot-device-sdk-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mbppz1lnia4br5vjz1l4z4vw47y3bzcfpckzhs9lxhj4vq6d001";
|
||||
sha256 = "0bmvwv471mvlwj2rfz08j9qvzsp4vyjz67cbzkvsy6kmihx3wfqh";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "AWSIoTPythonSDK" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"AWSIoTPythonSDK"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python SDK for connecting to AWS IoT";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "8.2.0";
|
||||
version = "9.0.0";
|
||||
pname = "azure-mgmt-containerregistry";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f2bcdbcf0b9fdc2df0df9eccb77cb489091d3c670ed53cba77e5ffd734e9539b";
|
||||
sha256 = "9f6c5894d32ba696527ecf0ff155bb43c325dff6a11a6de60cd22ea3f5fb180d";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "canmatrix";
|
||||
version = "0.9.3";
|
||||
version = "0.9.5";
|
||||
|
||||
# uses fetchFromGitHub as PyPi release misses test/ dir
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebroecker";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9FupG1VmROgsxYhsafQYPPqG0xEOAYYK8QDOIBNzE0Y=";
|
||||
sha256 = "0x8x8kbg4gyzi0ia9657xygp0mqfii76b67fsx76d31bqsdvlda5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chart-studio";
|
||||
version = "5.4.0";
|
||||
version = "5.5.0";
|
||||
|
||||
# chart-studio was split from plotly
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ay9dlblxkx3pxqmizj2am9gf60j1pl6ir23yj7chg8dbafdbv8p";
|
||||
sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51";
|
||||
};
|
||||
|
||||
sourceRoot = "source/packages/python/chart-studio";
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ckcc-protocol";
|
||||
version = "1.1.0";
|
||||
version = "1.2.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b660225ac06fc06ad17b33ece428126eef785388450e14313f72d25d4082c5ab";
|
||||
sha256 = "65f0313f9915b36068f6dfcab08e04671621e6227650443bc12e81997081ae7f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "CycloneDX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BEug6F0uerkLoVJbJF19YIF96Xs2vJET2BUJFi9A5Qo=";
|
||||
hash = "sha256-U8CTSz+weh2IJr9Mc1kAtTa3edydQjMvHVpTVXJ7mYU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,22 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, chardet
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-debian";
|
||||
version = "0.1.42";
|
||||
version = "0.1.43";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a794f4c4ee2318ae7260c2e32dac252b833bdaf6686efc2a1afbc6ecf3f0931f";
|
||||
sha256 = "abc702511c4e268da49c22fd97c83de355c559f3271e0798a6b67964be3d8248";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ chardet six ];
|
||||
propagatedBuildInputs = [ chardet ];
|
||||
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
|
|
@ -23,7 +25,9 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Debian package related modules";
|
||||
homepage = "https://salsa.debian.org/python-debian-team/python-debian";
|
||||
changelog = "https://salsa.debian.org/python-debian-team/python-debian/-/blob/master/debian/changelog";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-debug-toolbar";
|
||||
version = "3.2.2";
|
||||
version = "3.2.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1dgb3s449nasbnqd5xfikxrfhwwilwlgrw9nv4bfkapvkzpdszjk";
|
||||
sha256 = "1008yzxxs1cp1wc0xcc9xskc3f7naxc4srv1sikiank1bc3479ha";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-maintenance-mode";
|
||||
version = "0.14.0";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabiocaccamo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1k06fhqd8wyrkp795x5j2r328l2phqgg1m1qm7fh4l2qrha43aw6";
|
||||
sha256 = "0krcq04pf4g50q88l7q1wc53jgkhjmvif3acghfqq8c3s2y7mbz7";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-oauth-toolkit";
|
||||
version = "1.6.1";
|
||||
version = "1.6.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-TOrFxQULwiuwpVFqRwRkfTW+GRudLNy6F/gIjUYjZhI=";
|
||||
sha256 = "00vmnsj1xdaddxqkdp9zvnm255mblljldp90a0wjsh257d8nyvyh";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dnslib";
|
||||
version = "0.9.18";
|
||||
version = "0.9.19";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "71a60664e275b411e08d9807aaafd2ee897a872bed003d5c8fdf12f5818503da";
|
||||
sha256 = "a6e36ca96c289e2cb4ac6aa05c037cbef318401ba8ff04a8676892ca79749c77";
|
||||
};
|
||||
|
||||
checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "doit";
|
||||
version = "0.34.0";
|
||||
version = "0.34.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jvHeEFy8qTnHPoNt/4bIEskijhHthwL2lVt6CGyqwC0=";
|
||||
sha256 = "49467c1bf8850a292e5fd0254ee1b219f6fd8202a0d3d4bf33af3c2dfb58d688";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cloudpickle ]
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "enturclient";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "hfurubotten";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1kl44ch8p31pr70yv6na2m0w40frackdwzph9rpb05sc83va701i";
|
||||
sha256 = "1w0791f4p3yyncc1izx3q97fyaky2ling14qr0yn0acrmq9yh5cc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "exchangelib";
|
||||
version = "4.7.0";
|
||||
version = "4.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "ecederstrand";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-APT/esskyigt6u3A+KVTAlmZDMppeyKb9Ws+95hDLcM=";
|
||||
sha256 = "1kwb5ixlmxg0xxm4wms5r4kym220vbncr9afi9qc25g8npkbs860";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glcontext";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moderngl";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16kwrfjijn9bnb48rk17wapmhxq6g9s59zczh65imyncb9k82wkc";
|
||||
sha256 = "1m2zkl696vqmgrd5k1c5kl0krk6qgjgsz88qhahwva0l40bswvhp";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "goodwe";
|
||||
version = "0.2.14";
|
||||
version = "0.2.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "marcelblijleven";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1q314mq83n9cfkhw3rmx6ka6ga6n2c5q5irh1bsf3f0i7m7m1k3j";
|
||||
sha256 = "0di4w3sgl86hjj8yvhx430w6b2fkdzxyjb1147k7py4lqpw7snjj";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-texttospeech";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e8e272ab54be00285c8f9451081d833980c9fc2a1eff828448dfe315dfa61250";
|
||||
sha256 = "0a76bed3cf48cf72d4aa50329d5da2bbc008c5c7dd57326854fc038536e107f1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage, python, lxml, isPy3k }:
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, python, lxml, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gpxpy";
|
||||
version = "1.4.2";
|
||||
disabled = !isPy3k;
|
||||
version = "1.5.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tkrajina";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1r5gb660nrkrdbw5m5h1n5k10npcfv9bxqv92z55ds8r7rw2saz6";
|
||||
sha256 = "sha256-Fkl2dte1WkPi2hBOdT23BMfNflR0j4GeNH86d46WNQk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lxml ];
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "green";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a4d86f2dfa4ccbc86f24bcb9c9ab8bf34219c876c24e9f0603aab4dfe73bb575";
|
||||
sha256 = "6325681c94afd0f225c7ea2dcfedfde88c859d60da384d54c9ee70b91e434b14";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "iminuit";
|
||||
version = "2.8.4";
|
||||
version = "2.9.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4b09189f3094896cfc68596adc95b7f1d92772e1de1424e5dc4dd81def56e8b0";
|
||||
sha256 = "656410ceffead79a52d3d727fdcd2bac78d7774239bef0efc3b7a86bae000ff3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -15,20 +15,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "orjson";
|
||||
version = "3.6.4";
|
||||
version = "3.6.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ijl";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xpna70s5v7d4lwsb6ijc0f2rm6p7jqmac9yayx9qb1dasbki6zd";
|
||||
sha256 = "1f8gc62w4hncrz8xkfw730cfqnk5433qswz3rba3pvvd7ldj5658";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "0m4f8lc0zwxh4lmxkpxvdd2lc2g3lkq0ymllqbyr31sbxvwnxk56";
|
||||
sha256 = "0jlhzdnfyk7hnn74rz9zbx51sdjs6rwlzfl1g62h58x28xh6m6gb";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywilight";
|
||||
version = "0.0.73";
|
||||
version = "0.0.74";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8AYzAePLqCiz/EN6cJShGnrISijBpFHAU/u355f5IjY=";
|
||||
sha256 = "sha256-patCdQ7qLEfy+RpH9T/Fa8ubI7QF6OmLzFUokZc5syQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,15 +9,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "1.0.0-rc10";
|
||||
version = "1.0.0-rc11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-N6BZ6HDDQ0m41BHGdKOONUjdIBDnPJOpN3eJMcsXYi8=";
|
||||
sha256 = "sha256-V6xaGnSoKuJC59uZLW8uSLqwseJHvLGjrvhzE8o9fho=";
|
||||
};
|
||||
vendorSha256 = "sha256-VPS5nRsAssgKSQ6DMtB6+MkMrpIY5+JEvOpaMZ3IWV8=";
|
||||
vendorSha256 = "sha256-442NHTREM2zC8VA7zAV35YSwX1lM/BXnx6p8a+avzps=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_checksums";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "credativ";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xc2bwp55xjnnf45lc60ldxpb5jfyi1bgfkv3nxrymcswh8yfidj";
|
||||
sha256 = "sha256-Ij+4ceQauX3tC97ftk/JS3/WlocPBf7A7PJrylpTLzw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libxslt.bin ];
|
||||
|
|
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 -t $out/bin pg_checksums
|
||||
install -Dm644 -t $out/share/man/man1 doc/man1/pg_checksums.1
|
||||
install -Dm755 -t $out/bin pg_checksums_ext
|
||||
install -Dm644 -t $out/share/man/man1 doc/man1/pg_checksums_ext.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pypi-mirror";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "montag451";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "077f3asi5fdbb2j2ll4xdwv7ndfbfr81bpn3zi55h6idfdc7zzc0";
|
||||
sha256 = "1ci19bqyhig1s5myzw6klkiycd8k0lzhk3yqfx5fjirc2f0xpz5j";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "pypi_mirror" ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "symfony-cli";
|
||||
version = "5.0.7";
|
||||
vendorSha256 = "sha256-aTC84iA3/z/qhZbXPtOeZwDGn6BFCefCVlkUrbEtxUI=";
|
||||
version = "5.1.0";
|
||||
vendorSha256 = "sha256-vnevuJoDiAx/Z6uKO/SX3UV3j/jsXXNlnui6Nzm+tBA=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z3AIlN/s0uPE0OAlgSxbQPRoWPTHjDq4c8RlQ3SuIk8=";
|
||||
sha256 = "sha256-leoR/zW6MHuZH/9xJlO0kYpr1UWpA1WWjXP7+4JkPBg=";
|
||||
};
|
||||
|
||||
# Tests requires network access
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OyH+fwE6ISGVol/0i56OfGhRf5Rw6WGx55MBZUN2frg=";
|
||||
sha256 = "sha256-zseYcam641qln8ax9JNBoJbn4RIsgpUtTfmU/uqeGRw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PH1LpdzeBGmMDP5l2dgRWcZo+PjA5LTNLLBqnMEeOZk=";
|
||||
cargoSha256 = "sha256-8ZpdSjldRBrriB2yzyxYkJsjJQ1O4EWzGp52k4Prv2c=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vintagestory";
|
||||
version = "1.15.10";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
|
||||
sha256 = "sha256-aT6vndo/SSAqd4omyW4qWvGetkqEpgvapqaqDBrbTmo=";
|
||||
sha256 = "sha256-1lAcE+RwK16xPTGxGCz2Pdq6GhmXFwy60CSZyq3hgnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -634,6 +634,7 @@ psliwka/vim-smoothie
|
|||
ptzz/lf.vim
|
||||
puremourning/vimspector
|
||||
purescript-contrib/purescript-vim
|
||||
pwntester/octo.nvim
|
||||
python-mode/python-mode
|
||||
qnighy/lalrpop.vim
|
||||
qpkorr/vim-bufkill
|
||||
|
|
|
|||
|
|
@ -1373,6 +1373,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
oderwat.indent-rainbow = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "indent-rainbow";
|
||||
publisher = "oderwat";
|
||||
version = "8.2.2";
|
||||
sha256 = "sha256-7kkJc+hhYaSKUbK4eYwOnLvae80sIg7rd0E4YyCXtPc=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Makes indentation easier to read";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=oderwat.indent-rainbow";
|
||||
homepage = "https://github.com/oderwat/vscode-indent-rainbow";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ imgabe ];
|
||||
};
|
||||
};
|
||||
|
||||
redhat.java = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "java";
|
||||
|
|
@ -1466,6 +1482,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ritwickdey.liveserver = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "liveserver";
|
||||
publisher = "ritwickdey";
|
||||
version = "5.6.1";
|
||||
sha256 = "sha256-QPMZMttYV+dQfWTniA7nko7kXukqU9g6Wj5YDYfL6hw=";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
rubbersheep.gi = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "gi";
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kernelshark";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/";
|
||||
rev = "kernelshark-v${version}";
|
||||
sha256 = "0vy5wa1kccrxr973l870jy5hl6lac7sk3zyg3hxrwmivin1yf0cv";
|
||||
sha256 = "18yx8bp2996hiy026ncw2z5yfihvkjfl6m09y19yvs72crgvpyn8";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{ lib, fetchFromGitHub, python2, makeWrapper }:
|
||||
{ lib, fetchFromGitHub, python3, makeWrapper }:
|
||||
|
||||
python2.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "headphones";
|
||||
version = "0.5.20";
|
||||
version = "0.6.0-alpha.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rembo10";
|
||||
repo = "headphones";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m234fr1i8bb8mgmjsdpkbaa3l16y23ca6s7nyyl5ismmjxhi4mz";
|
||||
sha256 = "sha256-+mWtceQoHSMRkA8izZnKM0cgbt0P5Hr3arKOevpKvqc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ python2 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/opt/headphones
|
||||
|
|
|
|||
|
|
@ -7,24 +7,38 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "promscale";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-OMDl8RGFOMW+KNX2tNHusJY/6gLZxuWCI3c0E/oqrfE=";
|
||||
sha256 = "sha256-h76NHEPY3ABq2NbRQXNR+zSkriBasi550rfSkl3Xdas=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-remove-jaeger-test-dep.patch
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-IwHngKiQ+TangEj5PcdiGoLxQJrt/Y3EtbSYZYmfUOE=";
|
||||
vendorSha256 = "sha256-PxmTS8fSh21BcLS4PsSfHhKOXWWJLboPR6E8/Jx/UGY=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/timescale/promscale/pkg/version.Version=${version}" "-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/timescale/promscale/pkg/version.Version=${version}"
|
||||
"-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}"
|
||||
];
|
||||
|
||||
doCheck = false; # Requires access to a docker daemon
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# some checks requires access to a docker daemon
|
||||
for pkg in $(getGoDirs test | grep -Ev 'testhelpers|upgrade_tests|end_to_end_tests|util'); do
|
||||
buildGoDir test $checkFlags "$pkg"
|
||||
done
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
package = promscale;
|
||||
|
|
@ -34,6 +48,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "An open-source analytical platform for Prometheus metrics";
|
||||
homepage = "https://github.com/timescale/promscale";
|
||||
changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgvector";
|
||||
version = "0.2.0";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ankane";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1jl6rpys24qxhkv3q798pp9v03z2z7gswivp19yria9xr3bg6wjv";
|
||||
sha256 = "sha256-rdhmdfxRK4rdgGsv8Rdokm46N/+S3ZwArkW5eJTQGsY=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xandikos";
|
||||
version = "0.2.6";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jelmer";
|
||||
repo = "xandikos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Epy6NWtRY2Oj4MHTStdv8ZJ5SvSmUo6IlwL5PJV9pD0=";
|
||||
sha256 = "sha256-KDDk0QSOjwivJFz3vLk+g4vZMlSuX2FiOgHJfDJkpwg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "lxd";
|
||||
version = "4.21";
|
||||
version = "4.22";
|
||||
|
||||
goPackagePath = "github.com/lxc/lxd";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
|
||||
sha256 = "1b2jls3jgvgdl0136nar8zm3hfrp0gqxxq9fh7vxc52r1aslarvs";
|
||||
sha256 = "119345936fcm1vv06k82k9hvj5yjf9jdrwqm9ccphhl5mswf8xq9";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "autorestic";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cupcakearmy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6/t7k0PNcRuCsIAV1iyDxDqsgm2fpBj+26MfvebNEBM=";
|
||||
sha256 = "sha256-T34+oHEe+BWFJwWfYnC71+mP4+uhTMYr9r426I4fXcY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-eKsPdmPJXiCwvb2A28tNxF4xStry3iA6aLb+XYFJYSg=";
|
||||
|
|
|
|||
52
pkgs/tools/compression/dtrx/default.nix
Normal file
52
pkgs/tools/compression/dtrx/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, gnutar
|
||||
, unzip
|
||||
, lhasa
|
||||
, rpm
|
||||
, binutils
|
||||
, cpio
|
||||
, gzip
|
||||
, p7zip
|
||||
, cabextract
|
||||
, unrar
|
||||
, unshield
|
||||
, bzip2
|
||||
, xz
|
||||
, lzip
|
||||
, unzipSupport ? false
|
||||
, unrarSupport ? false
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "dtrx";
|
||||
version = "8.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtrx-py";
|
||||
repo = "dtrx";
|
||||
rev = version;
|
||||
sha256 = "sha256-ayQ52teXWpw3ZvPhfqxFHxMZatQK9NKv/97ovANFZcE=";
|
||||
};
|
||||
|
||||
postInstall =
|
||||
let
|
||||
archivers = lib.makeBinPath (
|
||||
[ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield bzip2 xz lzip ]
|
||||
++ lib.optional (unzipSupport) unzip
|
||||
++ lib.optional (unrarSupport) unrar
|
||||
);
|
||||
in ''
|
||||
wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}"
|
||||
'';
|
||||
|
||||
buildInputs = [ python3Packages.twine ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
|
||||
homepage = "https://github.com/dtrx-py/dtrx";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
};
|
||||
}
|
||||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "czkawka";
|
||||
version = "3.3.1";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qarmin";
|
||||
repo = "czkawka";
|
||||
rev = version;
|
||||
sha256 = "0p1j5f5jk0cci6bg4jfnnn80gyi9039ni4ma8zwindk7fyn9gpc8";
|
||||
sha256 = "sha256-UIgyKWMVSKAgUNqfxFYSfP+l9x52XAzrXr1nnfKub9I=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1q35c5szavpsnzflw33radg6blzql3sz3jyzyqqz97ac69zns920";
|
||||
cargoSha256 = "sha256-jPrkNKFmdVk3LEa20jtXSx+7S98fSrX7Rt/lexC0Gwo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with python3Packages;
|
||||
buildPythonPackage rec {
|
||||
pname = "pre-commit";
|
||||
version = "2.16.0";
|
||||
version = "2.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "pre_commit";
|
||||
sha256 = "sha256-/piXysgwqnFk29AqTnuQyuSWMEUc6IRkvKc9tIa6n2U=";
|
||||
sha256 = "c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apt";
|
||||
version = "2.3.8";
|
||||
version = "2.3.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz";
|
||||
hash = "sha256-SFrxQwx14xWLcV5EJNv5bRtWQdxNzMUPVxssd5qDfyw=";
|
||||
hash = "sha256-uQo87RUuzTiaVdoRFeBFZb/L9fWKgIzbcfa1LU0vC98=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,20 +6,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "1.0.139";
|
||||
version = "2.0.141";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "armosec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CsIdr/+orDTGdEs4R069+PF3ZKuXx8uLxEsymFOLfOY=";
|
||||
hash = "sha256-4HVxPM+2SaFrhZiaRKwNuultE2df58aJMm9YSwbJBPM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-nUMbHoF7xqSpyfb+v7+ZaKzYOalpNcrFxcaRUw2W49s=";
|
||||
vendorSha256 = "sha256-1TupDdiG8hnbAM+JJRTJWCYQBGN/o+C3H2e0w9muYog=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
30
pkgs/tools/security/rucredstash/default.nix
Normal file
30
pkgs/tools/security/rucredstash/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rucredstash";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psibi";
|
||||
repo = "rucredstash";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jwsj2y890nxpgmlfbr9hms2raspp5h89ykzsh014mf7lb3yxzwg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
# Disable tests since it requires network access and relies on the
|
||||
# presence of certain AWS infrastructure
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "0qnfrwpdvjksc97iiwn1r6fyqaqn0q3ckbdzswf9flvwshqzb6ih";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rust port for credstash. Manages credentials securely in AWS cloud";
|
||||
homepage = "https://github.com/psibi/rucredstash";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ psibi ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "scorecard";
|
||||
version = "3.2.1";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ossf";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MVFhw/r1sws82oofV4LHmiSlKxyYd8abYq8oFiB0HH8=";
|
||||
sha256 = "sha256-xZBK2gIIxuvO2fuSYyWitO1xT8ItfBVqt2JRJoyH+gg=";
|
||||
# populate values otherwise taken care of by goreleaser,
|
||||
# unfortunately these require us to use git. By doing
|
||||
# this in postFetch we can delete .git afterwards and
|
||||
|
|
@ -27,7 +27,7 @@ buildGoModule rec {
|
|||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-WrM2aE0z6SnfoPEBqgn1TO6sSGPMrQvL6+ddvOS2w1k=";
|
||||
vendorSha256 = "sha256-SXBdtwYEslR871wLwCCHD7hsM/riHswyKrIilrsLqns=";
|
||||
|
||||
# Install completions post-install
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wluma";
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximbaz";
|
||||
repo = "wluma";
|
||||
rev = version;
|
||||
sha256 = "sha256-H5ohAawHTvZoFq4t5dUgP4Tr5qNyXEP4SG738Bo8mxc=";
|
||||
sha256 = "sha256-lh0GX2M3AFXjlu+jTQGiNKQXM7DiBc7RYMH9PYMLmV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
|
|||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}"
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-xLmDDy6qKXo0mLW3R4hQfZssg6lpo0G018TonF1uS14=";
|
||||
cargoSha256 = "sha256-ArT4xDi+qRpukuIX1RgTgC/At9kkuG3Lf1X56Q2j/2Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatic brightness adjustment based on screen contents and ALS";
|
||||
|
|
|
|||
|
|
@ -230,7 +230,6 @@ mapAliases ({
|
|||
double_conversion = double-conversion; # 2017-11-22
|
||||
docker_compose = docker-compose; # 2018-11-10
|
||||
draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
|
||||
dtrx = throw "dtrx has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01
|
||||
dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03
|
||||
dwarf_fortress = dwarf-fortress; # added 2016-01-23
|
||||
dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07
|
||||
|
|
|
|||
|
|
@ -2861,6 +2861,8 @@ with pkgs;
|
|||
|
||||
dtools = callPackage ../development/tools/dtools { };
|
||||
|
||||
dtrx = callPackage ../tools/compression/dtrx { };
|
||||
|
||||
dua = callPackage ../tools/misc/dua {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
|
|
@ -16320,6 +16322,7 @@ with pkgs;
|
|||
|
||||
far2l = callPackage ../applications/misc/far2l {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL;
|
||||
};
|
||||
|
||||
farbfeld = callPackage ../development/libraries/farbfeld { };
|
||||
|
|
@ -28422,6 +28425,10 @@ with pkgs;
|
|||
|
||||
rubyripper = callPackage ../applications/audio/rubyripper {};
|
||||
|
||||
rucredstash = callPackage ../tools/security/rucredstash {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
runc = callPackage ../applications/virtualization/runc {};
|
||||
|
||||
rymcast = callPackage ../applications/audio/rymcast {
|
||||
|
|
|
|||
Loading…
Reference in a new issue