Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
0708c5cc73
|
|
@ -30,3 +30,6 @@
|
|||
|
||||
# nixos: fix module paths in rename.nix
|
||||
d08ede042b74b8199dc748323768227b88efcf7c
|
||||
|
||||
# fix indentation in mk-python-derivation.nix
|
||||
d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
|
||||
|
|
|
|||
|
|
@ -1718,6 +1718,17 @@
|
|||
githubId = 50839;
|
||||
name = "Brian Jones";
|
||||
};
|
||||
booklearner = {
|
||||
name = "booklearner";
|
||||
email = "hey@booklearner.org";
|
||||
matrix = "@booklearner:matrix.org";
|
||||
github = "booklearner";
|
||||
githubId = 103979114;
|
||||
keys = [{
|
||||
longkeyid = "ed25519/0x0C61C4E5907F76C8";
|
||||
fingerprint = "17C7 95D4 871C 2F87 83C8 053D 0C61 C4E5 907F 76C8";
|
||||
}];
|
||||
};
|
||||
bootstrap-prime = {
|
||||
email = "bootstrap.prime@gmail.com";
|
||||
github = "bootstrap-prime";
|
||||
|
|
@ -3759,12 +3770,6 @@
|
|||
githubId = 57923898;
|
||||
name = "Elyhaka";
|
||||
};
|
||||
em0lar = {
|
||||
email = "nix@em0lar.dev";
|
||||
github = "em0lar";
|
||||
githubId = 11006031;
|
||||
name = "Leo Maroni";
|
||||
};
|
||||
emmabastas = {
|
||||
email = "emma.bastas@protonmail.com";
|
||||
matrix = "@emmabastas:matrix.org";
|
||||
|
|
@ -6414,6 +6419,13 @@
|
|||
githubId = 1189739;
|
||||
name = "Julio Borja Barra";
|
||||
};
|
||||
jugendhacker = {
|
||||
name = "j.r";
|
||||
email = "j.r@jugendhacker.de";
|
||||
github = "jugendhacker";
|
||||
githubId = 12773748;
|
||||
matrix = "@j.r:chaos.jetzt";
|
||||
};
|
||||
juliendehos = {
|
||||
email = "dehos@lisic.univ-littoral.fr";
|
||||
github = "juliendehos";
|
||||
|
|
@ -7270,6 +7282,12 @@
|
|||
githubId = 8355305;
|
||||
name = "leo60228";
|
||||
};
|
||||
leona = {
|
||||
email = "nix@leona.is";
|
||||
github = "leona-ya";
|
||||
githubId = 11006031;
|
||||
name = "Leona Maroni";
|
||||
};
|
||||
leonardoce = {
|
||||
email = "leonardo.cecchi@gmail.com";
|
||||
github = "leonardoce";
|
||||
|
|
@ -10217,6 +10235,12 @@
|
|||
githubId = 10473184;
|
||||
name = "Jia Xiaodong";
|
||||
};
|
||||
pogobanane = {
|
||||
email = "mail@peter-okelmann.de";
|
||||
github = "pogobanane";
|
||||
githubId = 38314551;
|
||||
name = "Peter Okelmann";
|
||||
};
|
||||
polarmutex = {
|
||||
email = "brian@brianryall.xyz";
|
||||
github = "polarmutex";
|
||||
|
|
@ -11988,6 +12012,12 @@
|
|||
githubId = 26806;
|
||||
name = "Scott Olson";
|
||||
};
|
||||
somasis = {
|
||||
email = "kylie@somas.is";
|
||||
github = "somasis";
|
||||
githubId = 264788;
|
||||
name = "Kylie McClain";
|
||||
};
|
||||
SomeoneSerge = {
|
||||
email = "sergei.kozlukov@aalto.fi";
|
||||
matrix = "@ss:someonex.net";
|
||||
|
|
@ -13653,6 +13683,17 @@
|
|||
email = "kirill.wedens@gmail.com";
|
||||
name = "wedens";
|
||||
};
|
||||
WeebSorceress = {
|
||||
name = "WeebSorceress";
|
||||
email = "hello@weebsorceress.anonaddy.me";
|
||||
matrix = "@weebsorceress:matrix.org";
|
||||
github = "WeebSorceress";
|
||||
githubId = 106774777;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x7F57344317F0FA43";
|
||||
fingerprint = "659A 9BC3 F904 EC24 1461 2EFE 7F57 3443 17F0 FA43";
|
||||
}];
|
||||
};
|
||||
wegank = {
|
||||
name = "Weijia Wang";
|
||||
email = "contact@weijia.wang";
|
||||
|
|
|
|||
|
|
@ -116,6 +116,13 @@
|
|||
and require manual remediation.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2.
|
||||
It is now the upstream version from https://www.memtest.org/,
|
||||
as coreboot’s fork is no longer available.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -51,4 +51,6 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
|
||||
|
||||
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -310,7 +310,11 @@ in
|
|||
|
||||
mkdir -m 0700 -p ${baseDir}/queue-runner
|
||||
mkdir -m 0750 -p ${baseDir}/build-logs
|
||||
chown hydra-queue-runner:hydra ${baseDir}/queue-runner ${baseDir}/build-logs
|
||||
mkdir -m 0750 -p ${baseDir}/runcommand-logs
|
||||
chown hydra-queue-runner.hydra \
|
||||
${baseDir}/queue-runner \
|
||||
${baseDir}/build-logs \
|
||||
${baseDir}/runcommand-logs
|
||||
|
||||
${optionalString haveLocalDB ''
|
||||
if ! [ -e ${baseDir}/.db-created ]; then
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ let
|
|||
# is in theory not needed as this is already the default for default builds
|
||||
UpdateChannel = 0;
|
||||
Headless = true;
|
||||
} // lib.optionalAttrs (cfg.ipcPasswordFile != "") {
|
||||
} // lib.optionalAttrs (cfg.ipcPasswordFile != null) {
|
||||
IPCPassword = "#ipcPassword#";
|
||||
});
|
||||
|
||||
|
|
@ -94,7 +94,8 @@ in
|
|||
};
|
||||
|
||||
ipcPasswordFile = mkOption {
|
||||
type = types.path;
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = "Path to a file containig the password. The file must be readable by the <literal>asf</literal> user/group.";
|
||||
};
|
||||
|
||||
|
|
@ -159,7 +160,6 @@ in
|
|||
users = {
|
||||
users.asf = {
|
||||
home = cfg.dataDir;
|
||||
homeMode = "700";
|
||||
isSystemUser = true;
|
||||
group = "asf";
|
||||
description = "Archis-Steam-Farm service user";
|
||||
|
|
@ -174,13 +174,17 @@ in
|
|||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = mkMerge [
|
||||
(mkIf (cfg.dataDir == "/var/lib/asf") { StateDirectory = "asf"; })
|
||||
(mkIf (cfg.dataDir == "/var/lib/asf") {
|
||||
StateDirectory = "asf";
|
||||
StateDirectoryMode = "700";
|
||||
})
|
||||
{
|
||||
User = "asf";
|
||||
Group = "asf";
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
Type = "simple";
|
||||
ExecStart = "${cfg.package}/bin/ArchiSteamFarm --path ${cfg.dataDir} --process-required --no-restart --service --no-config-migrate";
|
||||
Restart = "always";
|
||||
|
||||
# mostly copied from the default systemd service
|
||||
PrivateTmp = true;
|
||||
|
|
@ -222,7 +226,10 @@ in
|
|||
mkdir -p config
|
||||
|
||||
cp --no-preserve=mode ${asf-config} config/ASF.json
|
||||
${replaceSecretBin} '#ipcPassword#' '${cfg.ipcPasswordFile}' config/ASF.json
|
||||
|
||||
${optionalString (cfg.ipcPasswordFile != null) ''
|
||||
${replaceSecretBin} '#ipcPassword#' '${cfg.ipcPasswordFile}' config/ASF.json
|
||||
''}
|
||||
|
||||
${optionalString (cfg.ipcSettings != {}) ''
|
||||
ln -fs ${ipc-config} config/IPC.config
|
||||
|
|
@ -243,6 +250,6 @@ in
|
|||
|
||||
meta = {
|
||||
buildDocsInSandbox = false;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = with maintainers; [ lom SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,9 +51,6 @@ in {
|
|||
extraModulePaths = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
example = literalExpression ''
|
||||
[ "''${pkgs.syslogng_incubator}/lib/syslog-ng" ]
|
||||
'';
|
||||
description = ''
|
||||
A list of paths that should be included in syslog-ng's
|
||||
<literal>--module-path</literal> option. They should usually
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ in
|
|||
default = pkgs.docker;
|
||||
defaultText = literalExpression "pkgs.docker";
|
||||
type = types.package;
|
||||
example = literalExpression "pkgs.docker-edge";
|
||||
description = ''
|
||||
Docker package to be used in the module.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -155,7 +155,6 @@ in
|
|||
default = pkgs.docker;
|
||||
defaultText = literalExpression "pkgs.docker";
|
||||
type = types.package;
|
||||
example = literalExpression "pkgs.docker-edge";
|
||||
description = ''
|
||||
Docker package to be used in the module.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ let
|
|||
# Run the tests for each platform. You can run a test by doing
|
||||
# e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,
|
||||
# ‘nix-build tests/login.nix -A result’.
|
||||
# See also nixosTests in pkgs/top-level/all-packages.nix
|
||||
allTestsForSystem = system:
|
||||
import ./tests/all-tests.nix {
|
||||
inherit system;
|
||||
|
|
@ -24,7 +25,19 @@ let
|
|||
callTest = t: {
|
||||
${system} = hydraJob t.test;
|
||||
};
|
||||
} // {
|
||||
# for typechecking of the scripts and evaluation of
|
||||
# the nodes, without running VMs.
|
||||
allDrivers =
|
||||
import ./tests/all-tests.nix {
|
||||
inherit system;
|
||||
pkgs = import ./.. { inherit system; };
|
||||
callTest = t: {
|
||||
${system} = hydraJob t.test.driver;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
allTests =
|
||||
foldAttrs recursiveUpdate {} (map allTestsForSystem supportedSystems);
|
||||
|
||||
|
|
|
|||
|
|
@ -27,21 +27,7 @@ let
|
|||
};
|
||||
evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; };
|
||||
|
||||
allDrivers = getDrivers tests;
|
||||
|
||||
getDrivers = ts:
|
||||
if isDerivation ts
|
||||
then ts.driver or null
|
||||
else if isAttrs ts
|
||||
then recurseIntoAttrs (mapAttrs (k: getDrivers) ts)
|
||||
else null;
|
||||
|
||||
tests = {
|
||||
|
||||
# for typechecking of the scripts and evaluation of
|
||||
# the nodes, without running VMs.
|
||||
inherit allDrivers;
|
||||
|
||||
in {
|
||||
_3proxy = handleTest ./3proxy.nix {};
|
||||
acme = handleTest ./acme.nix {};
|
||||
adguardhome = handleTest ./adguardhome.nix {};
|
||||
|
|
@ -137,7 +123,6 @@ let
|
|||
doas = handleTest ./doas.nix {};
|
||||
docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
|
||||
docker-rootless = handleTestOn ["x86_64-linux"] ./docker-rootless.nix {};
|
||||
docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {};
|
||||
docker-registry = handleTest ./docker-registry.nix {};
|
||||
docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
|
||||
docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};
|
||||
|
|
@ -635,5 +620,4 @@ let
|
|||
zookeeper = handleTest ./zookeeper.nix {};
|
||||
zrepl = handleTest ./zrepl.nix {};
|
||||
zsh-history = handleTest ./zsh-history.nix {};
|
||||
};
|
||||
in tests
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
# This test runs docker and checks if simple container starts
|
||||
|
||||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "docker";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ nequissimus offline ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
docker =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.package = pkgs.docker-edge;
|
||||
|
||||
users.users = {
|
||||
noprivs = {
|
||||
isNormalUser = true;
|
||||
description = "Can't access the docker daemon";
|
||||
password = "foobar";
|
||||
};
|
||||
|
||||
hasprivs = {
|
||||
isNormalUser = true;
|
||||
description = "Can access the docker daemon";
|
||||
password = "foobar";
|
||||
extraGroups = [ "docker" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
docker.wait_for_unit("sockets.target")
|
||||
docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
|
||||
docker.succeed(
|
||||
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
)
|
||||
docker.succeed("docker ps | grep sleeping")
|
||||
docker.succeed("sudo -u hasprivs docker ps")
|
||||
docker.fail("sudo -u noprivs docker ps")
|
||||
docker.succeed("docker stop sleeping")
|
||||
|
||||
# Must match version 4 times to ensure client and server git commits and versions are correct
|
||||
docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "4" ]')
|
||||
'';
|
||||
})
|
||||
|
|
@ -54,7 +54,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
|
|||
|
||||
|
||||
@contextmanager
|
||||
def audio_recording(machine: Machine) -> None:
|
||||
def record_audio(machine: Machine):
|
||||
"""
|
||||
Perform actions while recording the
|
||||
machine audio output.
|
||||
|
|
@ -64,7 +64,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
|
|||
machine.systemctl("stop audio-recorder")
|
||||
|
||||
|
||||
def wait_for_sound(machine: Machine) -> None:
|
||||
def wait_for_sound(machine: Machine):
|
||||
"""
|
||||
Wait until any sound has been emitted.
|
||||
"""
|
||||
|
|
@ -94,7 +94,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
|
|||
machine.sleep(40)
|
||||
|
||||
with subtest("Check whether Firefox can play sound"):
|
||||
with audio_recording(machine):
|
||||
with record_audio(machine):
|
||||
machine.succeed(
|
||||
"firefox file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ with lib;
|
|||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("radarr.service")
|
||||
machine.wait_for_open_port("7878")
|
||||
machine.wait_for_open_port(7878)
|
||||
machine.succeed("curl --fail http://localhost:7878/")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "vikunja";
|
||||
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ em0lar ];
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; [ leona ];
|
||||
|
||||
nodes = {
|
||||
vikunjaSqlite = { ... }: {
|
||||
|
|
|
|||
|
|
@ -19,20 +19,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amberol";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-KV3nYJbLaQxpMpC7aCzfpNMe9bYpZKrdoOtYA++eC74=";
|
||||
hash = "sha256-cBHFyPqhgcFOeYqMhF1aX3XCGAtqEZpI7Mj7b78Etmo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-UjHL/5iVht2jPnOiYjoIKWJdvwQQkNuKfF8rpi48j3c=";
|
||||
hash = "sha256-GaMJsIrTbhI1tmahEMlI1v5hmjw+tFEv9Wdne/kiYIA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/ebassi/amberol";
|
||||
homepage = "https://gitlab.gnome.org/World/amberol";
|
||||
description = "A small and simple sound and music player";
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 libsndfile portaudio ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint';
|
||||
# src/net/../../src/gnauralnet.h:233: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
substitute \
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001
|
||||
From: Sam Parkinson <sam@sam.today>
|
||||
Date: Thu, 26 Oct 2017 14:50:13 +1100
|
||||
Subject: [PATCH] Remove post-install script that hardcodes paths
|
||||
|
||||
---
|
||||
meson.build | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 25f3e1a..18b43bd 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -21,4 +21,5 @@ subdir('src')
|
||||
# subdir('tests')
|
||||
# TODO: unit tests
|
||||
|
||||
-meson.add_install_script('meson_post_install.sh')
|
||||
+# This does not work for nixos; it hard-codes paths
|
||||
+# meson.add_install_script('meson_post_install.sh')
|
||||
--
|
||||
2.14.2
|
||||
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config
|
||||
, python3
|
||||
, gsettings-desktop-schemas
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gtk3
|
||||
, intltool
|
||||
, libsoup
|
||||
, json-glib
|
||||
, wrapGAppsHook
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
, sqlite
|
||||
, gst_all_1
|
||||
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
|
||||
}:
|
||||
let
|
||||
version = "7.3";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "gradio";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haecker-felix";
|
||||
repo = "gradio";
|
||||
rev = "v${version}";
|
||||
sha256 = "00982dynl36lpsrx3mkd2a479zsrc8jvwfb8i7pi6w7fzzd8n8bl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
|
||||
python3
|
||||
];
|
||||
buildInputs = [
|
||||
sqlite
|
||||
|
||||
glib
|
||||
intltool
|
||||
libsoup
|
||||
json-glib
|
||||
|
||||
gtk3
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
|
||||
wrapGAppsHook
|
||||
desktop-file-utils
|
||||
gsettings-desktop-schemas
|
||||
] ++ gst_plugins;
|
||||
|
||||
postInstall = ''
|
||||
glib-compile-schemas "$out"/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/haecker-felix/gradio";
|
||||
description = "A GTK3 app for finding and listening to internet radio stations";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.samdroid-apps ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
, python3Packages
|
||||
, ffmpeg
|
||||
, flac
|
||||
, libjxl
|
||||
, librsvg
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
|
|
@ -14,6 +15,7 @@
|
|||
, mpg123
|
||||
, libopenmpt
|
||||
, opusfile
|
||||
, wavpack
|
||||
, pango
|
||||
, pulseaudio
|
||||
, withDiscordRPC ? false
|
||||
|
|
@ -21,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tauon";
|
||||
version = "7.1.3";
|
||||
version = "7.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UadE8qsQxRjE+POHLAUY1tRUInNXsMEqTAP02zSDSZ4=";
|
||||
sha256 = "sha256-wEGdqMKLhKjnxNTgqNQpUpYkMk/FuRAKsWX+P/9nUG4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -70,6 +72,7 @@ stdenv.mkDerivation rec {
|
|||
opusfile
|
||||
pango
|
||||
pulseaudio
|
||||
wavpack
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
|
|
@ -77,12 +80,15 @@ stdenv.mkDerivation rec {
|
|||
gst-python
|
||||
dbus-python
|
||||
isounidecode
|
||||
libjxl
|
||||
musicbrainzngs
|
||||
mutagen
|
||||
natsort
|
||||
pillow
|
||||
plexapi
|
||||
pulsectl
|
||||
pycairo
|
||||
PyChromecast
|
||||
pylast
|
||||
pygobject3
|
||||
pylyrics
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, vala
|
||||
, gettext
|
||||
, itstool
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gtk4
|
||||
, coreutils
|
||||
|
|
@ -21,14 +22,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deja-dup";
|
||||
version = "43.2";
|
||||
version = "43.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-iFrPx/m/nTdm7xVVd1SZh5QNpSqI+TCbMfx0/jLgc1c=";
|
||||
sha256 = "sha256-HOIBAzR+7OZ1RO+MSpCQKShcikdtWCjdMUO2rE2TxiM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
|
|||
vala
|
||||
gettext
|
||||
itstool
|
||||
desktop-file-utils
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oywxGg+Ss7qBITI2PBXQs5ph7PZbJ3c1smtT/TcVoLI=";
|
||||
sha256 = "sha256-FIa6eAE6yyJR5UdlCXB2Gx3DqN528POxb0eYOCpVjJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ gtk2 alsa-lib SDL ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: bsdsocket.o:(.bss+0x0): multiple definition of
|
||||
# `socketbases'; main.o:(.bss+0x2792c0): first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
LDFLAGS = [ "-lm" ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "18.1.3";
|
||||
version = "19.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "0abb33e790071368d1f549e5f41e8692cd565bdae8fabee23e660ace2020a743";
|
||||
sha256 = "aabf2addc3182996c76a01df16024b77ae16a489e52cedf87bcfb14891f72118";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
|
||||
, gnome
|
||||
|
||||
# Test requirements
|
||||
, dbus, xvfb-run, xdotool
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "vimiv";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "karlch";
|
||||
repo = "vimiv";
|
||||
rev = "v${version}";
|
||||
sha256 = "18dn81n8hcrqhrqfida34qz7a0ar9rz2rrmzsvyp54zc6nyvv1cn";
|
||||
};
|
||||
|
||||
testimages = fetchFromGitHub {
|
||||
owner = "karlch";
|
||||
repo = "vimiv";
|
||||
rev = "6f4d1372b27f2065c56eafdb521d230d9bb8f4e2";
|
||||
sha256 = "0a3aybzpms0381dz9japhm4c7j5klhmw91prcac6zaww6x34nmxb";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts/install_icons.sh
|
||||
sed -i -e 's,/usr,,g' -e '/setup\.py/d' Makefile scripts/install_icons.sh
|
||||
|
||||
sed -i \
|
||||
-e 's,/etc/vimiv/\(vimivrc\|keys\.conf\),'"$out"'&,g' \
|
||||
man/* vimiv/parser.py
|
||||
|
||||
sed -i \
|
||||
-e 's!"mogrify"!"${imagemagick}/bin/mogrify"!g' \
|
||||
-e '/cmd *=/s!"jhead"!"${jhead}/bin/jhead"!g' \
|
||||
vimiv/imageactions.py
|
||||
'';
|
||||
|
||||
checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ];
|
||||
buildInputs = [ gnome.adwaita-icon-theme librsvg ];
|
||||
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix GI_TYPELIB_PATH : \"$GI_TYPELIB_PATH\""
|
||||
"--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$out/share\""
|
||||
"--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
|
||||
];
|
||||
|
||||
postCheck = ''
|
||||
# Some tests assume that the directory only contains one vimiv directory
|
||||
rm -rf vimiv.egg-info vimiv.desktop
|
||||
|
||||
# Re-use the wrapper args from the main program
|
||||
makeWrapper "$SHELL" run-tests $makeWrapperArgs
|
||||
|
||||
cp -Rd --no-preserve=mode "$testimages/testimages" vimiv/testimages
|
||||
HOME="$(mktemp -d)" PATH="$out/bin:$PATH" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
./run-tests -c 'python tests/main_test.py && nosetests -vx'
|
||||
'';
|
||||
|
||||
postInstall = "make DESTDIR=\"$out\" install";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/karlch/vimiv";
|
||||
description = "An image viewer with Vim-like keybindings";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -41,7 +41,7 @@ buildDotnetModule rec {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = ./updater.sh;
|
||||
updateScript = ./update.sh;
|
||||
ui = callPackage ./web-ui { };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts nuget-to-nix
|
||||
set -exo pipefail
|
||||
set -euox pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
deps_file="$(realpath ./deps)"
|
||||
|
|
@ -15,15 +15,21 @@ if [[ "$new_version" == "$old_version" ]]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
asf_path=$(pwd)
|
||||
cd ../../../..
|
||||
|
||||
nixpkgs_path=$(pwd)
|
||||
if [[ "$1" != "--deps-only" ]]; then
|
||||
if [[ "${1:-}" != "--deps-only" ]]; then
|
||||
update-source-version ArchiSteamFarm "$new_version"
|
||||
fi
|
||||
store_src="$(nix-build -A ArchiSteamFarm.src --no-out-link)"
|
||||
platforms="$(nix-instantiate --strict --eval --json -A ArchiSteamFarm.meta.platforms | jq -r .[])"
|
||||
src="$(mktemp -d /tmp/ArchiSteamFarm-src.XXX)"
|
||||
|
||||
trap '
|
||||
rm -r "$src"
|
||||
' EXIT
|
||||
|
||||
cp -rT "$store_src" "$src"
|
||||
chmod -R +w "$src"
|
||||
|
||||
|
|
@ -36,15 +42,12 @@ for i in $platforms; do
|
|||
nix-shell -I nixpkgs="$nixpkgs_path" -p dotnet-sdk_6 --argstr system $i --run "
|
||||
mkdir ./nuget_pkgs-$i
|
||||
for project in ArchiSteamFarm/ArchiSteamFarm.csproj ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj; do
|
||||
dotnet restore $project --packages ./nuget_pkgs-$i
|
||||
dotnet restore \$project --packages ./nuget_pkgs-$i
|
||||
done;
|
||||
|
||||
nuget-to-nix ./nuget_pkgs-$i > $deps_file-$i.nix" \
|
||||
|| echo "Did you set up binformat for $i?";
|
||||
|
||||
done;
|
||||
|
||||
trap '
|
||||
popd
|
||||
rm -r "$src"
|
||||
' EXIT
|
||||
cd "$asf_path"
|
||||
./web-ui/update.sh
|
||||
|
|
@ -1,17 +1,19 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nodePackages.node2nix gnused jq curl
|
||||
#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl
|
||||
set -eoux pipefail
|
||||
|
||||
pushd ../../../..
|
||||
version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r)
|
||||
ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=${version} | jq -r .sha)
|
||||
popd
|
||||
pushd "$(dirname "$0")"
|
||||
ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha)
|
||||
|
||||
pushd $(dirname "$0")
|
||||
|
||||
curl https://raw.githubusercontent.com/JustArchiNET/ASF-ui/${ui}/package-lock.json -o package-lock.json
|
||||
curl https://raw.githubusercontent.com/JustArchiNET/ASF-ui/${ui}/package.json -o package.json
|
||||
curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json
|
||||
curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package.json" -o package.json
|
||||
|
||||
# update-source-version doesn't work for some reason
|
||||
sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix
|
||||
sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz)\";/" default.nix
|
||||
sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix
|
||||
|
||||
node2nix \
|
||||
--nodejs-14 \
|
||||
|
|
|
|||
|
|
@ -3,42 +3,38 @@
|
|||
, fetchFromGitHub
|
||||
, qtbase
|
||||
, qmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cubiomes-viewer";
|
||||
version = "2.1.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cubitect";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cIA6W82XEeW0k9WNygZ/KVFZE31QThpkV4OazVEvmtw=";
|
||||
sha256 = "sha256-jwYmgA2JtWpEbuuFPwGdKKaSZ2uAs3t7CCCeu6eD9nI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cubiomes-viewer.pro \
|
||||
--replace '$$[QT_INSTALL_BINS]/lupdate' lupdate \
|
||||
--replace '$$[QT_INSTALL_BINS]/lrelease' lrelease
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = "Cubiomes Viewer";
|
||||
exec = pname;
|
||||
icon = pname;
|
||||
categories = [ "Game" ];
|
||||
comment = meta.description;
|
||||
}) ];
|
||||
|
||||
preBuild = ''
|
||||
# QMAKE_PRE_LINK is not executed (I dont know why)
|
||||
make -C ./cubiomes libcubiomes CFLAGS="-DSTRUCT_CONFIG_OVERRIDE=1" all
|
||||
|
|
@ -50,8 +46,9 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
cp cubiomes-viewer $out/bin
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp rc/icons/map.png $out/share/pixmaps/cubiomes-viewer.png
|
||||
mkdir -p $out/share/{pixmaps,applications}
|
||||
cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png
|
||||
cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "metadata-cleaner";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "rmnvgr";
|
||||
repo = "metadata-cleaner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V3qcQQwc2ykVTVgUJuNnVQ9iSPD0tv4C2hSILLxuE70=";
|
||||
hash = "sha256-ykJd1ZjAqT8OtJsZiSjbDdkN5fFlQcWtTO88x3zAfU8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Python GTK application to view and clean metadata in files, using mat2";
|
||||
homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
|
||||
changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/${src.rev}/CHANGELOG.md";
|
||||
license = with licenses; [ gpl3Plus cc-by-sa-40 ];
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
QT += core network widgets
|
||||
|
||||
DEFINES += APP_ENVIRONMENT=\\\"production\\\"
|
||||
DEFINES += APP_VERSION=\\\"@version@\\\"
|
||||
|
||||
TARGET = toggldesktop
|
||||
TEMPLATE = app
|
||||
|
||||
SOURCES += *.cpp
|
||||
HEADERS += *.h
|
||||
FORMS += *.ui
|
||||
RESOURCES += *.qrc
|
||||
|
||||
target.path = $$PREFIX
|
||||
|
||||
INSTALLS += target
|
||||
|
||||
CONFIG += link_pkgconfig
|
||||
PKGCONFIG += bugsnag-qt qxtglobalshortcut qt-oauth-lib toggl x11 xscrnsaver
|
||||
|
|
@ -1,157 +0,0 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config
|
||||
, cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco
|
||||
, qtbase, qtwebengine, qtx11extras, sqlite }:
|
||||
|
||||
let
|
||||
name = "toggldesktop-${version}";
|
||||
version = "7.4.231";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "toggl";
|
||||
repo = "toggldesktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YaeeUlwz42i1ik5nUKSIy0IBrvu1moi95dBK2lKfGAY=";
|
||||
};
|
||||
|
||||
bugsnag-qt = mkDerivation rec {
|
||||
pname = "bugsnag-qt";
|
||||
version = "20180522.005732";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alpakido";
|
||||
repo = "bugsnag-qt";
|
||||
rev = version;
|
||||
sha256 = "sha256-2L7pxdQOniwrp1Kgq3Q8BFbjb2yGtGoKUiQC+B6tRgs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase ];
|
||||
};
|
||||
|
||||
qxtglobalshortcut = mkDerivation rec {
|
||||
pname = "qxtglobalshortcut";
|
||||
version = "f584471dada2099ba06c574bdfdd8b078c2e3550";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "qxtglobalshortcut";
|
||||
rev = version;
|
||||
sha256 = "sha256-gb94rqK8j1mbD4YSXdOaxCdczZJFC6MU+iBsdf07wcc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qtbase qtx11extras ];
|
||||
};
|
||||
|
||||
qt-oauth-lib = mkDerivation rec {
|
||||
pname = "qt-oauth-lib";
|
||||
version = "20190125.190943";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alpakido";
|
||||
repo = "qt-oauth-lib";
|
||||
rev = version;
|
||||
sha256 = "sha256-MjtNAN4F9JJFxM8MYpCv8tPe26RHtbXdq+lY49p+rn4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase qtwebengine ];
|
||||
};
|
||||
|
||||
poco-pc = writeText "poco.pc" ''
|
||||
Name: Poco
|
||||
Description: ${poco.meta.description}
|
||||
Version: ${poco.version}
|
||||
Libs: -L${poco}/lib -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation
|
||||
Cflags: -I${poco}/include/Poco
|
||||
'';
|
||||
|
||||
poco-pc-wrapped = runCommand "poco-pc-wrapped" {} ''
|
||||
mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc
|
||||
'';
|
||||
|
||||
libtoggl = mkDerivation {
|
||||
name = "libtoggl-${version}";
|
||||
inherit src version;
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ];
|
||||
|
||||
postPatch = ''
|
||||
cat ${./libtoggl.pro} > libtoggl.pro
|
||||
rm get_focused_window_{mac,windows}.cc
|
||||
'';
|
||||
};
|
||||
|
||||
toggldesktop = mkDerivation {
|
||||
name = "${name}-unwrapped";
|
||||
inherit src version;
|
||||
|
||||
sourceRoot = "source/src/ui/linux/TogglDesktop";
|
||||
|
||||
postPatch = ''
|
||||
substituteAll ${./TogglDesktop.pro} TogglDesktop.pro
|
||||
substituteInPlace toggl.cpp \
|
||||
--replace ./../../../toggl_api.h toggl_api.h
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
bugsnag-qt
|
||||
libtoggl
|
||||
qxtglobalshortcut
|
||||
qtbase
|
||||
qtwebengine
|
||||
qt-oauth-lib
|
||||
qtx11extras
|
||||
libX11
|
||||
libXScrnSaver
|
||||
];
|
||||
};
|
||||
|
||||
toggldesktop-icons = mkDerivation {
|
||||
name = "${name}-icons";
|
||||
inherit (toggldesktop) src sourceRoot;
|
||||
|
||||
installPhase = ''
|
||||
for f in icons/*; do
|
||||
mkdir -p $out/share/icons/hicolor/$(basename $f)/apps
|
||||
mv $f/toggldesktop.png $_
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
toggldesktop-wrapped = runCommand "toggldesktop-wrapped" {} ''
|
||||
mkdir -p $out/bin && ln -s ${toggldesktop}/toggldesktop $_
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem rec {
|
||||
categories = [ "Utility" ];
|
||||
desktopName = "Toggl";
|
||||
genericName = desktopName;
|
||||
name = "toggldesktop";
|
||||
exec = "${toggldesktop-wrapped}/bin/toggldesktop";
|
||||
icon = "toggldesktop";
|
||||
};
|
||||
in
|
||||
|
||||
buildEnv {
|
||||
inherit name;
|
||||
paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # libtoggl is broken
|
||||
description = "Client for Toggl time tracking service";
|
||||
homepage = "https://github.com/toggl/toggldesktop";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ yana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
TARGET = toggl
|
||||
TEMPLATE = lib
|
||||
|
||||
SOURCES += *.cc
|
||||
HEADERS += *.h
|
||||
|
||||
headers.files = $$HEADERS
|
||||
headers.path = $$PREFIX/include
|
||||
target.path = $$PREFIX/lib
|
||||
|
||||
INSTALLS += headers target
|
||||
|
||||
CONFIG += create_prl create_pc link_pkgconfig
|
||||
PKGCONFIG += jsoncpp openssl lua poco sqlite3 x11
|
||||
|
||||
QMAKE_PKGCONFIG_NAME = $$TARGET
|
||||
QMAKE_PKGCONFIG_PREFIX = $$PREFIX
|
||||
QMAKE_PKGCONFIG_LIBDIR = $$target.path
|
||||
QMAKE_PKGCONFIG_INCDIR = $$headers.path
|
||||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, vala
|
||||
, vala_0_54
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -44,6 +44,12 @@ stdenv.mkDerivation rec {
|
|||
url = "https://git.alpinelinux.org/aports/plain/community/tootle/0002-Use-reason_phrase-instead-of-get_phrase.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5";
|
||||
sha256 = "sha256-rm5NFLeAL2ilXpioywgCR9ppoq+MD0MLyVaBmdzVkqU=";
|
||||
})
|
||||
# Application: make app_entries private
|
||||
# https://github.com/bleakgrey/tootle/pull/346
|
||||
(fetchpatch {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/tootle/0003-make-app-entries-private.patch?id=c973e68e3cba855f1601ef010afa9a14578b9499";
|
||||
sha256 = "sha256-zwU0nxf/haBZl4tOYDmMzwug+HC6lLDT8/12Wt62+S4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -51,7 +57,11 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
# Does not build with Vala 0.56.1:
|
||||
# ../src/Widgets/Status.vala:8.43-8.56: error: construct
|
||||
# properties not supported for specified property type
|
||||
# public API.NotificationType? kind { get; construct set; }
|
||||
vala_0_54
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
|
|
@ -68,11 +78,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/bleakgrey/tootle/pull/346
|
||||
substituteInPlace src/Application.vala \
|
||||
--replace "public const GLib.ActionEntry[] app_entries" "private const GLib.ActionEntry[] app_entries"
|
||||
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -32,15 +32,15 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "104.0.5083.0",
|
||||
"sha256": "02viibc6n77lrlr1vfdyjknzcknnpvp58s4y1g6cbwy4pvajisd9",
|
||||
"sha256bin64": "0g2kzabbg5g3kb0a6scjxslywrkrgpynws7i4lbw0j2gay40zqar",
|
||||
"version": "104.0.5098.0",
|
||||
"sha256": "1h5szy6jp2n55m0fs2czdlldgkgyrqsnkfhhpwxzl8fyanlpw1hj",
|
||||
"sha256bin64": "1w97mkdz3ab9wxw7fj5fpm8cjazdpb0s715c85hd3h0wrvwm1g8p",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-05-17",
|
||||
"version": "2022-05-31",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "c547ca1497e3ff0dcbc0b2cb036b3d40380cbeeb",
|
||||
"sha256": "0wk721sqz5s7bnrk1ar7c07ykxpdvwq01qi4na84m4b76nyzakwy"
|
||||
"rev": "37baefb026b199605affa7bcb24810d1724ce373",
|
||||
"sha256": "166ciclcp77vn7k4k8nvb7xn1clddbrk35am4hqiayfya57yal3c"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -37,15 +37,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [ ./fixup-addonmanager-lib-path.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# go env breaks the sandbox
|
||||
substituteInPlace "hack/lib/golang.sh" \
|
||||
--replace 'echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"' 'echo "${go.GOOS}/${go.GOARCH}"'
|
||||
|
||||
substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
|
||||
# hack/update-munge-docs.sh only performs some tests on the documentation.
|
||||
# They broke building k8s; disabled for now.
|
||||
echo "true" > "hack/update-munge-docs.sh"
|
||||
|
||||
patchShebangs ./hack
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
"owner": "vancluever",
|
||||
"provider-source-address": "registry.terraform.io/vancluever/acme",
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.8.0",
|
||||
"sha256": "06wjvjsh8qgncrbdhziqjd4pgp550q21p0xm4igdx80gd7541hr1",
|
||||
"vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc",
|
||||
"version": "2.8.0"
|
||||
"rev": "v2.9.0",
|
||||
"sha256": "sha256-ptWoKXuV6jcDu2v1oOcW11VjXOgf/jUG1kpFGcNLHtw=",
|
||||
"vendorSha256": "sha256-sU8g+mjn14H9f3LwomcNJ7ho8LpYjCEevv4++6KPzow=",
|
||||
"version": "2.9.0"
|
||||
},
|
||||
"age": {
|
||||
"owner": "clementblaise",
|
||||
|
|
@ -39,20 +39,20 @@
|
|||
"owner": "akamai",
|
||||
"provider-source-address": "registry.terraform.io/akamai/akamai",
|
||||
"repo": "terraform-provider-akamai",
|
||||
"rev": "v2.0.0",
|
||||
"sha256": "sha256-LcqP4gO1dhNaLkpaZIRxmC8B7DUTLC1fPZutohBqKSQ=",
|
||||
"vendorSha256": "sha256-Vu5vyCEkZNf8TXryDalI5RKM/hjWeEkXbnYLhGwc2y8=",
|
||||
"version": "2.0.0"
|
||||
"rev": "v2.1.0",
|
||||
"sha256": "sha256-BxdoHSylItn8AmZJf+mUJ7joSTyFumdnSBtLKXWZbBw=",
|
||||
"vendorSha256": "sha256-0euOl3ttt1dDURIti0UsXKqfZiSVYE2nxkFlQ3gLlsM=",
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"alicloud": {
|
||||
"deleteVendor": true,
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.169.0",
|
||||
"sha256": "sha256-rtQN1l6OMEN/fudg67BFmk/OpwMVxxDM36zks3WvyUM=",
|
||||
"vendorSha256": "sha256-bSJDPNkO8MQT1/coyHSCWNQ8zudrX+2KNwsASGeKh8s=",
|
||||
"version": "1.169.0"
|
||||
"rev": "v1.170.0",
|
||||
"sha256": "sha256-qONJK3/Vr+v6sVphyDLBJDdbeuLUxdZSImvntvQ4Fbc=",
|
||||
"vendorSha256": "sha256-RbhpyldFMQYb/bsGtnFLHxHGgIcPPSTJlEzuQySfxEA=",
|
||||
"version": "1.170.0"
|
||||
},
|
||||
"ansible": {
|
||||
"owner": "nbering",
|
||||
|
|
@ -76,10 +76,10 @@
|
|||
"owner": "auth0",
|
||||
"provider-source-address": "registry.terraform.io/auth0/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.30.2",
|
||||
"sha256": "sha256-6+81QomUnKEbaqGHSRabLSb7O6lrrG+Fp9N8y8ZtS8A=",
|
||||
"vendorSha256": "sha256-4o+/iB853zXcEYgPKVZ8CVHdIOEZW+/OX+LDBHSNjUk=",
|
||||
"version": "0.30.2"
|
||||
"rev": "v0.30.3",
|
||||
"sha256": "sha256-mtf5gsY7ZVkok6zUTRFgdlRRUnTSeej36aAABfo7NyA=",
|
||||
"vendorSha256": "sha256-ZN7P9PD8MqThtc6x/Lm4Yeb7ciPVWpFP4zDo0gQHYTo=",
|
||||
"version": "0.30.3"
|
||||
},
|
||||
"avi": {
|
||||
"owner": "vmware",
|
||||
|
|
@ -103,10 +103,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.16.0",
|
||||
"sha256": "sha256-PHm2MR1JDH3RnMqX3FjbjVFNTPD8CX2K7eemJ9ZMiJU=",
|
||||
"vendorSha256": "sha256-UBOvQexfbSUh/9XKCvOYoMVH+QYLiwcdlZ8mcjy2AKU=",
|
||||
"version": "4.16.0"
|
||||
"rev": "v4.17.1",
|
||||
"sha256": "sha256-2AabKctIYtb20K5APY54syI7BhaE8WSBRg3BAvtBV+w=",
|
||||
"vendorSha256": "sha256-qfVUJ3NqDRzISk2UTVPD9Xe/GIZASzSqP5P1sJJHvOo=",
|
||||
"version": "4.17.1"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -121,10 +121,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.8.0",
|
||||
"sha256": "sha256-PqupNzZlcgqld25dFN0GHNM7YJ8zSuZ04cz40dUMv/0=",
|
||||
"rev": "v3.9.0",
|
||||
"sha256": "sha256-bhBq3fZ3xTvfyvfzpveDqNkbwP4lc78TfR1JOa8HYrc=",
|
||||
"vendorSha256": null,
|
||||
"version": "3.8.0"
|
||||
"version": "3.9.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -149,10 +149,10 @@
|
|||
"owner": "baidubce",
|
||||
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.12.5",
|
||||
"sha256": "sha256-SR2LYwxeGR9UJLj8+13+UtgXynLquttDGvIIQqxvbcY=",
|
||||
"rev": "v1.12.6",
|
||||
"sha256": "sha256-0/CwWrS6tTl2ZzkzYezgyU/Avi+TwJ+nm2GsxgXH/lo=",
|
||||
"vendorSha256": "sha256-pA2dAC8AasWLTlC+SddS4kWT16FqcyBrtdVMV9k/FtE=",
|
||||
"version": "1.12.5"
|
||||
"version": "1.12.6"
|
||||
},
|
||||
"bigip": {
|
||||
"owner": "F5Networks",
|
||||
|
|
@ -231,10 +231,10 @@
|
|||
"owner": "cloudflare",
|
||||
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v3.15.0",
|
||||
"sha256": "sha256-y1UbirPJG9Behsr/VdILoVHIM2z9pF6iyEwXgDKbDaw=",
|
||||
"vendorSha256": "sha256-R8B5fmjRBB2q12tzWbzOzzSOC0mNJNV1JiVjddDa11c=",
|
||||
"version": "3.15.0"
|
||||
"rev": "v3.16.0",
|
||||
"sha256": "sha256-9MLk+M/M3U6hpAoaV6BUUZRSnTd9083nqI5tPATePw0=",
|
||||
"vendorSha256": "sha256-Q9Gcq5xczrREMtFArpRpINZ4/N5pu4GdZwD4gGYTUVE=",
|
||||
"version": "3.16.0"
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"owner": "cloudfoundry-community",
|
||||
|
|
@ -304,10 +304,10 @@
|
|||
"owner": "awakesecurity",
|
||||
"provider-source-address": "registry.terraform.io/awakesecurity/dhall",
|
||||
"repo": "terraform-provider-dhall",
|
||||
"rev": "v0.0.2",
|
||||
"sha256": "1fw83ic5wwhl5yk1asy8p4cxsdwclw639j7ki1xgpi284h6gmh5a",
|
||||
"vendorSha256": "1wqbblqpb1lpbsn4k9yh43g19iw13q825l5i9wvy4w0w4nzz70p4",
|
||||
"version": "0.0.2"
|
||||
"rev": "v0.0.3",
|
||||
"sha256": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
|
||||
"vendorSha256": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=",
|
||||
"version": "0.0.3"
|
||||
},
|
||||
"digitalocean": {
|
||||
"owner": "digitalocean",
|
||||
|
|
@ -367,10 +367,10 @@
|
|||
"owner": "phillbaker",
|
||||
"provider-source-address": "registry.terraform.io/phillbaker/elasticsearch",
|
||||
"repo": "terraform-provider-elasticsearch",
|
||||
"rev": "v2.0.1",
|
||||
"sha256": "sha256-WdGwLQe4jInZiMxJ7BasfwVBsei0V02D6vAA4dLLoAI=",
|
||||
"vendorSha256": "sha256-gBC5+6bGJzfb0yLKlolfrZNuhpPacqX3p1HjIB4i3IU=",
|
||||
"version": "2.0.1"
|
||||
"rev": "v2.0.2",
|
||||
"sha256": "sha256-hbdPapnnkv8nhD63UquS5DwfETkjNKwpkdmo9LgpvM0=",
|
||||
"vendorSha256": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=",
|
||||
"version": "2.0.2"
|
||||
},
|
||||
"exoscale": {
|
||||
"owner": "exoscale",
|
||||
|
|
@ -449,20 +449,20 @@
|
|||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.22.0",
|
||||
"sha256": "sha256-L85rh/UNXBO64VBJUNePMrAgTAKJMghH9LeQgYNhuqg=",
|
||||
"vendorSha256": "sha256-wc+B0PPgq+m/Kxkaappf8jiLhm3ch8yP+KqGzzlmwFI=",
|
||||
"version": "4.22.0"
|
||||
"rev": "v4.23.0",
|
||||
"sha256": "sha256-DXMiLwK3YyTe2R+PayUg5K+n1N/HOkkdoUoBxdKH7Xk=",
|
||||
"vendorSha256": "sha256-rXANGmnJZ9CJzaC3rZSWZJm993AJNUmzbtqPjQX6qUE=",
|
||||
"version": "4.23.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.22.0",
|
||||
"sha256": "sha256-D21cdG3dPNOJjGS+x4Yb2cwsmzrwnkg0ByQGRjuMZcI=",
|
||||
"vendorSha256": "sha256-wc+B0PPgq+m/Kxkaappf8jiLhm3ch8yP+KqGzzlmwFI=",
|
||||
"version": "4.22.0"
|
||||
"rev": "v4.23.0",
|
||||
"sha256": "sha256-oqbjH80gDZNFxKjER988TOw9SisaCRULTL9el6aMP44=",
|
||||
"vendorSha256": "sha256-rXANGmnJZ9CJzaC3rZSWZJm993AJNUmzbtqPjQX6qUE=",
|
||||
"version": "4.23.0"
|
||||
},
|
||||
"googleworkspace": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -540,10 +540,10 @@
|
|||
"owner": "huaweicloud",
|
||||
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.36.0",
|
||||
"sha256": "sha256-bf/w6BxXOL/Fup8NmYi86tGK3HIYGaYWUSAZ0yUazb8=",
|
||||
"rev": "v1.37.0",
|
||||
"sha256": "sha256-QLeqYLyskWzIW1oG7sO1vYLPeTRCX96dJ6FTSk317kU=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.36.0"
|
||||
"version": "1.37.0"
|
||||
},
|
||||
"huaweicloudstack": {
|
||||
"owner": "huaweicloud",
|
||||
|
|
@ -838,10 +838,10 @@
|
|||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.77.0",
|
||||
"sha256": "sha256-FUCqNugAdJtTv7HtPH8ji56423iyWYPnDVGtOgJWatg=",
|
||||
"rev": "v4.78.0",
|
||||
"sha256": "sha256-LIqvRsE2m3j0cgqJyyXVcxlEHpCl8UTYucCbHmG7dTo=",
|
||||
"vendorSha256": null,
|
||||
"version": "4.77.0"
|
||||
"version": "4.78.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
|
|
@ -883,10 +883,10 @@
|
|||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.29.4",
|
||||
"sha256": "sha256-ZsrCmg/7Flef8tU7ZTI+MnorJbafnY63mf1/anxwMaQ=",
|
||||
"rev": "v1.29.5",
|
||||
"sha256": "sha256-/76lJWy5x2XKl0RtBNKH8thHf1vyups4TVWHI/Coxd0=",
|
||||
"vendorSha256": "sha256-jxtkF3VXrsfF/Dpp7mDz+3XYootoxQX3YSp9bX7j6Cg=",
|
||||
"version": "1.29.4"
|
||||
"version": "1.29.5"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
|
|
@ -910,10 +910,10 @@
|
|||
"owner": "PagerDuty",
|
||||
"provider-source-address": "registry.terraform.io/PagerDuty/pagerduty",
|
||||
"repo": "terraform-provider-pagerduty",
|
||||
"rev": "v2.4.2",
|
||||
"sha256": "sha256-xCmfykHQvQ/O+8ZGe2s5Ic4n9aZvlQ34bpnVbJDCn98=",
|
||||
"rev": "v2.5.0",
|
||||
"sha256": "sha256-ylGqFN4y6MgCII+iOpUE0R93DLRu+Gbipk5I7LlB9dQ=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.4.2"
|
||||
"version": "2.5.0"
|
||||
},
|
||||
"panos": {
|
||||
"owner": "PaloAltoNetworks",
|
||||
|
|
@ -978,6 +978,15 @@
|
|||
"vendorSha256": "sha256-MMUit5RxsymBNX9fH8B6D2gJ/k5zaN6FCyP9N/+TV+E=",
|
||||
"version": "3.2.0"
|
||||
},
|
||||
"remote": {
|
||||
"owner": "tenstad",
|
||||
"provider-source-address": "registry.terraform.io/tenstad/remote",
|
||||
"repo": "terraform-provider-remote",
|
||||
"rev": "v0.0.24",
|
||||
"sha256": "sha256-ksOp9okCdJXOQOsJrJ6tD+aLpPIuwkIxuIGtQ+d7e4k=",
|
||||
"vendorSha256": "sha256-AAqilm26uz3Kt/JxwEbi8GULZstIs/6Vc+uShXbsZTs=",
|
||||
"version": "0.0.24"
|
||||
},
|
||||
"rundeck": {
|
||||
"owner": "rundeck",
|
||||
"provider-source-address": "registry.terraform.io/rundeck/rundeck",
|
||||
|
|
@ -1072,10 +1081,10 @@
|
|||
"owner": "spotinst",
|
||||
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.75.0",
|
||||
"sha256": "sha256-4MQVttAyt6o0fFKOLFnMlBS6iN51LdaM5ajEnpDmQXE=",
|
||||
"vendorSha256": "sha256-oTtu/h7Fu+UtjQeOmxnHQr39dUIpsFST8zkejyuN3ig=",
|
||||
"version": "1.75.0"
|
||||
"rev": "v1.76.0",
|
||||
"sha256": "sha256-+/OZw/wpeRHoK5XuwiI2qfbZSheoGd4PRy4TkdtV7yY=",
|
||||
"vendorSha256": "sha256-JaWR7TiU5J7HGWExENqo5lHysCzg4Q6XvpCYfekuAg8=",
|
||||
"version": "1.76.0"
|
||||
},
|
||||
"stackpath": {
|
||||
"owner": "stackpath",
|
||||
|
|
@ -1108,10 +1117,10 @@
|
|||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.72.5",
|
||||
"sha256": "sha256-4ZnhE2Woy+CquDsqJvJMUib48eRJ9OWTrO/14NkI6iM=",
|
||||
"rev": "v1.72.8",
|
||||
"sha256": "sha256-yV2nS8FzhUpCVZR1StHhOb4zqJ8jxc+NRw/bnmDzfX8=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.72.5"
|
||||
"version": "1.72.8"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -1181,10 +1190,10 @@
|
|||
"owner": "cloudposse",
|
||||
"provider-source-address": "registry.terraform.io/cloudposse/utils",
|
||||
"repo": "terraform-provider-utils",
|
||||
"rev": "0.17.24",
|
||||
"sha256": "sha256-/pM6PuvFsmRpBz5pqOy6mVlkbq+9IRlHug/DdoKjt4U=",
|
||||
"vendorSha256": "sha256-4/Djmg6cONkJg1wH7M4Y2mZccbwyUXEvZ2bdBYEnV9w=",
|
||||
"version": "0.17.24"
|
||||
"rev": "0.17.25",
|
||||
"sha256": "sha256-RH0GBE4uYnjva8ehf+kCnxDk7F012SUQ+iWePkwG62I=",
|
||||
"vendorSha256": "sha256-tKbl234qJ/Y3tSFMOV45KtINGIvsV4XwBgVToNunyAc=",
|
||||
"version": "0.17.25"
|
||||
},
|
||||
"vault": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -1253,10 +1262,10 @@
|
|||
"owner": "vultr",
|
||||
"provider-source-address": "registry.terraform.io/vultr/vultr",
|
||||
"repo": "terraform-provider-vultr",
|
||||
"rev": "v2.11.1",
|
||||
"sha256": "sha256-EAkFlmQFPq9pSQ591GkX7um8tcBEGIJuiLuL5d9A8Ag=",
|
||||
"rev": "v2.11.2",
|
||||
"sha256": "sha256-cxNSsxAnCw7rZNljR87dN+vYvnwniN3j6VKeswIOv/g=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.11.1"
|
||||
"version": "2.11.2"
|
||||
},
|
||||
"wavefront": {
|
||||
"owner": "vmware",
|
||||
|
|
@ -1271,9 +1280,9 @@
|
|||
"owner": "yandex-cloud",
|
||||
"provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.74.0",
|
||||
"sha256": "sha256-TeApvGYWBlCzxE7/t6cbb47L1oGUfx2B/cEW8UQieoU=",
|
||||
"vendorSha256": "sha256-n1qcrvBKftKYm7nlTCeAOU/Q40xMpVlyKUKxR7wgPu4=",
|
||||
"version": "0.74.0"
|
||||
"rev": "v0.75.0",
|
||||
"sha256": "sha256-j/OKAj5KrOecdpoyc8x+9D57mWkGYuIlHgGPGJxn+oc=",
|
||||
"vendorSha256": "sha256-E6keFmYkxAMSNWqPF9ghFKX1GjwalVx3RyYpUqdk/xE=",
|
||||
"version": "0.75.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
|
||||
, libuuid, openssl, pcre, sqlite, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-salut";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-${version}.tar.gz";
|
||||
sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
|
||||
};
|
||||
|
||||
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
|
||||
buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
|
||||
sqlite pcre python2 ];
|
||||
|
||||
nativeBuildInputs = [ libxslt pkg-config ];
|
||||
|
||||
configureFlags = [ "--disable-avahi-tests" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Link-local XMPP connection manager for Telepathy";
|
||||
platforms = platforms.gnu ++ platforms.linux; # Random choice
|
||||
maintainers = [ ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
{lib, stdenv, fetchFromGitea, autoconf-archive, autoreconfHook, pkg-config, libstrophe, glib, gpgme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmppc";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "Anoxinon_e.V.";
|
||||
repo = "xmppc";
|
||||
rev = version;
|
||||
sha256 = "07cy3j4g7vycagdiva3dqb59361lw7s5f2yydpczmyih29v7hkm8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf-archive
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libstrophe
|
||||
glib
|
||||
gpgme
|
||||
];
|
||||
|
||||
preAutoreconf = ''
|
||||
mkdir m4
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command Line Interface Tool for XMPP";
|
||||
homepage = "https://codeberg.org/Anoxinon_e.V./xmppc";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.jugendhacker ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
{lib, stdenv, fetchurl, ncurses}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iptraf";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-${version}tar.gz";
|
||||
sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e 's,#include <linux/if_tr.h>,#include <netinet/if_tr.h>,' src/*
|
||||
'';
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp iptraf $out/bin
|
||||
'';
|
||||
|
||||
buildInputs = [ncurses];
|
||||
|
||||
meta = {
|
||||
homepage = "http://iptraf.seul.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
description = "Console-based network statistics utility for Linux";
|
||||
platforms = lib.platforms.linux;
|
||||
broken = true; # required isdn headers have been removed from the linux kernel
|
||||
};
|
||||
}
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
|
||||
, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
|
||||
, gnome, buildPythonApplication, python-dateutil, pyinotify, pygobject3
|
||||
, bcrypt, gobject-introspection, gsettings-desktop-schemas
|
||||
, pango, gdk-pixbuf, atk }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
version = "0.9.4.4";
|
||||
pname = "syncthing-gtk";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nc0wd7qvyri7841c3dd9in5d7367hys0isyw8znv5fj4c0a6v1f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
# For setup hook populating GI_TYPELIB_PATH
|
||||
gobject-introspection
|
||||
pango gdk-pixbuf atk libnotify
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 librsvg libappindicator-gtk3
|
||||
libnotify gnome.adwaita-icon-theme
|
||||
# Schemas with proxy configuration
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil pyinotify pygobject3 bcrypt
|
||||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
killall = "${killall}/bin/killall";
|
||||
syncthing = "${syncthing}/bin/syncthing";
|
||||
})
|
||||
];
|
||||
|
||||
# repo doesn't have any tests
|
||||
doCheck = false;
|
||||
|
||||
setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"
|
||||
substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"
|
||||
substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share"
|
||||
substituteInPlace syncthing_gtk/uisettingsdialog.py --replace "/usr/share" "$out/share"
|
||||
substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share"
|
||||
substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GTK3 & python based GUI for Syncthing";
|
||||
homepage = "https://github.com/syncthing/syncthing-gtk";
|
||||
license = licenses.gpl2;
|
||||
broken = true;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = syncthing.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
{stdenv, fetchurl, lib, gfortran
|
||||
, ncurses
|
||||
, withXaw3d ? false
|
||||
#, withPVMlib ? false
|
||||
, tcl, tk, withTk ? true
|
||||
, gtk2, withGtk ? false # working ?
|
||||
#, withF2c ? false
|
||||
, ocaml, withOCaml ? true
|
||||
#, withJava ? false
|
||||
#, atlasMath, withAtlas ? false
|
||||
, xlibsWrapper, withX ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.1.2";
|
||||
pname = "scilab";
|
||||
src = fetchurl {
|
||||
url = "https://www.scilab.org/download/${version}/${pname}-${version}-src.tar.gz";
|
||||
sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
|
||||
buildInputs = [ ncurses ]
|
||||
++ lib.optionals withGtk [ gtk2 ]
|
||||
++ lib.optionals withOCaml [ ocaml ]
|
||||
++ lib.optional withX xlibsWrapper;
|
||||
|
||||
|
||||
/*
|
||||
--with-atlas-library=DIR Atlas library files are in DIR and we use Atlas
|
||||
*/
|
||||
configureFlags = [
|
||||
# use gcc C compiler and gnu Fortran compiler (g77 or gfortran)
|
||||
"--with-gcc" "--with-g77"
|
||||
# do not compile with PVM library
|
||||
"--without-pvm"
|
||||
# compile with GTK
|
||||
(lib.enableFeature withGtk "gtk")
|
||||
(lib.enableFeature withGtk "gtk2")
|
||||
# compile with ocaml
|
||||
(lib.withFeature withOCaml "ocaml")
|
||||
# do not compile Java interface
|
||||
"--without-java"
|
||||
# use the X Window System
|
||||
(lib.withFeature withX "x")
|
||||
# compile with TCL/TK
|
||||
] ++ lib.optionals withTk [
|
||||
"--with-tk"
|
||||
"--with-tcl-library=${tcl}/lib"
|
||||
"--with-tcl-include=${tcl}/include"
|
||||
"--with-tk-library=${tk}/lib"
|
||||
"--with-tk-include=${tk}/include"
|
||||
] # use Xaw3d widgets given with Scilab
|
||||
++ lib.optional (!withXaw3d) "--with-local-xaw"
|
||||
;
|
||||
|
||||
makeFlags = [ "all" ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.scilab.org/";
|
||||
description = "Scientific software package for numerical computations (Matlab lookalike)";
|
||||
# see http://www.scilab.org/legal
|
||||
license = "SciLab";
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, git }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "conform";
|
||||
version = "0.1.0-alpha.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "conform";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WgWgigpqPoEBY4tLjbzK02WFwrCWPGQWJ5eakLv5IWw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Oigt7tAK4jhBQtfG1wdLHqi11NWu6uJn5fmuqTmR76E=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/talos-systems/conform/internal/version.Tag=v${version}"
|
||||
];
|
||||
|
||||
checkInputs = [ git ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Policy enforcement for your pipelines";
|
||||
homepage = "https://github.com/siderolabs/conform";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ jmgilman jk ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "15.0.1",
|
||||
"repo_hash": "sha256-GMdR8drmnLR5KH/N0iyLmPi2sggeQX7PT2KP3QO5+/Y=",
|
||||
"version": "15.0.2",
|
||||
"repo_hash": "sha256-B5zD8yBY6d+jkIghuxShsR73+2X7Jd9mai1ouraEM44=",
|
||||
"yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.0.1-ee",
|
||||
"rev": "v15.0.2-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.0.1",
|
||||
"GITALY_SERVER_VERSION": "15.0.2",
|
||||
"GITLAB_PAGES_VERSION": "1.58.0",
|
||||
"GITLAB_SHELL_VERSION": "14.3.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.0.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "15.0.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.0.1";
|
||||
version = "15.0.2";
|
||||
package_version = "v14";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
in
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pNVeXB2A8jYUVir6t8jz6ifBksWucZjUn6RIszXdwJY=";
|
||||
sha256 = "sha256-jwPXar16FOq0xCg3xUXH72YPmoVa91ae3bgz95ZmYo4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.0.1";
|
||||
version = "15.0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg,
|
||||
# Darwin
|
||||
libiconv, CoreFoundation, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sit";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sit-fyi";
|
||||
repo = "sit";
|
||||
rev = "v${version}";
|
||||
sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libzip gnupg ]
|
||||
++ (lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]);
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
cargoSha256 = "1ghr01jcq12ddna5qadvjy6zbgqgma5nf0qv06ayxnra37d2l92l";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Serverless Information Tracker";
|
||||
homepage = "https://sit.fyi/";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ dywedir yrashk ];
|
||||
# Upstream has not had a release in several years, and dependencies no
|
||||
# longer compile with the latest Rust compiler.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -53,7 +53,7 @@ let
|
|||
mv $out/bin/arion $out/libexec
|
||||
makeWrapper $out/libexec/arion $out/bin/arion \
|
||||
--unset PYTHONPATH \
|
||||
--prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]} \
|
||||
--prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose_1 ]} \
|
||||
;
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,12 @@ buildGoModule rec {
|
|||
|
||||
doCheck = false;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/libexec/docker/cli-plugins/docker-compose $out/bin/docker-compose
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ rec {
|
|||
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config, glibc
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2
|
||||
, sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose
|
||||
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||
, procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs
|
||||
, nixosTests
|
||||
|
|
@ -136,7 +136,7 @@ rec {
|
|||
});
|
||||
|
||||
plugins = optionals buildxSupport [ docker-buildx ]
|
||||
++ optionals composeSupport [ docker-compose_2 ];
|
||||
++ optionals composeSupport [ docker-compose ];
|
||||
pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; };
|
||||
in
|
||||
buildGoPackage ((optionalAttrs (!clientOnly) {
|
||||
|
|
|
|||
|
|
@ -1,41 +1,79 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext
|
||||
, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp
|
||||
, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoconf
|
||||
, automake
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gettext
|
||||
, libX11
|
||||
, libXau
|
||||
, libXdmcp
|
||||
, libXext
|
||||
, libXft
|
||||
, libXinerama
|
||||
, libXmu
|
||||
, libXpm
|
||||
, libjpeg
|
||||
, libpng
|
||||
, librsvg
|
||||
, pango
|
||||
, pkg-config
|
||||
, which
|
||||
, xorg
|
||||
, xorgproto
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jwm";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joewing";
|
||||
repo = "jwm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM=";
|
||||
sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext which autoreconfHook ];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXext
|
||||
libXinerama
|
||||
libXpm
|
||||
libXft
|
||||
xorg.libXrender
|
||||
libXau
|
||||
libXdmcp
|
||||
libXmu
|
||||
libpng
|
||||
libjpeg
|
||||
expat
|
||||
xorgproto
|
||||
librsvg
|
||||
freetype
|
||||
fontconfig
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
gettext
|
||||
pkg-config
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
fontconfig
|
||||
freetype
|
||||
libX11
|
||||
libXau
|
||||
libXdmcp
|
||||
libXext
|
||||
libXft
|
||||
libXinerama
|
||||
libXmu
|
||||
libXpm
|
||||
libjpeg
|
||||
libpng
|
||||
librsvg
|
||||
pango
|
||||
xorg.libXrender
|
||||
xorgproto
|
||||
];
|
||||
|
||||
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "http://joewing.net/projects/jwm/";
|
||||
description = "Joe's Window Manager is a light-weight X11 window manager";
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
source "$stdenv/setup" || exit 1
|
||||
|
||||
# XXX: Eventually we could consider building the PDF/PS files as well.
|
||||
|
||||
echo "source is \`$src', report name is \`$reportName'"
|
||||
|
||||
mkdir -p "$out/share/info" && \
|
||||
makeinfo -o "$out/share/info/${reportName}.info" "$src"
|
||||
|
||||
# XXX: HTML output is apparently broken.
|
||||
#mkdir -p "$out/share/doc/${reportName}" && \
|
||||
#makeinfo -o "$out/share/doc/${reportName}/html" --html --force "$src"
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{ fetchurl, stdenv, texinfo, revision, sha256 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "r${toString revision}rs";
|
||||
src = fetchurl {
|
||||
url = "http://swiss.csail.mit.edu/ftpdir/scm/${name}.txi";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ texinfo ];
|
||||
|
||||
# Tell the builder about the name of the report.
|
||||
reportName = name;
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
meta = {
|
||||
description = "Revised^${toString revision} Report on the Algorithmic Language Scheme";
|
||||
|
||||
longDescription = ''
|
||||
This package contains the GNU Info version of the
|
||||
the ${toString revision}th revision of the Report on the
|
||||
Algorithmic Language Scheme.
|
||||
'';
|
||||
|
||||
homepage = "http://swiss.csail.mit.edu/~jaffer/Scheme";
|
||||
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{ fetchurl, stdenv, texinfo }:
|
||||
|
||||
import ./common.nix {
|
||||
inherit fetchurl stdenv texinfo;
|
||||
revision = 4;
|
||||
sha256 = "02jgy0lvi5ymkdxwjasg50zl03zmyj8sgnfxxnjnbmif72c0k4p8";
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{ fetchurl, stdenv, texinfo }:
|
||||
|
||||
import ./common.nix {
|
||||
inherit fetchurl stdenv texinfo;
|
||||
revision = 5;
|
||||
sha256 = "1s2wcslwcgb9j89vjn7qs63qlnsv1481jaw1sgg33fgbgk6a8wrk";
|
||||
}
|
||||
|
|
@ -234,9 +234,6 @@ in {
|
|||
# TODO(@Artturin): Add this to the main cpython expr
|
||||
strictDeps = true;
|
||||
pname = "python3-minimal";
|
||||
meta = old.meta // {
|
||||
maintainers = [];
|
||||
};
|
||||
});
|
||||
|
||||
pypy27 = callPackage ./pypy {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ tcl.mkTclDerivation rec {
|
|||
description = "High-level widget set for Tcl/Tk";
|
||||
maintainers = with lib.maintainers; [ agbrooks ];
|
||||
license = lib.licenses.tcltk;
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "igraph";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-t0GC6FVFcbVbmZ74XNSPCRRUsSr1Z8rRw6Rf++qk4I0=";
|
||||
hash = "sha256-Zb9F4kFUNA/MtoYYEKGJ5JyKxtG0DHSdGaUpDLKmAAc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libadwaita";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = "libadwaita";
|
||||
rev = version;
|
||||
hash = "sha256-iCMCQyhCUhp1f20+Qost9nnmfIUFE0iLKMKT/PfwOd4=";
|
||||
hash = "sha256-OyjuUWfKE8GoGFCmaCS7YAf5GAS0VwMPht7cvFtkA/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-AkHsZpYM4EY8SNuF6LhxF2peOjp69ICGc3kOLkDms64=";
|
||||
};
|
||||
|
||||
patches = [ ./nix-2.9.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ nix boost ];
|
||||
|
|
|
|||
35
pkgs/development/libraries/nix-plugins/nix-2.9.patch
Normal file
35
pkgs/development/libraries/nix-plugins/nix-2.9.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
diff --git a/extra-builtins.cc b/extra-builtins.cc
|
||||
index 617807a..c417cb3 100644
|
||||
--- a/extra-builtins.cc
|
||||
+++ b/extra-builtins.cc
|
||||
@@ -27,7 +27,7 @@ static ExtraBuiltinsSettings extraBuiltinsSettings;
|
||||
|
||||
static GlobalConfig::Register rp(&extraBuiltinsSettings);
|
||||
|
||||
-static void extraBuiltins(EvalState & state, const Pos & pos,
|
||||
+static void extraBuiltins(EvalState & state, const PosIdx pos,
|
||||
Value ** _args, Value & v)
|
||||
{
|
||||
static auto extraBuiltinsFile = absPath(extraBuiltinsSettings.extraBuiltinsFile);
|
||||
@@ -44,10 +44,10 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
|
||||
auto attrs = state.buildBindings(2);
|
||||
|
||||
auto sExec = state.symbols.create("exec");
|
||||
- attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = sExec });
|
||||
+ attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = "exec" });
|
||||
|
||||
auto sImportNative = state.symbols.create("importNative");
|
||||
- attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = sImportNative });
|
||||
+ attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = "importNative" });
|
||||
|
||||
arg = state.allocValue();
|
||||
arg->mkAttrs(attrs);
|
||||
@@ -64,7 +64,7 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
|
||||
static RegisterPrimOp rp1("__extraBuiltins", 0,
|
||||
extraBuiltins);
|
||||
|
||||
-static void cflags(EvalState & state, const Pos & _pos,
|
||||
+static void cflags(EvalState & state, const PosIdx _pos,
|
||||
Value ** _args, Value & v)
|
||||
{
|
||||
auto attrs = state.buildBindings(3);
|
||||
|
|
@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ alsa-lib ncurses ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: libestools.a(editline.o):(.bss+0x28): multiple definition of
|
||||
# `editline_history_file'; libestools.a(siodeditline.o):(.data.rel.local+0x8): first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
preConfigure = ''
|
||||
sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . )
|
||||
sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . )
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "STLport";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/stlport/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm";
|
||||
};
|
||||
|
||||
# fix hardcoded /usr/bin; not recognizing the standard --disable-static flag
|
||||
configurePhase = ''
|
||||
echo Preconf: build/Makefiles/gmake/*/sys.mak
|
||||
for f in build/Makefiles/gmake/*/sys.mak; do
|
||||
substituteInPlace "$f" --replace /usr/bin/ ""
|
||||
done
|
||||
./configure --prefix=$out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An implementation of the C++ Standard Library";
|
||||
homepage = "https://sourceforge.net/projects/stlport/";
|
||||
license = lib.licenses.free; # seems BSD-like
|
||||
broken = true; # probably glibc-2.20 -related issue
|
||||
};
|
||||
}
|
||||
23
pkgs/development/ocaml-modules/ao/default.nix
Normal file
23
pkgs/development/ocaml-modules/ao/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libao }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ao";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-ao";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HhJdb4i9B4gz3emgDCDT4riQuAsY4uP/47biu7EZ+sk=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ libao ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/savonet/ocaml-ao";
|
||||
description = "OCaml bindings for libao";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ dandellion ];
|
||||
};
|
||||
}
|
||||
23
pkgs/development/ocaml-modules/mad/default.nix
Normal file
23
pkgs/development/ocaml-modules/mad/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libmad }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mad";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-mad";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iJjANV2M68v3C3db1n9Y8V6yJKuDBDSjtMteamndN7U=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ libmad ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/savonet/ocaml-mad";
|
||||
description = "Bindings for the mad library which provides functions for encoding wave audio files into mp3";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dandellion ];
|
||||
};
|
||||
}
|
||||
27
pkgs/development/ocaml-modules/mm/default.nix
Normal file
27
pkgs/development/ocaml-modules/mm/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator
|
||||
, alsa, ao, mad, pulseaudio, theora
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mm";
|
||||
version = "0.8.1";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-mm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7ozt+OgKNxMnjl2R+/ce27ZyL+T6BShvnnFE5BasJC4=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ alsa ao mad pulseaudio theora ]; # ocamlsdl is blocked in nixpkgs from building for ocaml >= 4.06
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/savonet/ocaml-mm";
|
||||
description = "High-level library to create and manipulate multimedia streams";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ dandellion ];
|
||||
};
|
||||
}
|
||||
|
|
@ -35,6 +35,7 @@ lib.warnIf (attrs ? name) "builtPerlPackage: `name' (\"${attrs.name}\") is depre
|
|||
(let
|
||||
defaultMeta = {
|
||||
homepage = "https://metacpan.org/release/${lib.getName attrs}"; # TODO: phase-out `attrs.name`
|
||||
mainProgram = attrs.pname or (builtins.parseDrvName attrs.name).name;
|
||||
platforms = perl.meta.platforms;
|
||||
};
|
||||
|
||||
|
|
|
|||
47
pkgs/development/python-modules/aioskybell/default.nix
Normal file
47
pkgs/development/python-modules/aioskybell/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, aiofiles
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioskybell";
|
||||
version = "22.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tkdrob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2AsEVGZ4cA1GeoxtGFuvjZ05W4FjQ5GFSM8euu9iY4s==";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
aiofiles
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aioskybell"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "API client for Skybell doorbells";
|
||||
homepage = "https://github.com/tkdrob/aioskybell";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,18 +5,20 @@
|
|||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-batch";
|
||||
version = "16.1.0";
|
||||
version = "16.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "sha256-9J0VQ3uAsi4kuEe9UG4xpcEV1Sc+nkjECgVfzG7j5jk=";
|
||||
hash = "sha256-aWkQZs1aLIbo/arvu4DilAOBrO38gFPfGTtSFNLs5oI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -24,11 +26,9 @@ buildPythonPackage rec {
|
|||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
# has no tests
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
28
pkgs/development/python-modules/cfscrape/default.nix
Normal file
28
pkgs/development/python-modules/cfscrape/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cfscrape";
|
||||
version = "2.1.1";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "Anorov";
|
||||
repo = "cloudflare-scrape";
|
||||
rev = "9692fe7ff3c17b76ddf0f4d50d3dba7d1791c9c6";
|
||||
sha256 = "sha256-uO8lBZonjk+mlFYoNSaz+GIN/W9yf8VL9OQ7MKfsMgI=";
|
||||
});
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Anorov/cloudflare-scrape";
|
||||
description = "A Python module to bypass Cloudflare's anti-bot page";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ WeebSorceress ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,22 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "entry-points-txt";
|
||||
version = "0.1.0";
|
||||
format = "wheel";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jwodder/entry-points-txt/releases/download/v0.1.0/entry_points_txt-0.1.0-py3-none-any.whl";
|
||||
sha256 = "29773bed3d9d337766a394e19d6f7ab0be3ed7d6f3ebb753ff0f7f48f056aa8e";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwodder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-klFSt3Od7xYgenpMP4DBFoZeQanGrmtJxDm5qeZ1Psc=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace " --cov=entry_points_txt --no-cov-on-fail" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"entry_points_txt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jwodder/entry-points-txt";
|
||||
description = "Read & write entry_points.txt files";
|
||||
homepage = "https://github.com/jwodder/entry-points-txt";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ ayazhafiz ];
|
||||
maintainers = with maintainers; [ ayazhafiz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "fastai";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-3l5bELb5f/cvh4gF2kJZEX6kAK9achTerIIplMuesTk=";
|
||||
sha256 = "sha256-2lV96QOlXfQ8PjSW45u9ZyXpssDgLyiUgmIC0VLOGus=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [
|
||||
./werkzeug-2.1.0-compat.patch
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,11 @@ buildPythonPackage rec {
|
|||
hash = "sha256-weZTOVFBlB6TxFs8pLWfyB7WD/bn3ljBjX2tVi1Zc/I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "siobrultech_protocols==" "siobrultech_protocols>="
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
siobrultech-protocols
|
||||
|
|
|
|||
|
|
@ -1,27 +1,50 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "headerparser";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi{
|
||||
inherit pname;
|
||||
inherit version;
|
||||
sha256 = "b8ceae4c5e6133fda666d022684e93f9b3d45815c2c7881018123c71ff28c5cc";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwodder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KJJt85iC/4oBoIelB2zUJVyHSppFem/22v6F30P5nYM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace "--cov=headerparser" "" \
|
||||
--replace "--no-cov-on-fail" "" \
|
||||
--replace "--flakes" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"headerparser"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to parse key-value pairs in the style of RFC 822 (e-mail) headers";
|
||||
homepage = "https://github.com/jwodder/headerparser";
|
||||
description = "argparse for mail-style headers";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ ayazhafiz ];
|
||||
maintainers = with maintainers; [ ayazhafiz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.13";
|
||||
version = "0.14.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-xvfDq4ralIBnAtqTHZTTfNYbz6kstNOdNRtqnFIQZ1w=";
|
||||
hash = "sha256-DnD9F0gErqHIcLFRMZ+uvNXNsNlVt4IwQ04a/Rd4SY4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meross-iot";
|
||||
version = "0.4.4.5";
|
||||
version = "0.4.4.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "albertogeniola";
|
||||
repo = "MerossIot";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-PBf8uHEeHXoYZcFD9KCWg1I5QRAILjVMl3oglWsEsag=";
|
||||
sha256 = "sha256-9kRiBYlOX+TcI8+fk+cQ3ehbrV8NnptWa+HN62sKscA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "mkdocs-material";
|
||||
version = "8.3.1";
|
||||
version = "8.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonApplication rec {
|
|||
owner = "squidfunk";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-p7pnacr3nw/UEavzVxt0QBpSjFazdWtbm3bFj9FIH1g=";
|
||||
hash = "sha256-VcyBsIU2PJ2xh365kNAlO3wno3xushlaj43dIh1GkP8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nextcord";
|
||||
version = "2.0.0a10";
|
||||
version = "2.0.0b2";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "nextcord";
|
||||
repo = "nextcord";
|
||||
rev = version;
|
||||
hash = "sha256-p99WJ4y2iJQTI3wHbh+jwJyLnE3aBXnHxrehDYYek/4=";
|
||||
hash = "sha256-yp24eOmwdi5X2Y20jqq88CDFvmc6P5omOsSWFr2MWGI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,26 +1,71 @@
|
|||
diff --git a/nextcord/opus.py b/nextcord/opus.py
|
||||
index 97d437a3..755e1a5c 100644
|
||||
index 52e4ddbd..d8b8090b 100644
|
||||
--- a/nextcord/opus.py
|
||||
+++ b/nextcord/opus.py
|
||||
@@ -213,7 +213,7 @@ def _load_default() -> bool:
|
||||
_filename = os.path.join(_basedir, 'bin', f'libopus-0.{_target}.dll')
|
||||
@@ -255,7 +255,7 @@ def _load_default() -> bool:
|
||||
_filename = os.path.join(_basedir, "bin", f"libopus-0.{_target}.dll")
|
||||
_lib = libopus_loader(_filename)
|
||||
else:
|
||||
- _lib = libopus_loader(ctypes.util.find_library('opus'))
|
||||
+ _lib = libopus_loader('@libopus@')
|
||||
except Exception:
|
||||
_lib = None
|
||||
- opus = ctypes.util.find_library("opus")
|
||||
+ opus = ctypes.util.find_library("@opus@")
|
||||
|
||||
if opus is None:
|
||||
_lib = None
|
||||
diff --git a/nextcord/player.py b/nextcord/player.py
|
||||
index bedefc5a..34de0459 100644
|
||||
index 5d0674cc..fd1c20ef 100644
|
||||
--- a/nextcord/player.py
|
||||
+++ b/nextcord/player.py
|
||||
@@ -140,7 +140,7 @@ class FFmpegAudio(AudioSource):
|
||||
.. versionadded:: 1.3
|
||||
"""
|
||||
@@ -148,7 +148,7 @@ class FFmpegAudio(AudioSource):
|
||||
self,
|
||||
source: Union[str, io.BufferedIOBase],
|
||||
*,
|
||||
- executable: str = "ffmpeg",
|
||||
+ executable: str = "@ffmpeg@",
|
||||
args: Any,
|
||||
**subprocess_kwargs: Any,
|
||||
):
|
||||
@@ -275,7 +275,7 @@ class FFmpegPCMAudio(FFmpegAudio):
|
||||
self,
|
||||
source: Union[str, io.BufferedIOBase],
|
||||
*,
|
||||
- executable: str = "ffmpeg",
|
||||
+ executable: str = "@ffmpeg@",
|
||||
pipe: bool = False,
|
||||
stderr: Optional[IO[str]] = None,
|
||||
before_options: Optional[str] = None,
|
||||
@@ -378,7 +378,7 @@ class FFmpegOpusAudio(FFmpegAudio):
|
||||
*,
|
||||
bitrate: int = 128,
|
||||
codec: Optional[str] = None,
|
||||
- executable: str = "ffmpeg",
|
||||
+ executable: str = "@ffmpeg@",
|
||||
pipe=False,
|
||||
stderr=None,
|
||||
before_options=None,
|
||||
@@ -532,7 +532,7 @@ class FFmpegOpusAudio(FFmpegAudio):
|
||||
"""
|
||||
|
||||
- def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = 'ffmpeg', args: Any, **subprocess_kwargs: Any):
|
||||
+ def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = '@ffmpeg@', args: Any, **subprocess_kwargs: Any):
|
||||
piping = subprocess_kwargs.get('stdin') == subprocess.PIPE
|
||||
if piping and isinstance(source, str):
|
||||
raise TypeError("parameter conflict: 'source' parameter cannot be a string when piping to stdin")
|
||||
method = method or "native"
|
||||
- executable = executable or "ffmpeg"
|
||||
+ executable = executable or "@ffmpeg@"
|
||||
probefunc = fallback = None
|
||||
|
||||
if isinstance(method, str):
|
||||
@@ -577,7 +577,7 @@ class FFmpegOpusAudio(FFmpegAudio):
|
||||
|
||||
@staticmethod
|
||||
def _probe_codec_native(
|
||||
- source, executable: str = "ffmpeg"
|
||||
+ source, executable: str = "@ffmpeg@"
|
||||
) -> Tuple[Optional[str], Optional[int]]:
|
||||
exe = executable[:2] + "probe" if executable in ("ffmpeg", "avconv") else executable
|
||||
args = [
|
||||
@@ -606,7 +606,7 @@ class FFmpegOpusAudio(FFmpegAudio):
|
||||
|
||||
@staticmethod
|
||||
def _probe_codec_fallback(
|
||||
- source, executable: str = "ffmpeg"
|
||||
+ source, executable: str = "@ffmpeg@"
|
||||
) -> Tuple[Optional[str], Optional[int]]:
|
||||
args = [executable, "-hide_banner", "-i", source]
|
||||
proc = subprocess.Popen(
|
||||
|
|
|
|||
|
|
@ -2,18 +2,23 @@
|
|||
, aiohttp
|
||||
, xmltodict
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "omnilogic";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djtimca";
|
||||
repo = "omnilogic-api";
|
||||
rev = version;
|
||||
sha256 = "081awb0fl40b5ighc9yxfq1xkgxz7l5dvz5544hx965q2r20wvsg";
|
||||
hash = "sha256-XyAniuUr/Kt8VfBtovD4kKLG+ehOqE26egEG7j8q9LY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -21,11 +26,6 @@ buildPythonPackage rec {
|
|||
xmltodict
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Is not used but still present in setup.py
|
||||
substituteInPlace setup.py --replace "'config'," ""
|
||||
'';
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "omnilogic" ];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "0.18.1";
|
||||
version = "0.19.0";
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ii/w29aRGhuzR6E+kbknsSrVZlOurpy/tTVGeAYKkXo=";
|
||||
sha256 = "sha256-v/EBmKIzHGPR2KGLUqyWlTSZjV2MqALYRRofCXRjH24=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/development/python-modules/pySmartDL/default.nix
Normal file
25
pkgs/development/python-modules/pySmartDL/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pySmartDL";
|
||||
version = "1.3.4";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "iTaybb";
|
||||
repo = pname;
|
||||
rev = "b93df794e1e60017c42d9520ac097b6fd38c2e8b";
|
||||
sha256 = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM=";
|
||||
});
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/iTaybb/pySmartDL";
|
||||
description = "A Smart Download Manager for Python";
|
||||
license = licenses.unlicense;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ WeebSorceress ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynx584";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "kk7ds";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-44JFq19fpJmpZzLeVcBILs8c9bOfWyMrb2jA4Yx8+Co=";
|
||||
sha256 = "sha256-aTwAQnz3my58MgXNe61lStLth6PZXLVLLDI2HUJiNm8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysensibo";
|
||||
version = "1.0.16";
|
||||
version = "1.0.17";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "andrey-git";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8SGYJ99xbCRKuWJkDN5u6wnh5Rdd+aZR5QaqOXVVQMM=";
|
||||
hash = "sha256-ZOJIsl6Ic4wSTpoylXGwQphPDV1yPw0mXbyiVKiDcVk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,16 +1,26 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage, fetchPypi
|
||||
, numpy, scipy, cython, six, decorator
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, decorator
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysptk";
|
||||
version = "0.1.20";
|
||||
version = "0.1.21";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "29e8e6a76243f3be728d23450982bd9f916530634079252a490ba7182bef30ca";
|
||||
hash = "sha256-AZUDI9AL57tXz7VzPGF9uEeKW4/6JsaBUiFkigl640Q=";
|
||||
};
|
||||
|
||||
PYSPTK_BUILD_VERSION = 0;
|
||||
|
|
@ -20,19 +30,23 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
decorator
|
||||
numpy
|
||||
scipy
|
||||
six
|
||||
decorator
|
||||
];
|
||||
|
||||
# No tests in the PyPI tarball
|
||||
# Tests are not part of the PyPI releases
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pysptk"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "A python wrapper for Speech Signal Processing Toolkit (SPTK)";
|
||||
homepage = "https://pysptk.readthedocs.io/en/latest/";
|
||||
description = "Wrapper for Speech Signal Processing Toolkit (SPTK)";
|
||||
homepage = "https://pysptk.readthedocs.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hyphon81 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywemo";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kkZmn+rGRZGh9WmrHAmpqxTjw6MyCSWCeesJ0JGarKM=";
|
||||
hash = "sha256-x4wIn+X70z5cCIhOfpQCj7qy0kEagnMcscxUls1697o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "r2pipe";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
postPatch = let
|
||||
r2lib = "${lib.getOutput "lib" radare2}/lib";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-VUYJm3tFyv/ws4nDHLuDgPQSGbB09hi8zrpAPDqoVbA=";
|
||||
sha256 = "sha256-7Qa8Jl7vX/acMhGSqWfaqvN9emA05RSubpseAwRSpG4=";
|
||||
};
|
||||
|
||||
# Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't
|
||||
|
|
|
|||
|
|
@ -1,19 +1,41 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, requests, dparse, click, setuptools, pytestCheckHook }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, click
|
||||
, requests
|
||||
, packaging
|
||||
, dparse
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safety";
|
||||
version = "1.10.3";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MOOU0CogrEm39lKS0Z04+pJ6j5WCzf060a27xmxkGtU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests dparse click setuptools ];
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
click
|
||||
requests
|
||||
packaging
|
||||
dparse
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Disable tests depending on online services
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
dontUseSetuptoolsCheck = true;
|
||||
disabledTests = [
|
||||
"test_check_live"
|
||||
"test_check_live_cached"
|
||||
|
|
@ -24,10 +46,9 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Safety checks your installed dependencies for known security vulnerabilities";
|
||||
description = "Checks installed dependencies for known vulnerabilities";
|
||||
homepage = "https://github.com/pyupio/safety";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ thomasdesr ];
|
||||
maintainers = with maintainers; [ thomasdesr dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "siobrultech-protocols";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "sdwilsh";
|
||||
repo = "siobrultech-protocols";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bpWOfdwNHJXfKcANSu69YgXsxsfUhaH63/fXF6H+MNg=";
|
||||
hash = "sha256-d4zAwcSCyC78dJZtxFkpdYurxDRon2cRgzInllP2qJQ=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "smbus2";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kplindegaard";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xgqs7bzhr8y3irc9gq3dnw1l3f5gc1yv4r2v4qxj95i3vvzpg5s";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, pythonOlder
|
||||
, pytz
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -39,6 +40,7 @@ buildPythonPackage rec {
|
|||
pyopenssl
|
||||
pytz
|
||||
requests
|
||||
setuptools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, python-dateutil
|
||||
|
|
@ -10,14 +11,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitchapi";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "twitchAPI";
|
||||
inherit version;
|
||||
sha256 = "e7987dd8c3d1a3d25fe85ff0c0b0bad492f916c920f618dca8efd6baad3ac704";
|
||||
hash = "sha256-uNXET3V3r3f6c72IF3DEdXfQlrgkn2w5f4ksKBOsihg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wallbox";
|
||||
version = "0.4.8";
|
||||
version = "0.4.9";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f8965b0ae3a873f570986e712a4e667d0b6634c9e3afb51fbd5596856412878c";
|
||||
sha256 = "90e664cf7d99eb1baf20a9ff5fd415dfa14ddafabcefd606e15b5bcd25f969e9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,26 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchurl
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wheel-filename";
|
||||
version = "1.3.0";
|
||||
format = "wheel";
|
||||
version = "1.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jwodder/wheel-filename/releases/download/v1.1.0/wheel_filename-1.1.0-py3-none-any.whl";
|
||||
sha256 = "0aee45553f34e3a1b8a5db64aa832326f13c138b7f925a53daf96f984f9e6a38";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwodder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M3XGHG733X5qKuMS6mvFSFHYOwWPaBMXw+w0eYo6ByE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
attrs
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace " --cov=wheel_filename --no-cov-on-fail" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wheel_filename"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jwodder/wheel-filename";
|
||||
description = "Parse wheel filenames";
|
||||
homepage = "https://github.com/jwodder/wheel-filename";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ ayazhafiz ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,65 +1,65 @@
|
|||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchurl
|
||||
, bleach, docutils, pygments, six
|
||||
, attrs, entry-points-txt, headerparser, packaging, wheel-filename
|
||||
, entry-points-txt
|
||||
, fetchFromGitHub
|
||||
, headerparser
|
||||
, jsonschema
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, readme_renderer
|
||||
, wheel-filename
|
||||
}:
|
||||
|
||||
# wheel-filename is stuck on readme_renderer~=24.0.0, but the upstream is at a
|
||||
# future version.
|
||||
let readme_renderer_24 = buildPythonPackage rec {
|
||||
pname = "readme_renderer";
|
||||
version = "24.0.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://files.pythonhosted.org/packages/c3/7e/d1aae793900f36b097cbfcc5e70eef82b5b56423a6c52a36dce51fedd8f0/readme_renderer-24.0-py2.py3-none-any.whl";
|
||||
sha256 = "c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [
|
||||
bleach
|
||||
docutils
|
||||
pygments
|
||||
six
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for rendering readme descriptions";
|
||||
homepage = "https://github.com/pypa/readme_renderer";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ ayazhafiz ];
|
||||
};
|
||||
};
|
||||
|
||||
in buildPythonPackage rec {
|
||||
version = "1.7.0";
|
||||
buildPythonPackage rec {
|
||||
pname = "wheel-inspect";
|
||||
format = "wheel";
|
||||
version = "1.7.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jwodder/wheel-inspect/releases/download/v1.7.0/wheel_inspect-1.7.0-py3-none-any.whl";
|
||||
sha256 = "69b34de1f4464ddfc76280c4563e4afc644de2c88e3ae6882f030afdad3d73e4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwodder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pB9Rh+A7GlxnYuka2mTSBoxpoyYCzoaMPVgsHDlpos0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
bleach
|
||||
docutils
|
||||
entry-points-txt
|
||||
headerparser
|
||||
packaging
|
||||
pygments
|
||||
readme_renderer_24
|
||||
readme_renderer
|
||||
wheel-filename
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
jsonschema
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace " --cov=wheel_inspect --no-cov-on-fail" ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "entry-points-txt ~= 0.1.0" "entry-points-txt >= 0.1.0"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wheel_inspect"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jwodder/wheel-inspect";
|
||||
description = "Extract information from wheels";
|
||||
homepage = "https://github.com/jwodder/wheel-inspect";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ ayazhafiz ];
|
||||
maintainers = with maintainers; [ ayazhafiz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||
hash = "sha256-pTQigt8sG+4AzDc3Fav/Qn27CNH0lIHuQ3QMA5uMdqI=";
|
||||
hash = "sha256-psSbz5ZcgLDkS/9Q/PLe4Ufj7GOR8Sv1rLhA2Hs3zsw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
22
pkgs/development/tools/codeowners/default.nix
Normal file
22
pkgs/development/tools/codeowners/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ buildGoModule, lib, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "codeowners";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hmarr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YhGBg7CP5usSyP3ksX3/54M9gCokK2No/fYANUTdJw0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-no1x+g5MThhWw4eTfP33zoY8TyUtkt60FKsV2hTnYUU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI and Go library for Github's CODEOWNERS file";
|
||||
homepage = "https://github.com/hmarr/codeowners";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yorickvp ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.72.0";
|
||||
version = "1.76.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+8uGh7cvNndBBLdTfbYDxfn7Z+4LPPgqeseLcR1P468=";
|
||||
sha256 = "sha256-rascG0WXDsmParwzR8QZEayiQEARu8YXfU0JT2yhQrc=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue