mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-16 09:03:42 +00:00
Merge staging-next into staging
This commit is contained in:
commit
6e6e33bd99
@ -14695,6 +14695,12 @@
|
||||
githubId = 2072185;
|
||||
name = "Marc Scholten";
|
||||
};
|
||||
mrbenjadmin = {
|
||||
email = "mrbenjadmin@gmail.com";
|
||||
github = "mrbenjadmin";
|
||||
githubId = 68156310;
|
||||
name = "Benjamin Strachan";
|
||||
};
|
||||
mrcjkb = {
|
||||
email = "marc@jakobi.dev";
|
||||
matrix = "@mrcjk:matrix.org";
|
||||
@ -15051,6 +15057,12 @@
|
||||
name = "Daniel Nagy";
|
||||
keys = [ { fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; } ];
|
||||
};
|
||||
naho = {
|
||||
github = "trueNAHO";
|
||||
githubId = 90870942;
|
||||
name = "Noah Pierre Biewesch";
|
||||
keys = [ { fingerprint = "5FC6 088A FB1A 609D 4532 F919 0C1C 177B 3B64 68E0"; } ];
|
||||
};
|
||||
nalbyuites = {
|
||||
email = "ashijit007@gmail.com";
|
||||
github = "nalbyuites";
|
||||
|
@ -1,23 +1,35 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkOption
|
||||
mkPackageOption
|
||||
;
|
||||
|
||||
cfg = config.programs.corectrl;
|
||||
in
|
||||
{
|
||||
options.programs.corectrl = {
|
||||
enable = lib.mkEnableOption ''
|
||||
enable = mkEnableOption ''
|
||||
CoreCtrl, a tool to overclock amd graphics cards and processors.
|
||||
Add your user to the corectrl group to run corectrl without needing to enter your password
|
||||
'';
|
||||
|
||||
package = lib.mkPackageOption pkgs "corectrl" {
|
||||
package = mkPackageOption pkgs "corectrl" {
|
||||
extraDescription = "Useful for overriding the configuration options used for the package.";
|
||||
};
|
||||
|
||||
gpuOverclock = {
|
||||
enable = lib.mkEnableOption ''
|
||||
enable = mkEnableOption ''
|
||||
GPU overclocking
|
||||
'';
|
||||
ppfeaturemask = lib.mkOption {
|
||||
ppfeaturemask = mkOption {
|
||||
type = lib.types.str;
|
||||
default = "0xfffd7fff";
|
||||
example = "0xffffffff";
|
||||
@ -31,33 +43,34 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable (lib.mkMerge [
|
||||
{
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
|
||||
users.groups.corectrl = { };
|
||||
users.groups.corectrl = { };
|
||||
|
||||
security.polkit.extraConfig = ''
|
||||
polkit.addRule(function(action, subject) {
|
||||
if ((action.id == "org.corectrl.helper.init" ||
|
||||
action.id == "org.corectrl.helperkiller.init") &&
|
||||
subject.local == true &&
|
||||
subject.active == true &&
|
||||
subject.isInGroup("corectrl")) {
|
||||
return polkit.Result.YES;
|
||||
}
|
||||
});
|
||||
'';
|
||||
}
|
||||
security.polkit.extraConfig = ''
|
||||
polkit.addRule(function(action, subject) {
|
||||
if ((action.id == "org.corectrl.helper.init" ||
|
||||
action.id == "org.corectrl.helperkiller.init") &&
|
||||
subject.local == true &&
|
||||
subject.active == true &&
|
||||
subject.isInGroup("corectrl")) {
|
||||
return polkit.Result.YES;
|
||||
}
|
||||
});
|
||||
'';
|
||||
|
||||
(lib.mkIf cfg.gpuOverclock.enable {
|
||||
# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169
|
||||
# The overdrive bit
|
||||
boot.kernelParams = [ "amdgpu.ppfeaturemask=${cfg.gpuOverclock.ppfeaturemask}" ];
|
||||
})
|
||||
]);
|
||||
# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169
|
||||
# The overdrive bit
|
||||
boot.kernelParams = mkIf cfg.gpuOverclock.enable [
|
||||
"amdgpu.ppfeaturemask=${cfg.gpuOverclock.ppfeaturemask}"
|
||||
];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ artturin ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
artturin
|
||||
Scrumplex
|
||||
];
|
||||
}
|
||||
|
@ -40,6 +40,7 @@ Available extra IBus engines are:
|
||||
- Anthy (`ibus-engines.anthy`): Anthy is a system for
|
||||
Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
|
||||
- Hangul (`ibus-engines.hangul`): Korean input method.
|
||||
- libpinyin (`ibus-engines.libpinyin`): A Chinese input method.
|
||||
- m17n (`ibus-engines.m17n`): m17n is an input method that
|
||||
uses input methods and corresponding icons in the m17n database.
|
||||
- mozc (`ibus-engines.mozc`): A Japanese input method from
|
||||
|
@ -186,6 +186,10 @@ in
|
||||
}
|
||||
];
|
||||
|
||||
# This defaults to true in the application,
|
||||
# which breaks older configs using pantalaimon or access tokens
|
||||
services.mjolnir.settings.encryption.use = lib.mkDefault false;
|
||||
|
||||
services.pantalaimon-headless.instances."mjolnir" = lib.mkIf cfg.pantalaimon.enable
|
||||
{
|
||||
homeserver = cfg.homeserverUrl;
|
||||
|
@ -7,16 +7,7 @@ import ../make-test-python.nix ({ pkgs, ... } : {
|
||||
|
||||
nodes = {
|
||||
node = { ... }: {
|
||||
services.etcd = {
|
||||
enable = true;
|
||||
# Ensure etcd is ready to accept connections
|
||||
extraConf = {
|
||||
"initial-advertise-peer-urls" = "http://localhost:2380";
|
||||
"listen-peer-urls" = "http://localhost:2380";
|
||||
"listen-client-urls" = "http://localhost:2379";
|
||||
"advertise-client-urls" = "http://localhost:2379";
|
||||
};
|
||||
};
|
||||
services.etcd.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
@ -28,7 +19,7 @@ import ../make-test-python.nix ({ pkgs, ... } : {
|
||||
node.wait_until_succeeds("etcdctl endpoint health")
|
||||
|
||||
with subtest("should write and read some values to etcd"):
|
||||
node.succeed("etcdctl --endpoints=http://localhost:2379 put /foo/bar 'Hello world'")
|
||||
node.succeed("etcdctl --endpoints=http://localhost:2379 get /foo/bar | grep 'Hello world'")
|
||||
node.succeed("etcdctl put /foo/bar 'Hello world'")
|
||||
node.succeed("etcdctl get /foo/bar | grep 'Hello world'")
|
||||
'';
|
||||
})
|
||||
|
@ -97,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
with subtest("Test unixd connection"):
|
||||
client.wait_for_unit("kanidm-unixd.service")
|
||||
client.wait_for_file("/run/kanidm-unixd/sock")
|
||||
client.wait_until_succeeds("kanidm-unix status | grep working!")
|
||||
client.wait_until_succeeds("kanidm-unix status | grep online")
|
||||
|
||||
with subtest("Test user creation"):
|
||||
client.wait_for_unit("getty@tty1.service")
|
||||
@ -107,7 +107,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
client.send_chars("kanidm person posix set-password testuser\n")
|
||||
client.wait_until_tty_matches("1", "Enter new")
|
||||
client.send_chars("${testCredentials.password}\n")
|
||||
client.wait_until_tty_matches("1", "Retype")
|
||||
client.wait_until_tty_matches("1", "Reenter")
|
||||
client.send_chars("${testCredentials.password}\n")
|
||||
output = client.succeed("getent passwd testuser")
|
||||
assert "TestUser" in output
|
||||
|
@ -597,6 +597,8 @@ let
|
||||
rpcauth=bitcoinrpc:e8fe33f797e698ac258c16c8d7aadfbe$872bdb8f4d787367c26bcfd75e6c23c4f19d44a69f5d1ad329e5adf3f82710f7
|
||||
zmqpubrawblock=tcp://127.0.0.1:28332
|
||||
zmqpubrawtx=tcp://127.0.0.1:28333
|
||||
# https://github.com/lightningnetwork/lnd/issues/9163
|
||||
deprecatedrpc=warnings
|
||||
'';
|
||||
extraCmdlineOptions = [ "-regtest" ];
|
||||
};
|
||||
|
@ -5,14 +5,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "helio-workstation";
|
||||
version = "3.13";
|
||||
version = "3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helio-fm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4=";
|
||||
hash = "sha256-o8vMHt6ypHY7HOHnhMifQphxGb5MjSg3hREVOnIdqfc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qsynth";
|
||||
version = "1.0.0";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-FOoqnJeh29J0clsqZ+wbhQmsaybrAbIqgeB7m/7Q+3M=";
|
||||
hash = "sha256-SHMPmZMAlC9L5EAecaZNB0pWnq0heeD8bcbhKeI+YOo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snd";
|
||||
version = "24.5";
|
||||
version = "24.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
|
||||
sha256 = "sha256-Y497KAlUXtWhkrCd1QrqJkvWGwnzZfYRKaALiEo/7EI=";
|
||||
sha256 = "sha256-iH/y2dHeQL3ZHwKl5qkrXpSDgrqI/U31BwpwFAzBzEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoshimi";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yoshimi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-UaZjT7B9T3a3W9PD9abA/WPmt9Id8/zUUSZU05+8x9c=";
|
||||
hash = "sha256-uBivCygpvJ6psgqW3FOHaW5IzUq8vrC2uk4KRv6L2oY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.5.6";
|
||||
version = "2.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GPquY5kfn08TUCum/INdHPasx8BWK2mf+PQlSgTl4iw=";
|
||||
sha256 = "sha256-Di/m8L6QggDZHgrQXDD69MBT4xGuilIAV4y/8raxLu4=";
|
||||
};
|
||||
|
||||
projectFile = "NBXplorer/NBXplorer.csproj";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ox";
|
||||
version = "0.6.1";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "curlpipe";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-37o8Ak+8LPeGny7JBLc2STpRjfWBCwOrRyP3HJbD25o=";
|
||||
hash = "sha256-UFNOW/INV/65C6UysKi9lGw+PIj2NXF6ejG5UY702/I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-c7XhMYfhMCxyidZJemnu5f9KwQmPmbun6mrI3v2EpZ4=";
|
||||
cargoHash = "sha256-sy/RNMXJn5k9qw0ghCQA7PqZokpDw0xns4abwa938Gk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
|
||||
|
||||
|
@ -19,6 +19,7 @@
|
||||
arrow-cpp,
|
||||
Cocoa,
|
||||
coc-clangd,
|
||||
coc-css,
|
||||
coc-diagnostic,
|
||||
coc-pyright,
|
||||
code-minimap,
|
||||
@ -453,6 +454,11 @@ in
|
||||
src = "${coc-clangd}/lib/node_modules/coc-clangd";
|
||||
};
|
||||
|
||||
coc-css = buildVimPlugin {
|
||||
inherit (coc-css) pname version meta;
|
||||
src = "${coc-css}/lib/node_modules/coc-css";
|
||||
};
|
||||
|
||||
coc-diagnostic = buildVimPlugin {
|
||||
inherit (coc-diagnostic) pname version meta;
|
||||
src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
|
||||
@ -2724,7 +2730,6 @@ in
|
||||
let
|
||||
nodePackageNames = [
|
||||
"coc-cmake"
|
||||
"coc-css"
|
||||
"coc-docker"
|
||||
"coc-emmet"
|
||||
"coc-eslint"
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdsk";
|
||||
version = "1.5.19";
|
||||
version = "1.5.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-W8w5o9rK/yCipQnfn4gMOwDZ+9WeV3G53q5h2XlevkE=";
|
||||
sha256 = "sha256-/ivN4+Oe0N6VmhWTfdDU48NcQLSIVAAtqzzi6DdlAZ0=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html";
|
||||
description = "Advanced geospatial data analysis platform";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mpickering ];
|
||||
maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ mpickering ]);
|
||||
};
|
||||
}
|
||||
|
@ -38,11 +38,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shotwell";
|
||||
version = "0.32.9";
|
||||
version = "0.32.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-EjKjPcnBftI6oA2P8lUA5xC73JiZ1VtEFbaLdCnlYOs=";
|
||||
sha256 = "sha256-JuRaYbVDGwlv/NF28RW9B76ad6aDNYmVQhBuGeB/QA4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flashprint";
|
||||
version = "5.8.6";
|
||||
version = "5.8.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-oi/nEdOjhbYf9IZmppfKiEmlNGXdc907LS2x8jUck+M=";
|
||||
hash = "sha256-DVY5XxAz3HPAWMNaGauUop7OWHeFuuRHuVllyJvHqFk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ];
|
||||
|
@ -4,12 +4,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ganttproject-bin";
|
||||
version = "3.3.3309";
|
||||
version = "3.3.3312";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.ganttproject.biz/ganttproject-${version}/ganttproject-${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-ysK+q9r8pbf9MBv7ck24joPR/ywyHnDCBHeOLfljYNw=";
|
||||
hash = "sha256-mvup4yMfFfzL2iLMj9vlFFrJT0wLmeadNEnf2QO53H0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -1,132 +0,0 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, mm-common
|
||||
, intltool
|
||||
, itstool
|
||||
, doxygen
|
||||
, graphviz
|
||||
, makeFontsConf
|
||||
, freefont_ttf
|
||||
, boost
|
||||
, libxmlxx3
|
||||
, libxslt
|
||||
, libgdamm
|
||||
, libarchive
|
||||
, libepc
|
||||
, python3
|
||||
, ncurses
|
||||
, glibmm
|
||||
, gtk3
|
||||
, openssl
|
||||
, gtkmm3
|
||||
, goocanvasmm2
|
||||
, evince
|
||||
, isocodes
|
||||
, gtksourceview
|
||||
, gtksourceviewmm
|
||||
, postgresql_15
|
||||
, gobject-introspection
|
||||
, yelp-tools
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
let
|
||||
gda = libgdamm.override {
|
||||
mysqlSupport = true;
|
||||
postgresSupport = true;
|
||||
};
|
||||
python = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
|
||||
sphinx-build = python3.pkgs.sphinx.overrideAttrs (super: {
|
||||
postFixup = super.postFixup or "" + ''
|
||||
# Do not propagate Python
|
||||
rm $out/nix-support/propagated-build-inputs
|
||||
'';
|
||||
});
|
||||
boost_python = boost.override { enablePython = true; inherit python; };
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "glom";
|
||||
version = "1.32.0";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
mm-common
|
||||
intltool
|
||||
yelp-tools
|
||||
itstool
|
||||
doxygen
|
||||
graphviz
|
||||
sphinx-build
|
||||
wrapGAppsHook3
|
||||
gobject-introspection # for setup hook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost_python
|
||||
glibmm
|
||||
gtk3
|
||||
openssl
|
||||
libxmlxx3
|
||||
libxslt
|
||||
gda
|
||||
libarchive
|
||||
libepc
|
||||
python
|
||||
ncurses # for python
|
||||
gtkmm3
|
||||
goocanvasmm2
|
||||
evince
|
||||
isocodes
|
||||
python3.pkgs.pygobject3
|
||||
gtksourceview
|
||||
gtksourceviewmm
|
||||
postgresql_15 # for postgresql utils
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}"
|
||||
"--with-postgres-utils=${lib.getBin postgresql_15}/bin"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"libdocdir=${placeholder "doc"}/share/doc/$(book_name)"
|
||||
"devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)"
|
||||
];
|
||||
|
||||
# Fontconfig error: Cannot load default config file
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "${placeholder "out"}/${python3.sitePackages}"
|
||||
--set PYTHONHOME "${python}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easy-to-use database designer and user interface";
|
||||
homepage = "http://www.glom.org/";
|
||||
license = [ licenses.lgpl2 licenses.gpl2 ];
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minder";
|
||||
version = "1.16.4";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phase1geo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1r2PbBYw4mmiScKbX9BGqe4i+emSvismJfPm3opLlOg=";
|
||||
sha256 = "sha256-LZm2TLUugW/lSHp+y3Sz9IacQCEFQloVnZ9MoBjqHvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "widevine-cdm";
|
||||
version = "4.10.2710.0";
|
||||
version = "4.10.2830.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
|
||||
hash = "sha256-lGTrSzUk5FluH1o4E/9atLIabEpco3C3gZw+y6H6LJo=";
|
||||
hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atmos";
|
||||
version = "1.86.0";
|
||||
version = "1.95.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IlvIZMfsANw6+BrVObn0pBcoEcSKXVcN1V3B0f4BDno=";
|
||||
sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-87C3MPKlYVnpNJvPJY9eCrSy8qfP8Kj36a9vi+kiP44=";
|
||||
vendorHash = "sha256-4pUx8qzptzuGeIrT7m67iidMSUNbDSGV8p+KkHqX3lo=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];
|
||||
|
||||
|
@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubebuilder";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kubebuilder";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iWu3HnfjT9hiDyl9Ni0xJa/e+E9fbh3bnfrdE1ChaWc=";
|
||||
hash = "sha256-awwUYmzLKz+K6qKN+nNWRAxIM/UFDF1r1cI7heeqrlo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dMzDKYjPBAiNFwzaBML76tMylHtBs9Tb2Ulj/WovVJ4=";
|
||||
vendorHash = "sha256-+7vCd9mC5rkC+XKc7hsHMFgT8R6dJfT0XR6PsJM3Xdc=";
|
||||
|
||||
subPackages = ["cmd"];
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "node-problem-detector";
|
||||
version = "0.8.19";
|
||||
version = "0.8.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-foVMmRgxy0A62EzmDiGUd2/x5zOpMAMUzXitpxuSIU0=";
|
||||
sha256 = "sha256-Aw6TDyWczqWgUOCV7f4JSAI4eVcjWgwe2V5qSrx4TBI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-backend-git";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plumber-cd";
|
||||
repo = "terraform-backend-git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZbQfL7uKCFD98HcoeqscZaIsWFvWH0Ytzlqr6fMmXUs=";
|
||||
hash = "sha256-mLgUA7f4enlVuQx4VM3QbNuaAq7FgDaRyiG0sbT31ng=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0=";
|
||||
vendorHash = "sha256-vFx59dIdniLRP0xHcD3c22GidZOPdGZvmvg/BvxFBGI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
let
|
||||
pname = "cozydrive";
|
||||
version = "3.39.0";
|
||||
version = "3.40.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage";
|
||||
sha256 = "sha256-mTRg8KQm7BJil81TClyzCrXSHTbn+G9pRYMIaeXojzc=";
|
||||
sha256 = "sha256-bKYtuFgKmZj8fFEh/O9HXGm+GQTEbjpe+KsMW5nX1ek=";
|
||||
};
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
||||
|
@ -5,20 +5,20 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diswall";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dis-works";
|
||||
repo = "diswall-rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iZln/cgYGSFYwXDvD1CkQdfwBDXj897X1il1m5HfFJs=";
|
||||
sha256 = "sha256-jrifO6LRxVhgPoUOAm+7RT+LIhjsw/mEDFBZSJYMv/w=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
cargoHash = "sha256-5PPI7fnG71xkQCY+OLLk83XZb+4DoPX81bAtKRp/H8U=";
|
||||
cargoHash = "sha256-1HxuVZ4J/Ds1aOIIcNa/XGi7PhKgB+iAESMa1muTL48=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "9.14.0";
|
||||
version = "9.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
|
||||
hash = "sha256-YBC6zjcxSnOOY3RSo0X1ixTY1to2vEEkj1/9rItLzNA=";
|
||||
hash = "sha256-Rq/5QByaqGd5Cfr4r+Ojv8OC8PvFQ4a+TT8CgeevF28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,6 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, lua, pkg-config, rsync,
|
||||
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, xnu }:
|
||||
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, apple-sdk_11 }:
|
||||
|
||||
let
|
||||
xnu = apple-sdk_11.sourceRelease "xnu";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsyncd";
|
||||
version = "2.3.1";
|
||||
@ -19,7 +22,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Special flags needed on Darwin:
|
||||
# https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ];
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DWITH_INOTIFY=OFF"
|
||||
"-DWITH_FSEVENTS=ON"
|
||||
"-DXNU_DIR=${xnu}"
|
||||
];
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
@ -28,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
rsync
|
||||
lua
|
||||
asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
|
||||
];
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/axkibe/lsyncd";
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
let
|
||||
pname = "mendeley";
|
||||
version = "2.120.0";
|
||||
version = "2.122.1";
|
||||
|
||||
executableName = "${pname}-reference-manager";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
|
||||
hash = "sha256-yKHrTcIiNhsLMfwNQNSLE2mAQLsDFxhTYdper3a8oM8=";
|
||||
hash = "sha256-9/QGBUcMjZaV/R9Ox0RaNsLChICoMG9qdFRXM9XCF2w=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
@ -15,11 +15,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ticktick";
|
||||
version = "6.0.0";
|
||||
version = "6.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb";
|
||||
hash = "sha256-yoskJ7v0RgRZ16gs9UY1xf/PunLoFkNGKmVMkPJDPmM=";
|
||||
hash = "sha256-/SaQJFaz8quuFk4bLmRrvfYpqyDNTV/dJBrAJpOT4S4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -4,12 +4,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "6.8.1";
|
||||
version = "6.8.4";
|
||||
pname = "timeular";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
|
||||
hash = "sha256-9t21aIEhLNIY7kSJkcvUVZ8R9/CuW0ZEu8kWkvMMQrM=";
|
||||
hash = "sha256-0x8Ra6NlYnYCcRTmEzFTBYOtUIaMBtL4/0293gxxeS0=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
@ -9,12 +9,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flamp";
|
||||
version = "2.2.12";
|
||||
version = "2.2.14";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/fldigi/flamp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rw75mz3gPQDBl1iECHZAMBxY8iDr/hqSJscJhdboaRw=";
|
||||
hash = "sha256-y8x/0rLJSHL1B61ODtjmf2S6W7ChZasBfFE9lc66FSI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fldigi";
|
||||
version = "4.2.05";
|
||||
version = "4.2.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-rBGJ+63Szhy37LQw0LpE2/lLyP5lwK7hsz/uq453iHY=";
|
||||
hash = "sha256-Q2DeIl1vjP65u2pb5qxJLlJwLI9wT4dgnEUtO8sbbAg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "siril";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "free-astro";
|
||||
repo = "siril";
|
||||
rev = version;
|
||||
hash = "sha256-JUMk2XHMOeocSpeeI+k3s9TsEQCdqz3oigTzuwRHbT4=";
|
||||
hash = "sha256-orNu9qo7sutMUPeIPPhxKETEKbCm4D6nAuo4Hc/8Bdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkwave";
|
||||
version = "3.3.120";
|
||||
version = "3.3.121";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
|
||||
sha256 = "sha256-XalIY/suXYjMAZ4r/cZ2AiOYETiUtYXYZOEcqDQbJNg=";
|
||||
sha256 = "sha256-VKpFeI1tUq+2WcOu8zWq/eDvLImQp3cPjqpk5X8ic0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "systemc";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accellera-official";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qeQUrPhD+Gb1lResM7NZzO/vEgJd3NE6lbnM380VVa0=";
|
||||
sha256 = "sha256-ReYRKx7H9rxVhvY9gAdxrMu5nlsK2FcVIzfgvZroD/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -54,6 +54,13 @@ stdenv.mkDerivation rec {
|
||||
# fix those bugs themselves. This is for critical bugfixes, where "critical"
|
||||
# == "causes (transient) doctest failures / somebody complained".
|
||||
bugfixPatches = [
|
||||
# https://github.com/sagemath/sage/pull/38628, landed in 10.5.beta4
|
||||
(fetchpatch {
|
||||
name = "pari-stack-cysignals-exception.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/4a9c985b769b1209902c970ade1892f18ab48c10.diff";
|
||||
hash = "sha256-S6NdonB7needJlQdx52Huk34Q8/vG3nyGicA5JpsdWc=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8
|
||||
(fetchpatch {
|
||||
name = "glpk-aarch64-hang-workaround.patch";
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sumo";
|
||||
version = "1.20.0";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = "sumo";
|
||||
rev = "v${lib.replaceStrings ["."] ["_"] version}";
|
||||
hash = "sha256-y/bkdDWrb1KB0EOVSJPfPVYHGp/zQ2+Shb6eLsFQRNQ=";
|
||||
hash = "sha256-VST3ZJuDQBWf+YoN0kPyLrlXWmJABubUFDsKEMxfxHY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -14,12 +14,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bino";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.marlam.de/git/bino.git";
|
||||
rev = "bino-${finalAttrs.version}";
|
||||
hash = "sha256-t7bkpYOswGEjUg+k2gjUkWwZJjj44KIVrEQs5P4DoSI=";
|
||||
hash = "sha256-3DnEVde7LzaQUMhPi/RosRIW9j8bbkPVkihO5swCbws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.0.0";
|
||||
version = "14.1.0";
|
||||
pname = "mediathekview";
|
||||
src = fetchurl {
|
||||
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
|
||||
sha256 = "sha256-vr0yqKVRodtXalHEIsm5gdEp9wPU9U5nnYhMk7IiPF4=";
|
||||
sha256 = "sha256-2dC7y4SbGsjU6UBHbfye1MUNiLvIQjqTcqPX0I11qIk=";
|
||||
};
|
||||
|
||||
|
||||
|
28
pkgs/build-support/src-only/tests.nix
Normal file
28
pkgs/build-support/src-only/tests.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{
|
||||
runCommand,
|
||||
srcOnly,
|
||||
emptyDirectory,
|
||||
glibc,
|
||||
}:
|
||||
|
||||
let
|
||||
emptySrc = srcOnly emptyDirectory;
|
||||
glibcSrc = srcOnly glibc;
|
||||
in
|
||||
|
||||
runCommand "srcOnly-tests" { } ''
|
||||
# Test that emptySrc is empty
|
||||
if [ -n "$(ls -A ${emptySrc})" ]; then
|
||||
echo "emptySrc is not empty"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Test that glibcSrc is not empty
|
||||
if [ -z "$(ls -A ${glibcSrc})" ]; then
|
||||
echo "glibcSrc is empty"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Make $out exist to avoid build failure
|
||||
mkdir -p $out
|
||||
''
|
@ -3,6 +3,8 @@
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
xorg,
|
||||
stdenv,
|
||||
apple-sdk_14,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "1fps";
|
||||
@ -23,7 +25,7 @@ buildGoModule rec {
|
||||
xorg.libX11
|
||||
xorg.libXtst
|
||||
xorg.libXi
|
||||
];
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14;
|
||||
|
||||
meta = {
|
||||
description = "Encrypted Screen Sharing";
|
||||
|
@ -41,13 +41,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ssm-agent";
|
||||
version = "3.3.859.0";
|
||||
version = "3.3.987.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-ssm-agent";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Qxzq91GXOrssBO9VaQTkLZjVqdpUYoYq3N/rakwewJs=";
|
||||
hash = "sha256-uwAMDFSIeM3tE+F/QLUxXVItnfsqyGhAPybaG5JxhZM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amdvlk";
|
||||
version = "2024.Q3.2";
|
||||
version = "2024.Q3.3";
|
||||
|
||||
src = fetchRepoProject {
|
||||
name = "amdvlk-src";
|
||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||
rev = "refs/tags/v-${finalAttrs.version}";
|
||||
hash = "sha256-1Svdr93ShjhaWJUTLn5y1kBM4hHey1dUVDiHqFIKgrU=";
|
||||
hash = "sha256-wIPubMsSaNGTykD/K0gxdba128TqW5nu4CjXoLkprc0=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
63
pkgs/by-name/an/antora-lunr-extension/package.nix
Normal file
63
pkgs/by-name/an/antora-lunr-extension/package.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{
|
||||
antora,
|
||||
buildNpmPackage,
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "antora-lunr-extension";
|
||||
version = "1.0.0-alpha.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
|
||||
owner = "antora";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-EtjZL6U/uSGSYSqtuatCkdWP0NHxRuht13D9OaM4x00=";
|
||||
|
||||
# Prevent tests from failing because they are fetching data at runtime.
|
||||
postPatch = ''
|
||||
substituteInPlace package.json --replace '"_mocha"' '""'
|
||||
'';
|
||||
|
||||
# Pointing $out to $out/lib/node_modules/@antora/lunr-extension simplifies
|
||||
# Antora's extension option usage from
|
||||
#
|
||||
# --extension ${pkgs.antora-lunr-extension}/lib/node_modules/@antora/lunr-extension
|
||||
#
|
||||
# to
|
||||
#
|
||||
# --extension ${pkgs.antora-lunr-extension}
|
||||
postInstall = ''
|
||||
directory="$(mktemp --directory)"
|
||||
|
||||
mv "$out/"{.,}* "$directory"
|
||||
mv "$directory/lib/node_modules/@antora/lunr-extension/"{.,}* "$out"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.run = antora.tests.run.override {
|
||||
antora-lunr-extension-test = true;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Antora extension adding offline, full-text search powered by Lunr";
|
||||
homepage = "https://gitlab.com/antora/antora-lunr-extension";
|
||||
license = lib.licenses.mpl20;
|
||||
|
||||
longDescription = ''
|
||||
This Antora extension is intended to be passed to `antora`'s `--extension`
|
||||
flag or injected into the [`antora.extensions`
|
||||
key](https://docs.antora.org/antora/3.1/extend/enable-extension).
|
||||
'';
|
||||
|
||||
maintainers = [ lib.maintainers.naho ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
79
pkgs/by-name/an/antora-ui-default/package.nix
Normal file
79
pkgs/by-name/an/antora-ui-default/package.nix
Normal file
@ -0,0 +1,79 @@
|
||||
{
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
let
|
||||
srcFetchFromGitLab = {
|
||||
hash = "sha256-q2FwkwzjanxTIxjMpCyMpzPt782uYZiWVdZ7Eev79oM=";
|
||||
owner = "trueNAHO";
|
||||
repo = "antora-ui-default";
|
||||
rev = "83bf9bf5f22a6dee397f8b089eb0315c14a278b5";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "antora-ui-default";
|
||||
version = "0";
|
||||
|
||||
# The UI bundle is fetched from lib.maintainers.naho's antora-ui-default fork
|
||||
# for the following reasons:
|
||||
#
|
||||
# > The UI bundle is currently unpackaged [1] [2], and only accessible by
|
||||
# > fetching the latest GitLab artifact or building from source. Neither
|
||||
# > method is reliably reproducible, as artifacts are deleted over time and
|
||||
# > building from source requires insecure Node 10.
|
||||
# >
|
||||
# > The solution is to version control the UI bundle.
|
||||
# >
|
||||
# > [...]
|
||||
# >
|
||||
# > [1]: https://gitlab.com/antora/antora-ui-default/-/issues/135
|
||||
# > [2]: https://gitlab.com/antora/antora-ui-default/-/issues/211
|
||||
# >
|
||||
# > -- [3]
|
||||
#
|
||||
# To avoid bloating the repository archive size, the UI bundle is not stored
|
||||
# in Nixpkgs.
|
||||
#
|
||||
# For reference, the UI bundle from [3] is 300K large.
|
||||
#
|
||||
# [3]: https://gitlab.com/trueNAHO/antora-ui-default/-/commit/83bf9bf5f22a6dee397f8b089eb0315c14a278b5
|
||||
src = fetchFromGitLab srcFetchFromGitLab;
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
# Install '$src/ui-bundle.zip' to '$out/ui-bundle.zip' instead of '$out' to
|
||||
# prevent the ZIP from being misidentified as a binary [1].
|
||||
#
|
||||
# [1]: https://github.com/NixOS/nixpkgs/blob/8885a1e21ad43f8031c738a08029cd1d4dcbc2f7/pkgs/stdenv/generic/setup.sh#L792-L795
|
||||
installPhase = ''
|
||||
mkdir --parents "$out"
|
||||
cp "$src/ui-bundle.zip" "$out"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Antora default UI bundle";
|
||||
homepage = "https://gitlab.com/antora/antora-ui-default";
|
||||
license = lib.licenses.mpl20;
|
||||
|
||||
longDescription = ''
|
||||
> A UI bundle is a [ZIP
|
||||
> archive](https://en.wikipedia.org/wiki/Zip_(file_format)) or directory
|
||||
> that contains one or more UIs for a site.
|
||||
>
|
||||
> -- Antora
|
||||
> https://docs.antora.org/antora/3.1/playbook/ui-bundle-url
|
||||
|
||||
This UI bundle is available under `$out/ui-bundle.zip` and intended to be
|
||||
passed to `antora`'s `--ui-bundle-url` flag or injected into the
|
||||
[`ui.bundle.url`
|
||||
key](https://docs.antora.org/antora/3.1/playbook/ui-bundle-url/#url-key)
|
||||
to avoid irreproducible
|
||||
[`https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable`](https://gitlab.com/${srcFetchFromGitLab.owner}/${srcFetchFromGitLab.repo}/-/blob/${srcFetchFromGitLab.rev}/README.adoc#user-content-use-the-default-ui)
|
||||
references.
|
||||
'';
|
||||
|
||||
maintainers = [ lib.maintainers.naho ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
@ -1,4 +1,10 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitLab }:
|
||||
{
|
||||
buildNpmPackage,
|
||||
callPackage,
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "antora";
|
||||
@ -24,11 +30,22 @@ buildNpmPackage rec {
|
||||
ln -s $out/lib/node_modules/antora-build/packages/cli/bin/antora $out/bin/antora
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.run = callPackage ./test { };
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modular documentation site generator. Designed for users of Asciidoctor";
|
||||
mainProgram = "antora";
|
||||
homepage = "https://antora.org";
|
||||
license = licenses.mpl20;
|
||||
maintainers = [ maintainers.ehllie ];
|
||||
mainProgram = "antora";
|
||||
|
||||
maintainers = with maintainers; [
|
||||
ehllie
|
||||
naho
|
||||
];
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
66
pkgs/by-name/an/antora/test/default.nix
Normal file
66
pkgs/by-name/an/antora/test/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{
|
||||
antora,
|
||||
antora-lunr-extension,
|
||||
antora-lunr-extension-test ? false,
|
||||
antora-ui-default,
|
||||
gitMinimal,
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "${antora.pname}${lib.optionalString antora-lunr-extension-test "-${antora-lunr-extension.pname}"}-test";
|
||||
src = ./minimal_working_example;
|
||||
|
||||
postPatch =
|
||||
let
|
||||
date = lib.escapeShellArg "1/1/1970 00:00:00 +0000";
|
||||
in
|
||||
''
|
||||
# > In order to use a local content repository with Antora, even when using
|
||||
# > the worktree (HEAD), the repository must have at least one commit.
|
||||
# >
|
||||
# > -- https://docs.antora.org/antora/3.1/playbook/content-source-url
|
||||
git init &&
|
||||
GIT_AUTHOR_DATE=${date} \
|
||||
GIT_AUTHOR_EMAIL= \
|
||||
GIT_AUTHOR_NAME=Nixpkgs \
|
||||
GIT_COMMITTER_DATE=${date} \
|
||||
GIT_COMMITTER_EMAIL= \
|
||||
GIT_COMMITTER_NAME=Nixpkgs \
|
||||
git commit --allow-empty --allow-empty-message --message ""
|
||||
'';
|
||||
|
||||
buildPhase =
|
||||
let
|
||||
playbook = builtins.toFile "antora-playbook.json" (
|
||||
builtins.toJSON {
|
||||
content.sources = [ { url = "~+"; } ];
|
||||
runtime.log.failure_level = "warn";
|
||||
}
|
||||
);
|
||||
in
|
||||
''
|
||||
# The --to-dir and --ui-bundle-url options are not included in the
|
||||
# playbook due to Antora and Nix limitations.
|
||||
antora ${
|
||||
lib.cli.toGNUCommandLineShell { } {
|
||||
cache-dir = "$(mktemp --directory)";
|
||||
extension = if antora-lunr-extension-test then antora-lunr-extension else false;
|
||||
to-dir = placeholder "out";
|
||||
ui-bundle-url = "${antora-ui-default}/ui-bundle.zip";
|
||||
}
|
||||
} "${playbook}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
antora
|
||||
gitMinimal
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Reproducible Antora test framework";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.naho ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
@ -0,0 +1,7 @@
|
||||
---
|
||||
name: Antora
|
||||
|
||||
nav:
|
||||
- modules/ROOT/nav.adoc
|
||||
|
||||
version: ~
|
@ -0,0 +1 @@
|
||||
* xref:index.adoc[]
|
@ -0,0 +1,3 @@
|
||||
= Antora
|
||||
|
||||
== Minimal Working Example
|
33
pkgs/by-name/ap/apkeditor/arsclib/default.nix
Normal file
33
pkgs/by-name/ap/apkeditor/arsclib/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
lib,
|
||||
REAndroidLibrary,
|
||||
}:
|
||||
|
||||
let
|
||||
self = REAndroidLibrary {
|
||||
pname = "arsclib";
|
||||
# 1.3.5 is not new enough for APKEditor because of API changes
|
||||
version = "1.3.5-unstable-2024-10-21";
|
||||
projectName = "ARSCLib";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "REAndroid";
|
||||
repo = "ARSCLib";
|
||||
# This is the latest commit at the time of packaging.
|
||||
# It can be changed to a stable release ("V${version}")
|
||||
# if it is compatible with APKEditor.
|
||||
rev = "ed6ccf00e56d7cce13e8648ad46a2678a6093248";
|
||||
hash = "sha256-jzd7xkc4O+P9hlGsFGGl2P3pqVvV5+mDyKTRUuGfFSA=";
|
||||
};
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
pkg = self;
|
||||
data = ./deps.json;
|
||||
};
|
||||
|
||||
meta.license = lib.licenses.asl20;
|
||||
};
|
||||
in
|
||||
self
|
17
pkgs/by-name/ap/apkeditor/arsclib/deps.json
generated
Normal file
17
pkgs/by-name/ap/apkeditor/arsclib/deps.json
generated
Normal file
@ -0,0 +1,17 @@
|
||||
{
|
||||
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
|
||||
"!version": 1,
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
"junit#junit/4.12": {
|
||||
"jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=",
|
||||
"pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
|
||||
},
|
||||
"org/hamcrest#hamcrest-core/1.3": {
|
||||
"jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
|
||||
"pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
|
||||
},
|
||||
"org/hamcrest#hamcrest-parent/1.3": {
|
||||
"pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
|
||||
}
|
||||
}
|
||||
}
|
41
pkgs/by-name/ap/apkeditor/fix-gradle.patch
Normal file
41
pkgs/by-name/ap/apkeditor/fix-gradle.patch
Normal file
@ -0,0 +1,41 @@
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 97fd54f..128a269 100755
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -5,8 +5,8 @@ group 'com.reandroid.apkeditor'
|
||||
version '1.4.1'
|
||||
|
||||
java {
|
||||
- sourceCompatibility JavaVersion.VERSION_1_8
|
||||
- targetCompatibility JavaVersion.VERSION_1_8
|
||||
+ sourceCompatibility JavaVersion.VERSION_17
|
||||
+ targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
if (JavaVersion.current().isJava8Compatible()) {
|
||||
@@ -22,13 +22,13 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
//implementation("io.github.reandroid:ARSCLib:+")
|
||||
- compile(files("$rootProject.projectDir/libs/ARSCLib.jar"))
|
||||
+ implementation(files("$rootProject.projectDir/libs/ARSCLib.jar"))
|
||||
|
||||
// built from: https://github.com/REAndroid/smali-lib
|
||||
- compile(files("$rootProject.projectDir/libs/smali.jar"))
|
||||
+ implementation(files("$rootProject.projectDir/libs/smali.jar"))
|
||||
|
||||
// built from: https://github.com/REAndroid/JCommand
|
||||
- compile(files("$rootProject.projectDir/libs/JCommand.jar"))
|
||||
+ implementation(files("$rootProject.projectDir/libs/JCommand.jar"))
|
||||
}
|
||||
|
||||
processResources {
|
||||
@@ -52,7 +52,7 @@ task fatJar(type: Jar) {
|
||||
'Main-Class': 'com.reandroid.apkeditor.Main'
|
||||
)
|
||||
}
|
||||
- from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||
+ from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||
with jar
|
||||
}
|
||||
|
33
pkgs/by-name/ap/apkeditor/jcommand/default.nix
Normal file
33
pkgs/by-name/ap/apkeditor/jcommand/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
lib,
|
||||
REAndroidLibrary,
|
||||
}:
|
||||
|
||||
let
|
||||
self = REAndroidLibrary {
|
||||
pname = "jcommand";
|
||||
version = "0-unstable-2024-09-20";
|
||||
projectName = "JCommand";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "REAndroid";
|
||||
repo = "JCommand";
|
||||
# No tagged releases, and
|
||||
# it is hard to determine the actual commit that APKEditor is intended to use,
|
||||
# so I think we should use the latest commit that doesn't break compilation or basic functionality.
|
||||
# Currently this is the latest commit at the time of packaging.
|
||||
rev = "714b6263c28dabb34adc858951cf4bc60d6c3fed";
|
||||
hash = "sha256-6Em+1ddUkZBCYWs88qtfeGnxISZchFrHgDL8fsgZoQg=";
|
||||
};
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
pkg = self;
|
||||
data = ./deps.json;
|
||||
};
|
||||
|
||||
meta.license = lib.licenses.asl20;
|
||||
};
|
||||
in
|
||||
self
|
17
pkgs/by-name/ap/apkeditor/jcommand/deps.json
generated
Normal file
17
pkgs/by-name/ap/apkeditor/jcommand/deps.json
generated
Normal file
@ -0,0 +1,17 @@
|
||||
{
|
||||
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
|
||||
"!version": 1,
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
"junit#junit/4.12": {
|
||||
"jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=",
|
||||
"pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
|
||||
},
|
||||
"org/hamcrest#hamcrest-core/1.3": {
|
||||
"jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
|
||||
"pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
|
||||
},
|
||||
"org/hamcrest#hamcrest-parent/1.3": {
|
||||
"pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
|
||||
}
|
||||
}
|
||||
}
|
110
pkgs/by-name/ap/apkeditor/package.nix
Normal file
110
pkgs/by-name/ap/apkeditor/package.nix
Normal file
@ -0,0 +1,110 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
callPackage,
|
||||
|
||||
jre,
|
||||
gradle,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
let
|
||||
REAndroidLibrary =
|
||||
args:
|
||||
let
|
||||
inherit (args) pname version projectName;
|
||||
outJar = "share/${projectName}/${projectName}.jar";
|
||||
self = stdenv.mkDerivation (
|
||||
{
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
buildInputs = [ jre ];
|
||||
nativeBuildInputs = [ gradle ];
|
||||
|
||||
gradleFlags = [ "-Dfile.encoding=utf-8" ];
|
||||
gradleBuildTask = "jar";
|
||||
doCheck = true;
|
||||
|
||||
inherit outJar;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 build/libs/*.jar $out/${outJar}
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
// args
|
||||
// {
|
||||
meta = {
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # mitm cache
|
||||
];
|
||||
} // args.meta;
|
||||
}
|
||||
);
|
||||
in
|
||||
self;
|
||||
|
||||
arsclib = callPackage ./arsclib { inherit REAndroidLibrary; };
|
||||
smali = callPackage ./smali { inherit REAndroidLibrary; };
|
||||
jcommand = callPackage ./jcommand { inherit REAndroidLibrary; };
|
||||
|
||||
apkeditor =
|
||||
let
|
||||
pname = "apkeditor";
|
||||
version = "1.4.1";
|
||||
projectName = "APKEditor";
|
||||
in
|
||||
REAndroidLibrary {
|
||||
inherit pname version projectName;
|
||||
|
||||
# When you need to update **/deps.json for the dependencies (e.g. for smali),
|
||||
# run `nix build apkeditor.passthru.deps.smali.mitmCache.updateScript`.
|
||||
passthru.deps = {
|
||||
inherit arsclib smali jcommand;
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "REAndroid";
|
||||
repo = "APKEditor";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-a72j9qGjJXnTFeqLez2rhBSArFVYCX+Xs7NQd8CY5Yk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove this patch after REAndroid/APKEditor#144 is merged
|
||||
./fix-gradle.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
gradleBuildTask = "fatJar";
|
||||
|
||||
# The paths libs/*.jar are hardcoded in build.gradle of APKEditor:
|
||||
# https://github.com/REAndroid/APKEditor/blob/V1.4.1/build.gradle#L24-L31
|
||||
preConfigure = ''
|
||||
ln -sf ${arsclib}/${arsclib.outJar} libs/ARSCLib.jar
|
||||
ln -sf ${smali}/${smali.outJar} libs/smali.jar
|
||||
ln -sf ${jcommand}/${jcommand.outJar} libs/JCommand.jar
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${lib.getExe jre} $out/bin/APKEditor \
|
||||
--add-flags "-jar $out/${apkeditor.outJar}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Powerful android apk resources editor";
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "APKEditor";
|
||||
};
|
||||
};
|
||||
in
|
||||
apkeditor
|
57
pkgs/by-name/ap/apkeditor/smali/default.nix
Normal file
57
pkgs/by-name/ap/apkeditor/smali/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
lib,
|
||||
REAndroidLibrary,
|
||||
}:
|
||||
|
||||
let
|
||||
self = REAndroidLibrary {
|
||||
pname = "smali";
|
||||
version = "0-unstable-2024-10-15";
|
||||
projectName = "smali";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "REAndroid";
|
||||
repo = "smali-lib";
|
||||
# No tagged releases, and
|
||||
# it is hard to determine the actual commit that APKEditor is intended to use,
|
||||
# so I think we should use the latest commit that doesn't break compilation or basic functionality.
|
||||
# Currently this is the latest commit at the time of packaging.
|
||||
rev = "c781eafb31f526abce9fdf406ce2c925fec20d28";
|
||||
hash = "sha256-6tkvikgWMUcKwzsgbfpxlB6NZBAlZtTE34M3qPQw7Y4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove this patch after REAndroid/smali-lib#1 is merged
|
||||
./fix-gradle.patch
|
||||
];
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
pkg = self;
|
||||
data = ./deps.json;
|
||||
};
|
||||
gradleBuildTask = "build";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 smali/build/libs/*-fat.jar $out/${self.outJar}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# This fork deleted the NOTICE file from the original repo:
|
||||
# https://github.com/REAndroid/smali-lib/commit/40c075a1ff5fa8e29f339f4e71f45c028789c86c#diff-dfb14fbb9e7d095209ec4cfd621069437bf9c442ff9de9d4ce889781bd0fefcf
|
||||
# Here is the gist of the original NOTICE file:
|
||||
# Various portions of the code are from AOSP and is licensed under Apache 2.0.
|
||||
# Other parts are copyrighted by JesusFreke and Google,
|
||||
# permitting redistribution (with or without modification) of source and binary
|
||||
# as long as the copyright notice is present.
|
||||
# For full details, see:
|
||||
# https://github.com/JesusFreke/smali/blob/master/NOTICE
|
||||
meta.license = with lib.licenses; [
|
||||
asl20
|
||||
free
|
||||
];
|
||||
};
|
||||
in
|
||||
self
|
86
pkgs/by-name/ap/apkeditor/smali/deps.json
generated
Normal file
86
pkgs/by-name/ap/apkeditor/smali/deps.json
generated
Normal file
@ -0,0 +1,86 @@
|
||||
{
|
||||
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
|
||||
"!version": 1,
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
"antlr#antlr/2.7.7": {
|
||||
"jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=",
|
||||
"pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc="
|
||||
},
|
||||
"com/beust#jcommander/1.48": {
|
||||
"jar": "sha256-pzE/z94HCTDkDsee3zxZSM805PDSXLOgn5lj2L3YQRM=",
|
||||
"pom": "sha256-EH4aAn6KszS4H7KJYGDba68y430uME5glCNtPn6ymQM="
|
||||
},
|
||||
"de/jflex#jflex-parent/1.6.1": {
|
||||
"pom": "sha256-zgOPd5P3f7eO+hFMMyjlx37OF9MzRfB7TsCm4U4WB1k="
|
||||
},
|
||||
"de/jflex#jflex/1.6.1": {
|
||||
"jar": "sha256-EsuEWC3TPm3O2yTaSwwf6AdfxjkWx8xt8UCHDPHpKbY=",
|
||||
"pom": "sha256-MXynvUMHgykKCEHUwxEvcbyY1aR+6cyIaZXEFChcnes="
|
||||
},
|
||||
"junit#junit/4.12": {
|
||||
"jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=",
|
||||
"pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
|
||||
},
|
||||
"org/antlr#ST4/4.0.8": {
|
||||
"jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=",
|
||||
"pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw="
|
||||
},
|
||||
"org/antlr#antlr-master/3.5.2": {
|
||||
"pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y="
|
||||
},
|
||||
"org/antlr#antlr-runtime/3.5.2": {
|
||||
"jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=",
|
||||
"pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU="
|
||||
},
|
||||
"org/antlr#antlr/3.5.2": {
|
||||
"jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=",
|
||||
"pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ="
|
||||
},
|
||||
"org/antlr#stringtemplate/3.2.1": {
|
||||
"jar": "sha256-9mznLpZeUwHLDwIOVNK6atdv65Gzy/ww278AwGpt9tc=",
|
||||
"pom": "sha256-tF6CZVqlpI8z0TpD5DRUJrFWM1s14kta6hLbWCPBahY="
|
||||
},
|
||||
"org/apache/ant#ant-launcher/1.7.0": {
|
||||
"jar": "sha256-crPQPg19hqVlE+w43UzWq+PaZiAYm+IiqyVTUstuuko=",
|
||||
"pom": "sha256-0p0myykG6cOYOBvUhz7KuwTWMO9hNDXssUmoWirvyvQ="
|
||||
},
|
||||
"org/apache/ant#ant-parent/1.7.0": {
|
||||
"pom": "sha256-GlLYNxpsvG4F7b8CZGcXEX3SNERZvulnAU8EH9zzCJM="
|
||||
},
|
||||
"org/apache/ant#ant/1.7.0": {
|
||||
"jar": "sha256-kvcjB+dEDx41LJFvJDjSu6s//Sz3MMcTFhF60Eq63qg=",
|
||||
"pom": "sha256-fAIXQD9XogDLgNSJiSzgTqdi8qEzq+PdOEcGUUNM+vI="
|
||||
},
|
||||
"org/hamcrest#hamcrest-core/1.3": {
|
||||
"jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
|
||||
"pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
|
||||
},
|
||||
"org/hamcrest#hamcrest-parent/1.3": {
|
||||
"pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
|
||||
},
|
||||
"org/mockito#mockito-core/1.10.19": {
|
||||
"jar": "sha256-1YMe5PcQVYAIIaNKMFHPHtWzcC8pX/69UPZftdgacbg=",
|
||||
"pom": "sha256-cVJo2AC6zQcjbuHm9EB2UOYc+XlzO8Ji5N4V+9E7kg0="
|
||||
},
|
||||
"org/objenesis#objenesis-parent/2.1": {
|
||||
"pom": "sha256-NDsaMJNBDj+ybGaZhCOrOJw6dEHNGohZvTJ90VtHmqQ="
|
||||
},
|
||||
"org/objenesis#objenesis/2.1": {
|
||||
"jar": "sha256-x0MwzGuAbIBP0350SHtP5dfCdQxeFfvG76E73uG974A=",
|
||||
"pom": "sha256-QFTxhhN+O4SafCPJ6EbNV9ii/jLBfUxivUIFEtdMPT8="
|
||||
},
|
||||
"org/sonatype/oss#oss-parent/3": {
|
||||
"pom": "sha256-DCeIkmfAlGJEYRaZcJPGcVzMAMKzqVTmZDRDDY9Nrt4="
|
||||
},
|
||||
"org/sonatype/oss#oss-parent/7": {
|
||||
"pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
|
||||
},
|
||||
"org/sonatype/oss#oss-parent/9": {
|
||||
"pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
|
||||
},
|
||||
"org/xbib/gradle/plugin#gradle-plugin-jflex/1.1.0": {
|
||||
"jar": "sha256-nfON5Bsazk30I3o2pAw8k0qzVWBomj9b6DiwfQ3jn3g=",
|
||||
"pom": "sha256-Ikxjj1TL8LCYxDw6GylqmsF/dfYC9m65szjnkqr6C5g="
|
||||
}
|
||||
}
|
||||
}
|
87
pkgs/by-name/ap/apkeditor/smali/fix-gradle.patch
Normal file
87
pkgs/by-name/ap/apkeditor/smali/fix-gradle.patch
Normal file
@ -0,0 +1,87 @@
|
||||
diff --git a/baksmali/build.gradle b/baksmali/build.gradle
|
||||
index d346970e..eaddfa27 100644
|
||||
--- a/baksmali/build.gradle
|
||||
+++ b/baksmali/build.gradle
|
||||
@@ -25,7 +25,7 @@ task fatJar(type: Jar) {
|
||||
from sourceSets.main.output
|
||||
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||
|
||||
- classifier = 'fat'
|
||||
+ archiveClassifier = 'fat'
|
||||
|
||||
manifest {
|
||||
attributes('Main-Class': 'org.jf.baksmali.Main')
|
||||
@@ -36,6 +36,10 @@ task fatJar(type: Jar) {
|
||||
ant.symlink(link: file("${destinationDirectory.get()}/baksmali.jar"), resource: archivePath, overwrite: true)
|
||||
}
|
||||
}
|
||||
+
|
||||
+ // Necessary on Gradle 7 to eplicitly set dependency
|
||||
+ dependsOn project(':util').jar
|
||||
+ dependsOn project(':dexlib2').jar
|
||||
}
|
||||
tasks.getByPath('build').dependsOn(fatJar)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 5656b634..e519c53e 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -30,8 +30,8 @@ subprojects {
|
||||
version = parent.version
|
||||
|
||||
java {
|
||||
- sourceCompatibility JavaVersion.VERSION_1_8
|
||||
- targetCompatibility JavaVersion.VERSION_1_8
|
||||
+ sourceCompatibility JavaVersion.VERSION_17
|
||||
+ targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
ext {
|
||||
diff --git a/dexlib2/build.gradle b/dexlib2/build.gradle
|
||||
index e1c39897..fc45707c 100644
|
||||
--- a/dexlib2/build.gradle
|
||||
+++ b/dexlib2/build.gradle
|
||||
@@ -18,4 +18,7 @@ task ragel(type:Exec) {
|
||||
'SyntheticAccessorFSM.rl'
|
||||
}
|
||||
|
||||
-
|
||||
+test {
|
||||
+ // Since Java 9, this is needed. See https://stackoverflow.com/a/41265267
|
||||
+ jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
|
||||
+}
|
||||
diff --git a/smali/build.gradle b/smali/build.gradle
|
||||
index 6ec5f483..2b3bb771 100644
|
||||
--- a/smali/build.gradle
|
||||
+++ b/smali/build.gradle
|
||||
@@ -57,13 +57,17 @@ dependencies {
|
||||
|
||||
processResources.inputs.property('version', version)
|
||||
processResources.expand('version': version)
|
||||
+processResources.configure {
|
||||
+ // Necessary on Gradle 7 to eplicitly set dependency
|
||||
+ dependsOn generateGrammarSource
|
||||
+}
|
||||
|
||||
// Build a separate jar that contains all dependencies
|
||||
task fatJar(type: Jar, dependsOn: jar) {
|
||||
from sourceSets.main.output
|
||||
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||
|
||||
- classifier = 'fat'
|
||||
+ archiveClassifier = 'fat'
|
||||
|
||||
manifest {
|
||||
attributes('Main-Class': 'org.jf.smali.Main')
|
||||
@@ -74,6 +78,11 @@ task fatJar(type: Jar, dependsOn: jar) {
|
||||
ant.symlink(link: file("${destinationDirectory.get()}/smali.jar"), resource: archivePath, overwrite: true)
|
||||
}
|
||||
}
|
||||
+
|
||||
+ // Necessary on Gradle 7 to eplicitly set dependency
|
||||
+ dependsOn project(':util').jar
|
||||
+ dependsOn project(':dexlib2').jar
|
||||
+ dependsOn project(':baksmali').jar
|
||||
}
|
||||
tasks.getByPath('build').dependsOn(fatJar)
|
||||
|
@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.71.118";
|
||||
version = "1.71.121";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-6ERUWUb4GL+kuI0j8VI3vERR3HFfb1gYL4d+hBTcw5w=";
|
||||
hash = "sha256-+MBZXtgaEiTqEd63HpPbi4KjHOHPRRcf8q3QDe+YsKk=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.hostPlatform.isx86_64 then
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.71.118";
|
||||
version = "1.71.121";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-SnpYAJmqBRfECQrlOvgxwQI1k7j0tfctJG7Tt93afe8=";
|
||||
hash = "sha256-sc2FFSttm9+yh8atJQ6KS5ZL87Ov9vUXJeVKYTPNpy0=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
43
pkgs/by-name/co/coc-css/package.nix
Normal file
43
pkgs/by-name/co/coc-css/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
yarnInstallHook,
|
||||
nodejs,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coc-css";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-css";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ASFg5LM1NbpK+Df1TPs+O13WmZktw+BtfsCJagF5nUc=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-JJXpsccO9MZ0D15JUZtTebX1zUMgwGEzSOm7auw5pQo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
nodejs
|
||||
yarnInstallHook
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Css language server extension for coc.nvim";
|
||||
homepage = "https://github.com/neoclide/coc-css";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pyrox0 ];
|
||||
};
|
||||
})
|
2192
pkgs/by-name/co/coppwr/Cargo.lock
generated
2192
pkgs/by-name/co/coppwr/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,30 +1,31 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libxkbcommon
|
||||
, pipewire
|
||||
, libGL
|
||||
, wayland
|
||||
, xorg
|
||||
, vulkan-loader
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libxkbcommon,
|
||||
pipewire,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
libGL,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "coppwr";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dimtpap";
|
||||
repo = "coppwr";
|
||||
rev = version;
|
||||
hash = "sha256-7z1b++itHoqVX5KB9gv6dMAzq1j7VDGYzuJArUDPlD4=";
|
||||
hash = "sha256-5TgK/0UN05P3WENch4sBo/Sy9FaMmyH/gZ+6qUyM1z0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"egui_node_graph-0.4.0" = "sha256-VtHgKWh+bHSFltNgYaFmYhZW9tqwiWJjiCCspeKgSXQ=";
|
||||
"egui_node_graph-0.4.0" = "sha256-OajIef0tSuZ5bFauAeHtN/LQlo+k7k9g0azHDk3HOQc=";
|
||||
"libspa-0.8.0" = "sha256-X8mwLtuPuMxZY71GNPAgiJGJ9JNMj7AbCliXiBxJ4vQ=";
|
||||
};
|
||||
};
|
||||
@ -37,13 +38,13 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
pipewire
|
||||
libGL
|
||||
vulkan-loader
|
||||
wayland
|
||||
libGL
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libX11
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
@ -64,15 +65,21 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postFixup = ''
|
||||
patchelf $out/bin/coppwr \
|
||||
--add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]}
|
||||
--add-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
libxkbcommon
|
||||
wayland
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Low level control GUI for the PipeWire multimedia server";
|
||||
homepage = "https://github.com/dimtpap/coppwr";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ravenz46 ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ ravenz46 ];
|
||||
mainProgram = "coppwr";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -1,51 +1,49 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitLab
|
||||
, extra-cmake-modules
|
||||
, botan3
|
||||
, karchive
|
||||
, kauth
|
||||
, libdrm
|
||||
, hwdata
|
||||
, mesa-demos
|
||||
, polkit
|
||||
, procps
|
||||
, pugixml
|
||||
, spdlog
|
||||
, util-linux
|
||||
, vulkan-tools
|
||||
, qtbase
|
||||
, qtcharts
|
||||
, qtquickcontrols2
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtxmlpatterns
|
||||
, quazip
|
||||
, wrapQtAppsHook
|
||||
} :
|
||||
{
|
||||
botan3,
|
||||
extra-cmake-modules,
|
||||
fetchFromGitLab,
|
||||
hwdata,
|
||||
lib,
|
||||
libdrm,
|
||||
libsForQt5,
|
||||
mesa-demos,
|
||||
polkit,
|
||||
procps,
|
||||
pugixml,
|
||||
spdlog,
|
||||
stdenv,
|
||||
util-linux,
|
||||
vulkan-tools,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corectrl";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "corectrl";
|
||||
repo = "corectrl";
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-WOljOakh177om7tLlroFwWO4gYsarfTCeVXX6+dmZs4=";
|
||||
};
|
||||
patches = [
|
||||
./polkit-dir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
botan3
|
||||
karchive
|
||||
kauth
|
||||
libdrm
|
||||
libdrm # TODO: report upstream that libdrm is not detected at configure time
|
||||
libsForQt5.karchive
|
||||
libsForQt5.kauth
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtcharts
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtxmlpatterns
|
||||
libsForQt5.quazip
|
||||
mesa-demos
|
||||
polkit
|
||||
procps
|
||||
@ -53,31 +51,31 @@ stdenv.mkDerivation rec{
|
||||
spdlog
|
||||
util-linux
|
||||
vulkan-tools
|
||||
qtbase
|
||||
qtcharts
|
||||
qtquickcontrols2
|
||||
qtsvg
|
||||
qttools
|
||||
qtxmlpatterns
|
||||
quazip
|
||||
];
|
||||
|
||||
patches = [
|
||||
./polkit-dir.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids"
|
||||
"-DINSTALL_DBUS_FILES_IN_PREFIX=true"
|
||||
"-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions"
|
||||
"-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids"
|
||||
];
|
||||
|
||||
runtimeDeps = [ hwdata mesa-demos vulkan-tools util-linux procps ];
|
||||
binPath = lib.makeBinPath runtimeDeps;
|
||||
runtimeInputs = [
|
||||
hwdata
|
||||
mesa-demos
|
||||
procps
|
||||
util-linux
|
||||
vulkan-tools
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
qrWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapQtApp $out/bin/corectrl --prefix PATH ":" ${binPath}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/corectrl/corectrl/";
|
||||
description = "Control your computer hardware via application profiles";
|
||||
longDescription = ''
|
||||
@ -85,8 +83,8 @@ stdenv.mkDerivation rec{
|
||||
to control with ease your computer hardware using application profiles. It
|
||||
aims to be flexible, comfortable and accessible to regular users.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ Scrumplex ];
|
||||
};
|
||||
}
|
||||
# TODO: report upstream that libdrm is not detected at configure time
|
||||
})
|
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "decker";
|
||||
version = "1.47";
|
||||
version = "1.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnEarnest";
|
||||
repo = "Decker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r0vBg9/IT9RQBea+XQSc270Q0+D3HzxbzdZV9oIh5vA=";
|
||||
hash = "sha256-2va11qci/BEN6clw3aDjZA2EVaW1WF93bU44wPYyKrA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -1,13 +1,41 @@
|
||||
{ buildGoModule
|
||||
, dependabot-cli
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lib
|
||||
, testers
|
||||
{
|
||||
buildGoModule,
|
||||
dependabot-cli,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
testers,
|
||||
dockerTools,
|
||||
makeWrapper,
|
||||
}:
|
||||
let
|
||||
pname = "dependabot-cli";
|
||||
version = "1.41.0";
|
||||
version = "1.57.0";
|
||||
|
||||
# vv Also update this vv
|
||||
tag = "nixpkgs-dependabot-cli-${version}";
|
||||
updateJobProxy = dockerTools.pullImage {
|
||||
imageName = "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy";
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
|
||||
imageDigest = "sha256:cc4a9b7db8ddf3924b6c25cc8a74d9937bf803e64733035809862a1c0a6df984";
|
||||
sha256 = "0wkr0rac7dp1080s4zik5yzi5967gkfylly2148ipgw50sp0sq8s";
|
||||
|
||||
# Don't update this, it's used to refer to the imported image later
|
||||
finalImageName = "dependabot-update-job-proxy";
|
||||
finalImageTag = tag;
|
||||
};
|
||||
updaterGitHubActions = dockerTools.pullImage {
|
||||
imageName = "ghcr.io/dependabot/dependabot-updater-github-actions";
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
|
||||
imageDigest = "sha256:6665b3e26ef97577e83f2dfd0007a73c02b003126e72c0b4b196fe570088ed93";
|
||||
sha256 = "0q7w3yp49wb70gkjjl2syvs75hm1jkva2qslzckwxh73z0kq2z0q";
|
||||
|
||||
# Don't update this, it's used to refer to the imported image later
|
||||
finalImageName = "dependabot-updater-github-actions";
|
||||
finalImageTag = tag;
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -16,10 +44,10 @@ buildGoModule {
|
||||
owner = "dependabot";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CnSDvLcLupWKBp1Wr6E9BScA8VsBlfmmfPwh8cyERZg=";
|
||||
hash = "sha256-ZT1fwDT19uUjp5iG0NLSrc/6PLW/sukAd0w66mLdFVg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vN5r1OtHT16LeJ6iPmHmXTx9Oo+WALhV4PWqzMiUwSA=";
|
||||
vendorHash = "sha256-jSINiETadd0ixzFBilgphi1vJNsRYeDkbaVNk5stTp4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@ -27,17 +55,27 @@ buildGoModule {
|
||||
"-X github.com/dependabot/cli/cmd/dependabot/internal/cmd.version=v${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd dependabot \
|
||||
--bash <($out/bin/dependabot completion bash) \
|
||||
--fish <($out/bin/dependabot completion fish) \
|
||||
--zsh <($out/bin/dependabot completion zsh)
|
||||
|
||||
# Create a wrapper that pins the docker images that are depended upon
|
||||
makeWrapper $out/bin/dependabot $out/bin/dependabot-pinned \
|
||||
--run "docker load --input ${updateJobProxy}" \
|
||||
--add-flags "--proxy-image=dependabot-update-job-proxy:${tag}" \
|
||||
--run "docker load --input ${updaterGitHubActions}" \
|
||||
--add-flags "--updater-image=dependabot-updater-github-actions:${tag}"
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
"-skip=TestIntegration|TestNewProxy_customCert|TestRun"
|
||||
"-skip=TestDependabot"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
@ -57,6 +95,9 @@ buildGoModule {
|
||||
mainProgram = "dependabot";
|
||||
homepage = "https://github.com/dependabot/cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ l0b0 ];
|
||||
maintainers = with maintainers; [
|
||||
l0b0
|
||||
infinisil
|
||||
];
|
||||
};
|
||||
}
|
||||
|
165
pkgs/by-name/gl/glom/package.nix
Normal file
165
pkgs/by-name/gl/glom/package.nix
Normal file
@ -0,0 +1,165 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
mm-common,
|
||||
intltool,
|
||||
itstool,
|
||||
doxygen,
|
||||
graphviz,
|
||||
makeFontsConf,
|
||||
freefont_ttf,
|
||||
boost,
|
||||
libxmlxx3,
|
||||
libxslt,
|
||||
libgdamm,
|
||||
libarchive,
|
||||
libepc,
|
||||
python311,
|
||||
python3,
|
||||
ncurses,
|
||||
glibmm,
|
||||
gtk3,
|
||||
openssl,
|
||||
gtkmm3,
|
||||
goocanvasmm2,
|
||||
evince,
|
||||
isocodes,
|
||||
gtksourceview,
|
||||
gtksourceviewmm,
|
||||
postgresql_15,
|
||||
gobject-introspection,
|
||||
yelp-tools,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glom";
|
||||
version = "1.32.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
"dev"
|
||||
"doc"
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glom/${lib.versions.majorMinor finalAttrs.version}/glom-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-U78gfryoLFY7nme86XdFmhfn/ZTjXCfBlphnNtokjfE=";
|
||||
};
|
||||
|
||||
gda = libgdamm.override {
|
||||
mysqlSupport = true;
|
||||
postgresSupport = true;
|
||||
};
|
||||
|
||||
python = python311.withPackages (
|
||||
pkgs: with pkgs; [
|
||||
pygobject3
|
||||
distutils
|
||||
]
|
||||
);
|
||||
|
||||
python_boost = python311.withPackages (pkgs: with pkgs; [ pygobject3 ]);
|
||||
|
||||
sphinx-build = python311.pkgs.sphinx.overrideAttrs (super: {
|
||||
postFixup =
|
||||
super.postFixup or ""
|
||||
+ ''
|
||||
# Do not propagate Python
|
||||
rm $out/nix-support/propagated-build-inputs
|
||||
'';
|
||||
});
|
||||
|
||||
boost_python = boost.override {
|
||||
enablePython = true;
|
||||
python = finalAttrs.python_boost;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
mm-common
|
||||
intltool
|
||||
(yelp-tools.override {
|
||||
python3 = python311;
|
||||
})
|
||||
itstool
|
||||
doxygen
|
||||
graphviz
|
||||
finalAttrs.sphinx-build
|
||||
wrapGAppsHook3
|
||||
gobject-introspection # for setup hook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
finalAttrs.boost_python
|
||||
glibmm
|
||||
gtk3
|
||||
openssl
|
||||
libxmlxx3
|
||||
libxslt
|
||||
python311.pkgs.pygobject3
|
||||
finalAttrs.gda
|
||||
libarchive
|
||||
libepc
|
||||
finalAttrs.python
|
||||
ncurses # for python
|
||||
gtkmm3
|
||||
goocanvasmm2
|
||||
evince
|
||||
isocodes
|
||||
gtksourceview
|
||||
gtksourceviewmm
|
||||
postgresql_15 # for postgresql utils
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-python=boost_python${lib.versions.major python311.version}${lib.versions.minor python311.version}"
|
||||
"--with-postgres-utils=${lib.getBin postgresql_15}/bin"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"libdocdir=${placeholder "doc"}/share/doc/$(book_name)"
|
||||
"devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)"
|
||||
];
|
||||
|
||||
# Fontconfig error: Cannot load default config file
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "${placeholder "out"}/${python311.sitePackages}"
|
||||
--set PYTHONHOME "${finalAttrs.python}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Easy-to-use database designer and user interface";
|
||||
license = with lib.licenses; [
|
||||
lgpl2
|
||||
gpl2
|
||||
];
|
||||
homepage = "https://gitlab.gnome.org/Archive/glom";
|
||||
maintainers =
|
||||
lib.teams.gnome.members
|
||||
++ (with lib.maintainers; [
|
||||
bot-wxt1221
|
||||
]);
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-sudoku";
|
||||
version = "47.0";
|
||||
version = "47.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz";
|
||||
hash = "sha256-sTu+wgi/LgD+O3Ux+oTyZQqSItXLTD4L4JfTsi81clw=";
|
||||
hash = "sha256-RyW0KDZGaysqzF5RZrU9jrEczd4lh9tofK+MjUc+uIk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-text-editor";
|
||||
version = "47.0";
|
||||
version = "47.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-AwSWGXS9rMfm6NFG2tyUlSffmbKCNYLI0bqLM9JdQhc=";
|
||||
hash = "sha256-3pVkLitA/yZf7s2GuTng/QGOTrK6SZNQ8rrSv8xUAQw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
48
pkgs/by-name/go/go-blueprint/package.nix
Normal file
48
pkgs/by-name/go/go-blueprint/package.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-blueprint";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Melkeydev";
|
||||
repo = "go-blueprint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lIx95DY8UpxTW5Zra0APseuXdknsdZAohiGFdwkHE4s=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-s -w -X github.com/melkeydev/go-blueprint/cmd.GoBlueprintVersion=v${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-WBzToupC1/O70OYHbKk7S73OEe7XRLAAbY5NoLL7xvw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd go-blueprint \
|
||||
--bash <($out/bin/go-blueprint completion bash) \
|
||||
--fish <($out/bin/go-blueprint completion fish) \
|
||||
--zsh <($out/bin/go-blueprint completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Initialize Go projects using popular frameworks";
|
||||
homepage = "https://github.com/Melkeydev/go-blueprint";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tobifroe ];
|
||||
mainProgram = "go-blueprint";
|
||||
};
|
||||
}
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpsprune";
|
||||
version = "24.2";
|
||||
version = "24.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
|
||||
hash = "sha256-wGg7WPj61yx7zMBIdH9ls18BnD1R713U5Vgc/kL9qYs=";
|
||||
hash = "sha256-qQtMSQbhIgYLJbCip6ioWeVphO1DEYudmXKUer04L4Y=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gr-framework";
|
||||
version = "0.73.7";
|
||||
version = "0.73.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sciapp";
|
||||
repo = "gr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Xd1x6RUlre/5oxq0wiVKkIAuGKgtoNY/5aa7dvmn71U=";
|
||||
hash = "sha256-6RgNFGRprke7AUu24VS9iYUcWMWJ/DQ/LIvleyQgza4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "httplib";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhirose";
|
||||
repo = "cpp-httplib";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cR1yRqZ6hZeGtMhiW003zcN0d/f/v1gMMNiL0hA1r6I=";
|
||||
hash = "sha256-NLSflHzxXby+SpLFg32BfRafey48DZ0XULQeyHQJHP4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "ice-bar";
|
||||
version = "0.11.11";
|
||||
version = "0.11.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jordanbaird/Ice/releases/download/${finalAttrs.version}/Ice.zip";
|
||||
hash = "sha256-Iepf+mFN7ym7aZu3xnJVJoQNDZmSFvt15QTGdXtvScs=";
|
||||
hash = "sha256-13DoFZdWbdLSNj/rNQ+AjHqS42PflcUeSBQOsw5FLMk=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
@ -9,11 +9,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "ijhttp";
|
||||
version = "241.14494.240";
|
||||
version = "242.21829.56";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/resources/intellij/http-client/${finalAttrs.version}/intellij-http-client.zip";
|
||||
hash = "sha256-PecGB+gwdQGQbWd401qeCFLbmr9fmIBd7lGwLlRLaGg=";
|
||||
hash = "sha256-MinRCVwEpO/yToOT2zZPxmW58+FhbX2FjEOAtgfkKVk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -28,16 +28,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.3.3";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-W5G7osV4du6w/BfyY9YrDzorcLNizRsoz70RMfO2AbY=";
|
||||
hash = "sha256-hRYHr4r3+LRiaZoJgs3MA5YtDEoKyeg/ohPAIw3OMyo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gJrzOK6vPPBgsQFkKrbMql00XSfKGjgpZhYJLTURxoI=";
|
||||
cargoHash = "sha256-DfTalKTOiReQCreAzbkSjbhMSW5cdOGGg04i/QKPonE=";
|
||||
|
||||
KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
|
||||
|
||||
@ -55,14 +55,12 @@ rustPlatform.buildRustPackage rec {
|
||||
default_config_path = "/etc/kanidm/server.toml";
|
||||
default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
|
||||
htmx_ui_pkg_path = "@htmx_ui_pkg_path@";
|
||||
web_ui_pkg_path = "@web_ui_pkg_path@";
|
||||
};
|
||||
in
|
||||
''
|
||||
cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml
|
||||
substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \
|
||||
--replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg" \
|
||||
--replace-fail '@web_ui_pkg_path@' "$out/ui/pkg"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -80,10 +78,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
# The UI needs to be in place before the tests are run.
|
||||
postBuild = ''
|
||||
# We don't compile the wasm-part form source, as there isn't a rustc for
|
||||
# wasm32-unknown-unknown in nixpkgs yet.
|
||||
mkdir -p $out/ui
|
||||
cp -r server/web_ui/pkg $out/ui/pkg
|
||||
cp -r server/core/static $out/ui/hpkg
|
||||
'';
|
||||
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keepass";
|
||||
version = "2.57";
|
||||
version = "2.57.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/keepass/KeePass-${finalAttrs.version}-Source.zip";
|
||||
hash = "sha256-emJ4QhhIaUowG4SAUzRK6hUendc/H6JH09Js2Ji9PQ0=";
|
||||
hash = "sha256-97ZX1EzhMv4B3YZ3HoUqlGTEMsQn3cmNGr+uvS6AKYY=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "loupe";
|
||||
version = "47.0";
|
||||
version = "47.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-WJOLpnOy92m197ibmFSj1V2/NUH+1eYOCOFGWVEV95E=";
|
||||
hash = "sha256-9gNWmpThcwHy2sNLAsEsbY48pq65vmq1uYM5P5Ve2Ho=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -5,10 +5,10 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-wenkai-tc";
|
||||
version = "1.500";
|
||||
version = "1.501";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz";
|
||||
hash = "sha256-GuGIRgBQTmlKmarEVFmZ2RgYtlw6mz3nfFdWbjlm934=";
|
||||
hash = "sha256-GnllwWRO2Pa7hlehZKrGJr2f4kRJN1JPxtz4UGMbqyg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "maestro";
|
||||
version = "1.38.1";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
|
||||
hash = "sha256-AogEVg8R73x5Q/LxZamGbFacCqB8JZeERqyf+UPXBx0=";
|
||||
hash = "sha256-nvnxk3iyko2pgajmQO8F7N9EpPte3g2i5y+Wyst14mU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -5,13 +5,14 @@
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mbuffer";
|
||||
version = "20240929";
|
||||
version = "20241007";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
|
||||
sha256 = "sha256-77bG3j4kWdI5h3TN1E7Apua4jEEy7eQ9PV4vbBjZpqc=";
|
||||
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${finalAttrs.version}.tgz";
|
||||
sha256 = "sha256-nXNjAQtO9FsWRva19QJ7SbtqIJxQL7hOKBx713HVa+0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -23,12 +24,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Tool for buffering data streams with a large set of unique features";
|
||||
homepage = "https://www.maier-komor.de/mbuffer.html";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux; # Maybe other non-darwin Unix
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
platforms = lib.platforms.linux; # Maybe other non-darwin Unix
|
||||
mainProgram = "mbuffer";
|
||||
};
|
||||
}
|
||||
})
|
@ -1,7 +1,8 @@
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, stdenvNoCC
|
||||
, testers
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
testers,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
@ -24,14 +25,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Show uncommitted, untracked and unpushed changes for multiple Git repos";
|
||||
downloadPage = "https://github.com/fboender/multi-git-status/releases/tag/v${finalAttrs.version}";
|
||||
homepage = "https://github.com/fboender/multi-git-status";
|
||||
changelog = "https://github.com/fboender/multi-git-status/releases/tag/${finalAttrs.src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ getpsyched ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ getpsyched ];
|
||||
mainProgram = "mgitstatus";
|
||||
platforms = platforms.all;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "23.15.0";
|
||||
version = "23.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gZCR7cDSI0gRaTnYADOLpyHe26URo27JXJjnNxr4Jwc=";
|
||||
hash = "sha256-quncE2OfSQUnLOEKsqKGBeONCI67CNRB/egqyf7o+4U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EBLfbdTV15wSTOThzBY0d2KrSJzRaB8vNH53Uwc+XfM=";
|
||||
vendorHash = "sha256-VgSQMY2JyGZ50T4PCdKQNnwnP6hknnxP2AJ15A9aHig=";
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, libsForQt5
|
||||
, fpc
|
||||
, lazarus
|
||||
, xorg
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peazip";
|
||||
version = "9.9.1";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peazip";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hn3EhePmBlj9Zdlij/GMxJPTP6suUm2oThaSKjoKeQQ=";
|
||||
hash = "sha256-dxFGYMq1L7oRGUAfshLTBCXrYL6lzJPu5qIItrjeE5c=";
|
||||
};
|
||||
sourceRoot = "${src.name}/peazip-sources";
|
||||
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
lazarus
|
||||
fpc
|
||||
];
|
@ -2,29 +2,20 @@
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pretix-banktool";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-banktool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vYHjotx1RujPV53Ei7bXAc3kL/3cwbWQB1T3sQ15MFA=";
|
||||
hash = "sha256-x6P+WqrOak5/gmMEmBkHrx6kPsbSOAXbKRbndFG3IJU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
# migrate to pyproject.toml, relax constraints
|
||||
url = "https://github.com/pretix/pretix-banktool/commit/48a8125aba86d70f62c2b1f88bcf21c783402589.patch";
|
||||
hash = "sha256-HbVzWoI5LlNyh0MZnPsLmzu7RMY8/BDfOwgDWMD+k5w=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
|
@ -1,10 +0,0 @@
|
||||
diff --git a/src/pretix/testutils/mock.py b/src/pretix/testutils/mock.py
|
||||
index 66ee3fb52..9d9ba02bd 100644
|
||||
--- a/src/pretix/testutils/mock.py
|
||||
+++ b/src/pretix/testutils/mock.py
|
||||
@@ -38,4 +38,4 @@ def mocker_context():
|
||||
|
||||
|
||||
def get_redis_connection(alias="default", write=True):
|
||||
- return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0)))
|
||||
+ return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0), server_type="redis"))
|
@ -51,13 +51,13 @@ let
|
||||
};
|
||||
|
||||
pname = "pretix";
|
||||
version = "2024.9.0";
|
||||
version = "2024.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L6mTfLIx8kD/5s0Dfp24TEATmjxBXERQjynB0szH3DM=";
|
||||
hash = "sha256-MCiCr00N7894DjckAw3vpxdiNtlgzqivlbSY4A/327E=";
|
||||
};
|
||||
|
||||
npmDeps = buildNpmPackage {
|
||||
@ -65,7 +65,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
|
||||
npmDepsHash = "sha256-zUui5tYINTDKA91WgRV51ilIPFBJpZ+S2fJwW85KJ9k=";
|
||||
npmDepsHash = "sha256-PPcA6TBsU/gGk4wII+w7VZOm65nS7qGjZ/UoQs31s9M=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -87,18 +87,17 @@ python.pkgs.buildPythonApplication rec {
|
||||
# Discover pretix.plugin entrypoints during build and add them into
|
||||
# INSTALLED_APPS, so that their static files are collected.
|
||||
./plugin-build.patch
|
||||
|
||||
# TypeError: FakeServer.get_server() missing 1 required positional argument: 'server_type'
|
||||
./fakeredis-0.25-compat.patch
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"django-phonenumber-field"
|
||||
"dnspython"
|
||||
"importlib-metadata"
|
||||
"kombu"
|
||||
"markdown"
|
||||
"pillow"
|
||||
"protobuf"
|
||||
"pycryptodome"
|
||||
"pyjwt"
|
||||
"python-bidi"
|
||||
"qrcode"
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-pages";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u2POt3v0OpjbauDCX8Uclvqd1+jujvVrzUIYrvDv/qI=";
|
||||
hash = "sha256-0pTFGCgtt/JGviTLsZFwgx93TD8ArLwZGfWoSYv5XuY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, runtimeShell
|
||||
, runCommand
|
||||
, makeWrapper
|
||||
@ -16,12 +17,12 @@
|
||||
, openvpn
|
||||
, electron
|
||||
}: let
|
||||
version = "1.3.4026.10";
|
||||
version = "1.3.4066.51";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pritunl";
|
||||
repo = "pritunl-client-electron";
|
||||
rev = version;
|
||||
sha256 = "sha256-3P2MEQy9RE2dY7aRCGQl+kmVIaRZp6VvrcHQUzhiAEY=";
|
||||
sha256 = "sha256-yoPpDOcTv3kBTHscYn//KseZpfj1HArInODSxPKOFXY=";
|
||||
};
|
||||
|
||||
cli = buildGoModule {
|
||||
@ -34,6 +35,7 @@
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/pritunl-client
|
||||
'';
|
||||
passthru.updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
service = buildGoModule {
|
||||
@ -46,10 +48,10 @@
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
sed -Ei service/profile/scripts.go \
|
||||
sed -Ei service/connection/scripts.go \
|
||||
-e 's|#!\s*(/usr)?/bin/(env )?bash\b|#! ${runtimeShell}|g'
|
||||
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
sed -Ei service/profile/scripts.go \
|
||||
sed -Ei service/connection/scripts.go \
|
||||
-e 's|(/usr)?/s?bin/busctl\b|busctl|g' \
|
||||
-e 's|(/usr)?/s?bin/resolvectl\b|resolvectl|g' \
|
||||
-e 's|(/usr)?/s?bin/ip\b|ip|g'
|
||||
@ -61,7 +63,7 @@
|
||||
mkdir -p $out/lib/systemd/system/
|
||||
cp $src/resources_linux/pritunl-client.service $out/lib/systemd/system/
|
||||
substituteInPlace $out/lib/systemd/system/pritunl-client.service \
|
||||
--replace "/usr" "$out"
|
||||
--replace-warn "/usr" "$out"
|
||||
'';
|
||||
|
||||
postFixup = let
|
||||
@ -87,6 +89,7 @@
|
||||
wrapProgram $out/bin/pritunl-client-service \
|
||||
--prefix PATH : "${lib.makeBinPath ([ openvpn-wrapped ])}"
|
||||
'';
|
||||
passthru.updateScript = nix-update-script { };
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "pritunl-client";
|
||||
@ -123,7 +126,7 @@ in stdenv.mkDerivation {
|
||||
mkdir -p $out/share/applications/
|
||||
cp resources_linux/pritunl-client-electron.desktop $out/share/applications/
|
||||
substituteInPlace $out/share/applications/pritunl-client-electron.desktop \
|
||||
--replace "/usr/lib/pritunl_client_electron/Pritunl" "$out/bin/pritunl-client-electron"
|
||||
--replace-fail "/usr/lib/pritunl_client_electron/Pritunl" "$out/bin/pritunl-client-electron"
|
||||
'' + ''
|
||||
# install shell completions for pritunl-client
|
||||
installShellCompletion --cmd pritunl-client \
|
||||
@ -134,6 +137,7 @@ in stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
meta = with lib; {
|
||||
description = "Pritunl OpenVPN client";
|
||||
homepage = "https://client.pritunl.com/";
|
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qrtool";
|
||||
version = "0.11.5";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sorairolake";
|
||||
repo = "qrtool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2Msc8VTEzpK5eQHxJxNekj6YSqFRX/DN206hvYshiOg=";
|
||||
hash = "sha256-ViDlY60iGNBwCDRgKiNKbsFSXozyzqlTzKpd9NCxrv0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wBEimPiht7VN3lQfPlflrG2L47bfNnipK/JmurKqHrg=";
|
||||
cargoHash = "sha256-Bcu5hyW0uUHkshlBoKNG/NL0XYnrPJa/P8bHdcGjFTc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoctor
|
||||
|
@ -29,11 +29,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtractor";
|
||||
version = "1.1.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";
|
||||
hash = "sha256-Q/6AS9mZwsG+wF/h0xt77s8qpuLwcO1CjoVaX9ta9Qc=";
|
||||
hash = "sha256-ufQUNQvmxxAMIAWusclPzE1zkjz93guvygi6EfAEgH4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -24,15 +24,16 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sunvox";
|
||||
version = "2.1.1c";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
"https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
|
||||
# Upstream removes downloads of older versions, please save bumped versions to archive.org
|
||||
"https://web.archive.org/web/20231204012052/https://www.warmplace.ru/soft/sunvox/sunvox-2.1.1c.zip"
|
||||
# FIXME At the time of writing, archive.org is still recovering from the recent attacks and has not yet re-opened the page saving functionality
|
||||
# https://blog.archive.org/2024/10/21/internet-archive-services-update-2024-10-21/
|
||||
];
|
||||
hash = "sha256-vJ76ELjqP4wo0tCJJd3A9RarpNo8FJaiyZhj+Q7nEGs=";
|
||||
hash = "sha256-7DZyoOz3jDYsuGqbs0PRs6jdWCxBhSDUKk8KVJQm/3o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "terraform-docs";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-docs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XZS+mGp2QsrKS3fPZd0ja4w/CAfPcyzSgwolQ+StER0=";
|
||||
hash = "sha256-NOI9/2zGimsHMvdi2lGwl6YLVGpOET6g9C/l0xUZ/pI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aweKTHQBYYqSp8CymwhnVv1WNQ7cZ1/bJNz7DSo7PKc=";
|
||||
vendorHash = "sha256-/56Y3VE4h//8IlyP8ocMFiorgw/4ee32J5FQYxFCIU8=";
|
||||
|
||||
excludedPackages = [ "scripts" ];
|
||||
|
||||
|
@ -188,5 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
pkgConfigModules = [ "tracker-sparql-3.0" "tinysparql-3.0" ];
|
||||
# Not before <gio/gdesktopappinfo.h> is properly conditioned.
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
@ -32,32 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "totem";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/totem/${lib.versions.major version}/totem-${version}.tar.xz";
|
||||
hash = "sha256-s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4=";
|
||||
hash = "sha256-VmgpHpxkRJhcs//k6k8CEvVMK75g3QERTBqVD5R1nm0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Lower X11 dependency version since we do not have it.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/totem/-/commit/140d9eea70c3101ef3234abb4de5974cb84b13db.patch";
|
||||
hash = "sha256-ohppxqMiH8Ksc9B2e3AXighfM6KVN+RNXYL+fLELSN8=";
|
||||
revert = true;
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/totem/-/commit/2610b4536f73493587e4a5a38e01c9961fcabb96.patch";
|
||||
hash = "sha256-nPfzS+LQuAlyQOz67hCdtx93w2frhgWlg1KGX5bEU38=";
|
||||
revert = true;
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/totem/-/commit/5b871aee5292f25bbf39dca18045732e979e7a68.patch";
|
||||
hash = "sha256-LqQLdgyZkIVc+/hQ5sdBLqhtjCVIMDSs9tjVXwMFodg=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@ -103,9 +83,7 @@ stdenv.mkDerivation rec {
|
||||
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
|
||||
];
|
||||
|
||||
# Tests do not work with GStreamer 1.18.
|
||||
# https://gitlab.gnome.org/GNOME/totem/-/issues/450
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_compile_python.py # patchShebangs requires executable file
|
||||
@ -117,7 +95,7 @@ stdenv.mkDerivation rec {
|
||||
runHook preCheck
|
||||
|
||||
xvfb-run -s '-screen 0 800x600x24' \
|
||||
ninja test
|
||||
meson test --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "1.0-unstable-2024-09-20";
|
||||
version = "1.0-unstable-2024-10-19";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "f8c53f59b012dd56d44ae50cdf90dd1dad6cce23";
|
||||
hash = "sha256-Ee4hN3OnqF/OhKieGtzT4XOhNJIhywCgP6Us0DZTVBI=";
|
||||
rev = "30ac4bdcb1efed3680f746fd8290f1aeb7a6fd27";
|
||||
hash = "sha256-p+N5zOl9Gjd3C0Vx8t4B9njO1aQ8PTcik6WlsQPGKyU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user