Merge staging-next into staging
This commit is contained in:
commit
e4dc7949dc
33
.github/workflows/ofborg-pending.yml
vendored
Normal file
33
.github/workflows/ofborg-pending.yml
vendored
Normal file
|
@ -0,0 +1,33 @@
|
|||
name: "Set pending OfBorg status"
|
||||
on:
|
||||
pull_request_target:
|
||||
|
||||
# Sets the ofborg-eval status to "pending" to signal that we are waiting for
|
||||
# OfBorg even if it is running late. The status will be overwritten by OfBorg
|
||||
# once it starts evaluation.
|
||||
|
||||
# WARNING:
|
||||
# When extending this action, be aware that $GITHUB_TOKEN allows (restricted) write access to
|
||||
# the GitHub repository. This means that it should not evaluate user input in a
|
||||
# way that allows code injection.
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
action:
|
||||
if: github.repository_owner == 'NixOS'
|
||||
permissions:
|
||||
statuses: write
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: "Set pending OfBorg status"
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
curl \
|
||||
-X POST \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
-H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||
-d '{"context": "ofborg-eval", "state": "pending", "description": "Waiting for OfBorg..."}' \
|
||||
"https://api.github.com/repos/NixOS/nixpkgs/commits/${{ github.event.pull_request.head.sha }}/statuses"
|
26
.github/workflows/pending-clear.yml
vendored
26
.github/workflows/pending-clear.yml
vendored
|
@ -1,26 +0,0 @@
|
|||
name: "clear pending status"
|
||||
|
||||
on:
|
||||
check_suite:
|
||||
types: [ completed ]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
action:
|
||||
permissions:
|
||||
statuses: write
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: clear pending status
|
||||
if: github.repository_owner == 'NixOS' && github.event.check_suite.app.name == 'OfBorg'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
curl \
|
||||
-X POST \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
-H "Authorization: token $GITHUB_TOKEN" \
|
||||
-d '{"state": "success", "target_url": " ", "description": " ", "context": "Wait for ofborg"}' \
|
||||
"https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.check_suite.head_sha }}"
|
30
.github/workflows/pending-set.yml
vendored
30
.github/workflows/pending-set.yml
vendored
|
@ -1,30 +0,0 @@
|
|||
name: "set pending status"
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
|
||||
# WARNING:
|
||||
# When extending this action, be aware that $GITHUB_TOKEN allows write access to
|
||||
# the GitHub repository. This means that it should not evaluate user input in a
|
||||
# way that allows code injection.
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
action:
|
||||
permissions:
|
||||
statuses: write
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: set pending status
|
||||
if: github.repository_owner == 'NixOS'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
curl \
|
||||
-X POST \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
-H "Authorization: token $GITHUB_TOKEN" \
|
||||
-d '{"state": "pending", "target_url": " ", "description": "This pending status will be cleared when ofborg starts eval.", "context": "Wait for ofborg"}' \
|
||||
"https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.pull_request.head.sha }}"
|
|
@ -4404,6 +4404,12 @@
|
|||
name = "Fedx sudo";
|
||||
matrix = "fedx:matrix.org";
|
||||
};
|
||||
fee1-dead = {
|
||||
email = "ent3rm4n@gmail.com";
|
||||
github = "fee1-dead";
|
||||
githubId = 43851243;
|
||||
name = "Deadbeef";
|
||||
};
|
||||
fehnomenal = {
|
||||
email = "fehnomenal@fehn.systems";
|
||||
github = "fehnomenal";
|
||||
|
@ -12169,6 +12175,15 @@
|
|||
githubId = 1940568;
|
||||
name = "Sebastian Ball";
|
||||
};
|
||||
seberm = {
|
||||
email = "seberm@seberm.com";
|
||||
github = "seberm";
|
||||
githubId = 212597;
|
||||
name = "Otto Sabart";
|
||||
keys = [{
|
||||
fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3";
|
||||
}];
|
||||
};
|
||||
sebtm = {
|
||||
email = "mail@sebastian-sellmeier.de";
|
||||
github = "SebTM";
|
||||
|
|
|
@ -200,6 +200,10 @@ with lib;
|
|||
type = lines;
|
||||
description = lib.mdDoc ''
|
||||
Extra configuration. Contents will be added verbatim to the configuration file.
|
||||
|
||||
::: {.note}
|
||||
`daemon` should not be added here because it does not work great with the systemd-timer approach the service uses.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsa-lib, dbus, libjack2
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, pkg-config, alsa-lib, dbus, libjack2
|
||||
, python3Packages , meson, ninja }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchgit
|
||||
, automake
|
||||
, alsa-lib
|
||||
, ladspaH
|
||||
, libjack2
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{ lib
|
||||
, a2jmidid
|
||||
, coreutils
|
||||
, libjack2
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
|
@ -8,7 +6,6 @@
|
|||
, pkg-config
|
||||
, pulseaudioFull
|
||||
, qtbase
|
||||
, makeWrapper
|
||||
, mkDerivation
|
||||
, python3
|
||||
}:
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "faustPhysicalModeling";
|
||||
version = "2.41.1";
|
||||
version = "2.50.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grame-cncm";
|
||||
repo = "faust";
|
||||
rev = version;
|
||||
sha256 = "sha256-I5No9J7TLOf++B+lx1RfGY8LBoDAApq/EV8016wH9Hc=";
|
||||
sha256 = "sha256-Q/vrm3WPsjkE3Xf/XEirsJPFXHNSW/Ve3Jbi/5nIrx8=";
|
||||
};
|
||||
|
||||
buildInputs = [ faust2jaqt faust2lv2 ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsa-lib
|
||||
{ lib, stdenv, fetchsvn, cmake, pkg-config, fftwFloat, alsa-lib
|
||||
, zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2
|
||||
, includeDemo ? true }:
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
|
||||
, lv2, makeWrapper, pkg-config, python3, raul, serd, sord, sratom
|
||||
, lv2, pkg-config, python3, raul, serd, sord, sratom
|
||||
, wafHook
|
||||
, suil
|
||||
}:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config
|
||||
, boost, cairo, fftw, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm
|
||||
, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm
|
||||
, zita-convolver, zita-resampler
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, chromaprint
|
||||
, cmake
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, unzip, fetchzip, libX11 }:
|
||||
{ stdenv, lib, fetchFromGitHub, fetchzip, libX11 }:
|
||||
|
||||
let
|
||||
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ fetchurl
|
||||
, fetchpatch
|
||||
, lib
|
||||
, stdenv
|
||||
, pkg-config
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, puredata
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, curl, gnugrep, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }:
|
||||
{ lib, stdenv, curl, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }:
|
||||
let
|
||||
versionForFile = v: builtins.replaceStrings ["."] [""] v;
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchgit
|
||||
, automake
|
||||
, autoreconfHook
|
||||
, lv2
|
||||
, pkg-config
|
||||
|
|
|
@ -39,13 +39,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sonic-pi";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sonic-pi-net";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VRuNhS53okKsCHgKEsJgkpIe9yXFY6d2ghd0nsUQLLM=";
|
||||
hash = "sha256-R+nmjIIDLoGOoCkDvJqejE1DaweHSAV8M2RvdwN5qAQ=";
|
||||
};
|
||||
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, ladspa-sdk, pkgs, ... }:
|
||||
{ lib, stdenv, ladspa-sdk, pkgs, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tap-plugins";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchzip, pkg-config, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }:
|
||||
{ lib, stdenv, fetchzip, pkg-config, lv2, fftw, lv2-cpp-tools, gtkmm2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vocproc";
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
, SDL2
|
||||
, alsa-lib
|
||||
, libaudec
|
||||
, bash
|
||||
, bash-completion
|
||||
, breeze-icons
|
||||
, carla
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, pkg-config
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
|
||||
, boost, miniupnpc, openssl, unbound
|
||||
, zeromq, pcsclite, readline, libsodium, hidapi
|
||||
, randomx, rapidjson
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, cmake
|
||||
, llvmPackages
|
||||
, openssl
|
||||
, pkg-config
|
||||
, stdenv
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch
|
||||
, cmake, pkg-config
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, pkg-config
|
||||
, boost, openssl, unbound
|
||||
, pcsclite, readline, libsodium, hidapi
|
||||
, rapidjson
|
||||
|
|
3905
pkgs/applications/blockchains/teos/add-cargo-lock.patch
Normal file
3905
pkgs/applications/blockchains/teos/add-cargo-lock.patch
Normal file
File diff suppressed because it is too large
Load diff
80
pkgs/applications/blockchains/teos/default.nix
Normal file
80
pkgs/applications/blockchains/teos/default.nix
Normal file
|
@ -0,0 +1,80 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, llvmPackages
|
||||
, openssl
|
||||
, perl
|
||||
, protobuf
|
||||
, rustfmt
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "talaia-labs";
|
||||
repo = "rust-teos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N+srREYsADMTqz3uDXpeCuXrZZ62FopXO7DClGfyk9U=";
|
||||
};
|
||||
|
||||
common.meta = with lib; {
|
||||
homepage = "https://github.com/talaia-labs/rust-teos";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ seberm ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
cargoPatches = [ ./add-cargo-lock.patch ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl # used by openssl-sys to configure
|
||||
protobuf
|
||||
rustfmt
|
||||
llvmPackages.clang
|
||||
];
|
||||
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
in
|
||||
{
|
||||
teos = rustPlatform.buildRustPackage {
|
||||
pname = "teos";
|
||||
cargoSha256 = "sha256-7VYYYSMJ2JP1KuA8sD0X3wInubH/jbA/sgzsTsomyEc=";
|
||||
buildAndTestSubdir = "teos";
|
||||
|
||||
inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH;
|
||||
|
||||
meta = common.meta // {
|
||||
description = "A Lightning watchtower compliant with BOLT13, written in Rust";
|
||||
};
|
||||
|
||||
cargoTestFlags = [
|
||||
"--workspace"
|
||||
];
|
||||
};
|
||||
|
||||
teos-watchtower-plugin = rustPlatform.buildRustPackage {
|
||||
pname = "teos-watchtower-plugin";
|
||||
cargoSha256 = "sha256-xL+DiEfgBYJQ1UJm7LAr1/f34pkU8FRl4Seic8MFAlM=";
|
||||
buildAndTestSubdir = "watchtower-plugin";
|
||||
|
||||
inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH;
|
||||
|
||||
meta = common.meta // {
|
||||
description = "A Lightning watchtower plugin for clightning";
|
||||
};
|
||||
|
||||
# The test is skipped due to following error:
|
||||
# thread 'retrier::tests::test_manage_retry_unreachable' panicked at 'assertion failed:
|
||||
# wt_client.lock().unwrap().towers.get(&tower_id).unwrap().status.is_unreachable()', watchtower-plugin/src/retrier.rs:518:9
|
||||
checkFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--skip=retrier::tests::test_manage_retry_unreachable" ];
|
||||
};
|
||||
}
|
|
@ -1,7 +1,6 @@
|
|||
{ trivialBuild
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, curl
|
||||
, plz
|
||||
, cl-lib
|
||||
, ts
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, trivialBuild
|
||||
{ trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
, popup
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
, trivialBuild
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, trivialBuild
|
||||
, emacs
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, trivialBuild
|
||||
{ trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, trivialBuild
|
||||
{ trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, trivialBuild
|
||||
, emacs
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ symlinkJoin
|
||||
, makeWrapper
|
||||
, geany
|
||||
, lndir
|
||||
, vte
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ avahiSupport ? false # build support for Avahi in libinfinity
|
||||
, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools
|
||||
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome }:
|
||||
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool }:
|
||||
|
||||
let
|
||||
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
{ stdenv
|
||||
, callPackage
|
||||
, runCommand
|
||||
, makeWrapper
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, octave, python3Packages }:
|
||||
{ lib, python3Packages }:
|
||||
|
||||
with python3Packages;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts
|
||||
, coreutils, git, gnused, nix, nixfmt }:
|
||||
{ lib, stdenv, fetchFromGitHub, writeScript, common-updater-scripts
|
||||
, coreutils, git, gnused, nix }:
|
||||
|
||||
let
|
||||
owner = "scopatz";
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
|
||||
, msgpack, neovim, python3Packages, qtbase, qtsvg }:
|
||||
{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "neovim-qt-unwrapped";
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{ stdenv, symlinkJoin, lib, makeWrapper
|
||||
, writeText
|
||||
, bundlerEnv, ruby
|
||||
, nodejs
|
||||
, nodePackages
|
||||
, python3
|
||||
, python3Packages
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper
|
||||
, boost, xercesc, hunspell, zlib, pcre16
|
||||
, qtbase, qttools, qtwebengine, qtxmlpatterns
|
||||
, boost, xercesc, qtbase, qttools, qtwebengine, qtxmlpatterns
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper
|
||||
, atomEnv, at-spi2-atk, autoPatchelfHook
|
||||
, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap
|
||||
, writeShellScriptBin
|
||||
|
||||
# Populate passthru.tests
|
||||
, tests
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
, Cocoa
|
||||
, unixODBC
|
||||
, poppler
|
||||
, hdf4
|
||||
, hdf5
|
||||
, netcdf
|
||||
, sqlite
|
||||
|
|
|
@ -3,14 +3,9 @@
|
|||
, fetchFromGitHub
|
||||
, desktop-file-utils
|
||||
, ffmpeg
|
||||
, gobject-introspection
|
||||
, granite
|
||||
, gtk
|
||||
, imagemagick
|
||||
, libgee
|
||||
, libhandy
|
||||
, libsecret
|
||||
, libsoup
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, GitPython
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, vala
|
||||
, pkg-config
|
||||
, python3
|
||||
|
|
|
@ -4,12 +4,9 @@
|
|||
, wrapQtAppsHook
|
||||
, qtmultimedia
|
||||
, qttools
|
||||
, qtscript
|
||||
, qtdeclarative
|
||||
, qtnetworkauth
|
||||
, qtbase
|
||||
, autogen
|
||||
, automake
|
||||
, makeWrapper
|
||||
, catch2
|
||||
, nodejs
|
||||
|
|
|
@ -6,11 +6,9 @@
|
|||
, openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp
|
||||
, qtmultimedia, qtx11extras, quazip
|
||||
, python3Packages
|
||||
|
||||
, version
|
||||
, kde-channel
|
||||
, sha256
|
||||
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, patchelf, fetchurl, p7zip
|
||||
{ lib, stdenv, fetchurl, p7zip
|
||||
, nss, nspr, libusb1
|
||||
, qtbase, qtmultimedia, qtserialport
|
||||
, autoPatchelfHook, wrapQtAppsHook
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitLab, fetchurl
|
||||
{ lib, fetchFromGitLab, fetchurl
|
||||
, boost, cmake, ffmpeg, qtbase, qtx11extras
|
||||
, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper
|
||||
, mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{lib, stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}:
|
||||
{lib, stdenv, fetchFromGitHub, flex, bison, cmake, zlib}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "2018-08-15";
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
|
||||
, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
|
||||
, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil
|
||||
}:
|
||||
, extra-cmake-modules, poppler, kimageformats, libarchive}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "photoqt";
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, gnustep
|
||||
, gcc
|
||||
, llvmPackages_9
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
|
||||
, cmake
|
||||
, pkg-config
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ python3Packages
|
||||
, qtbase
|
||||
, ghostscript
|
||||
, wrapQtAppsHook
|
||||
, lib
|
||||
}:
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, qt5
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
mkDerivation, lib, kdepimTeam, substituteAll,
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
|
||||
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
|
||||
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ mkDerivation, lib, config
|
||||
, extra-cmake-modules, kdoctools
|
||||
{ mkDerivation, lib, extra-cmake-modules, kdoctools
|
||||
, breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n
|
||||
, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons
|
||||
, libarchive, libzip
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
mkDerivation, lib, kdepimTeam, fetchpatch,
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils,
|
||||
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ mkDerivation
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
mkDerivation, lib, kdepimTeam, fetchpatch,
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
|
||||
kcrash, kdbusaddons, ki18n, kontactinterface, kparts,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }:
|
||||
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, qtscript, kparts, kplotting, kunitconversion }:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kalzium";
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ mkDerivation
|
||||
, extra-cmake-modules
|
||||
, fetchpatch
|
||||
, kcmutils
|
||||
, kconfigwidgets
|
||||
, kdbusaddons
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, mkDerivation
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
, libkdegames, kconfig, kio, ktextwidgets
|
||||
, libkdegames, kio, ktextwidgets
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2,
|
||||
fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n,
|
||||
kwidgetsaddons
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, appstream-glib
|
||||
, clang
|
||||
, desktop-file-utils
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
, libXfixes
|
||||
, libXtst
|
||||
, qtx11extras
|
||||
, git
|
||||
, knotifications
|
||||
, qtwayland
|
||||
, wayland
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages, libspnav, jq }:
|
||||
|
||||
let
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook
|
||||
, secp256k1 }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchFromGitHub, lib, stdenv, fetchpatch, pkg-config, exiv2, libxml2, gtk3
|
||||
{ fetchFromGitHub, lib, stdenv, pkg-config, exiv2, libxml2, gtk3
|
||||
, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
|
||||
{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpx-viewer";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, pkgs
|
||||
, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive
|
||||
, glib, gtk3, gtksourceview3, gtkspell3, poppler, texlive
|
||||
, pkg-config, intltool, autoreconfHook, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, python3, fetchpatch }:
|
||||
{ lib, fetchFromGitHub, python3 }:
|
||||
|
||||
|
||||
let
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }:
|
||||
{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, unwrapped ? callPackage ./runtime.nix {} }:
|
||||
|
||||
buildFHSUserEnv rec {
|
||||
name = "houdini-${unwrapped.version}";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub
|
||||
{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchFromGitHub
|
||||
, cmake, pkg-config, zlib, libpng, makeWrapper
|
||||
, enableGSL ? true, gsl
|
||||
, enableGhostScript ? true, ghostscript
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ mkDerivation
|
||||
, extra-cmake-modules
|
||||
, fetchFromGitHub
|
||||
, kdoctools
|
||||
, kiconthemes
|
||||
, kio
|
||||
, kjobwidgets
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub
|
||||
, callPackage
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtwebengine
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub
|
||||
{ stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config
|
||||
, python3
|
||||
, curl
|
||||
|
@ -11,7 +11,6 @@
|
|||
, gtest
|
||||
}:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kiwix-lib";
|
||||
version = "10.1.1";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg
|
||||
{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg
|
||||
, jbig2dec, libjpeg , darwin
|
||||
, enableX11 ? true, libX11, libXext, libXi, libXrandr
|
||||
, enableCurl ? true, curl, openssl
|
||||
|
|
62
pkgs/applications/misc/pattypan/default.nix
Normal file
62
pkgs/applications/misc/pattypan/default.nix
Normal file
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, unzip
|
||||
, jre
|
||||
, jdk
|
||||
, ant
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, glib
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pattypan";
|
||||
version = "22.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yarl";
|
||||
repo = "pattypan";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qmvlcqhqw5k500v2xdakk340ymgv5amhbfqxib5s4db1w32pi60";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems jdk ant makeWrapper wrapGAppsHook ];
|
||||
buildInputs = [ glib jre ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
|
||||
ant
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share/java
|
||||
cp pattypan.jar $out/share/java/pattypan.jar
|
||||
makeWrapper ${jre}/bin/java $out/bin/pattypan \
|
||||
--add-flags "-cp $out/share/java/pattypan.jar pattypan.Launcher"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
desktopName = "Pattypan";
|
||||
genericName = "An uploader for Wikimedia Commons";
|
||||
categories = [ "Utility" ];
|
||||
exec = "pattypan";
|
||||
name = "pattypan";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://commons.wikimedia.org/wiki/Commons:Pattypan";
|
||||
description = "An uploader for Wikimedia Commons";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ fee1-dead ];
|
||||
};
|
||||
}
|
|
@ -4,7 +4,6 @@
|
|||
, qmake
|
||||
, mkDerivation
|
||||
, qtsvg
|
||||
, libxml2
|
||||
, postgresql
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,30 +1,22 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, bash
|
||||
, cairo
|
||||
, glib
|
||||
, qt5
|
||||
, hicolor-icon-theme
|
||||
, gdk-pixbuf
|
||||
, gettext
|
||||
, imagemagick
|
||||
, desktop-file-utils
|
||||
, ninja
|
||||
, meson
|
||||
, sassc
|
||||
, ibus
|
||||
, usbutils
|
||||
, libxcb
|
||||
, python3Packages
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, libappindicator-gtk3
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "polychromatic";
|
||||
version = "0.7.3";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -41,57 +33,40 @@ python3Packages.buildPythonApplication rec {
|
|||
--replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \
|
||||
--replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass'
|
||||
|
||||
substituteInPlace pylib/common.py --replace "/usr/share/polychromatic" "$out/share/polychromatic"
|
||||
substituteInPlace pylib/common.py \
|
||||
--replace "/usr/share/polychromatic" "$out/share/polychromatic"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
scripts/build-styles.sh
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
openrazer
|
||||
pyqt5
|
||||
pyqtwebengine
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
gettext
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
sassc
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
libxcb
|
||||
colour
|
||||
colorama
|
||||
setproctitle
|
||||
openrazer
|
||||
openrazer-daemon
|
||||
requests
|
||||
ibus
|
||||
usbutils
|
||||
pyqt5
|
||||
libappindicator-gtk3
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
pyqt5
|
||||
desktop-file-utils
|
||||
qt5.wrapQtAppsHook
|
||||
wrapGAppsHook
|
||||
ninja
|
||||
meson
|
||||
sassc
|
||||
];
|
||||
|
||||
propagatedNativeBuildInputs = [
|
||||
gobject-introspection
|
||||
colour
|
||||
gtk3
|
||||
gdk-pixbuf
|
||||
imagemagick
|
||||
openrazer
|
||||
pygobject3
|
||||
pyqt5
|
||||
pyqtwebengine
|
||||
requests
|
||||
setproctitle
|
||||
];
|
||||
|
||||
dontWrapGapps = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"\${qtWrapperArgs[@]}"
|
||||
"\${gappsWrapperArgs[@]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, bash
|
||||
, stdenv
|
||||
, lz4
|
||||
, ffmpeg-full
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }:
|
||||
{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }:
|
||||
|
||||
let
|
||||
version = "2.16.5.1";
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, makeWrapper
|
||||
|
||||
, autoreconfHook
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rofi }:
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-power-menu";
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
, numpy
|
||||
, pyphotonfile
|
||||
, shiboken2
|
||||
, which
|
||||
}:
|
||||
let
|
||||
version = "0.1.3";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake
|
||||
, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib
|
||||
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
|
||||
, bluez
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, bibtool
|
||||
, pybtex
|
||||
, pymupdf
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }:
|
||||
{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wofi";
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl
|
||||
, donateLevel ? 0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv, lib, meson, ninja, fetchurl, fetchpatch
|
||||
, cairo
|
||||
{ stdenv, lib, meson, ninja, fetchurl, cairo
|
||||
, girara
|
||||
, gtk-mac-integration
|
||||
, gumbo
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
, nss
|
||||
, openssl
|
||||
, pango
|
||||
, procps
|
||||
, python3
|
||||
, stdenv
|
||||
, systemd
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libX11, bzip2, zlib
|
||||
{ lib, stdenv, fetchFromGitHub, ncurses, libX11, bzip2, zlib
|
||||
, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev
|
||||
, gpm, libidn, tre, expat
|
||||
, # Incompatible licenses, LGPLv3 - GPLv2
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook
|
||||
{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook
|
||||
|
||||
# Buildtime dependencies.
|
||||
, check, pkg-config, xxd
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, buildFHSUserEnvBubblewrap
|
||||
, callPackage
|
||||
, copyDesktopItems
|
||||
, dpkg
|
||||
, lndir
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue