Merge branch 'master' into staging-next
This commit is contained in:
Martin Weinelt
GitHub
commit
ec8267c539
146
.github/labeler.yml
vendored
Normal file
146
.github/labeler.yml
vendored
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
"6.topic: agda":
|
||||
- doc/languages-frameworks/agda.section.md
|
||||
- nixos/tests/agda.nix
|
||||
- pkgs/build-support/agda/**/*
|
||||
- pkgs/development/libraries/agda/**/*
|
||||
- pkgs/top-level/agda-packages.nix
|
||||
|
||||
"6.topic: cinnamon":
|
||||
- pkgs/desktops/cinnamon/**/*
|
||||
|
||||
"6.topic: emacs":
|
||||
- nixos/modules/services/editors/emacs.nix
|
||||
- nixos/modules/services/editors/emacs.xml
|
||||
- nixos/tests/emacs-daemon.nix
|
||||
- pkgs/applications/editors/emacs-modes/**/*
|
||||
- pkgs/applications/editors/emacs/**/*
|
||||
- pkgs/build-support/emacs/**/*
|
||||
- pkgs/top-level/emacs-packages.nix
|
||||
|
||||
"6.topic: erlang":
|
||||
- doc/languages-frameworks/beam.section.md
|
||||
- pkgs/development/beam-modules/**/*
|
||||
- pkgs/development/interpreters/elixir/**/*
|
||||
- pkgs/development/interpreters/erlang/**/*
|
||||
- pkgs/development/tools/build-managers/rebar/**/*
|
||||
- pkgs/development/tools/build-managers/rebar3/**/*
|
||||
- pkgs/development/tools/erlang/**/*
|
||||
- pkgs/top-level/beam-packages.nix
|
||||
|
||||
"6.topic: fetch":
|
||||
- pkgs/build-support/fetch*/**/*
|
||||
|
||||
"6.topic: GNOME":
|
||||
- doc/languages-frameworks/gnome.section.md
|
||||
- nixos/modules/services/desktops/gnome3/**/*
|
||||
- nixos/modules/services/x11/desktop-managers/gnome3.nix
|
||||
- nixos/tests/gnome3-xorg.nix
|
||||
- nixos/tests/gnome3.nix
|
||||
- pkgs/desktops/gnome-3/**/*
|
||||
|
||||
"6.topic: golang":
|
||||
- doc/languages-frameworks/go.section.md
|
||||
- pkgs/development/compilers/go/**/*
|
||||
- pkgs/development/go-modules/**/*
|
||||
- pkgs/development/go-packages/**/*
|
||||
|
||||
"6.topic: haskell":
|
||||
- doc/languages-frameworks/haskell.section.md
|
||||
- pkgs/development/compilers/ghc/**/*
|
||||
- pkgs/development/haskell-modules/**/*
|
||||
- pkgs/development/tools/haskell/**/*
|
||||
- pkgs/top-level/haskell-packages.nix
|
||||
|
||||
"6.topic: kernel":
|
||||
- pkgs/build-support/kernel/**/*
|
||||
|
||||
"6.topic: lua":
|
||||
- pkgs/development/interpreters/lua-5/**/*
|
||||
- pkgs/development/interpreters/luajit/**/*
|
||||
- pkgs/development/lua-modules/**/*
|
||||
- pkgs/top-level/lua-packages.nix
|
||||
|
||||
"6.topic: nixos":
|
||||
- nixos/**/*
|
||||
|
||||
"6.topic: ocaml":
|
||||
- doc/languages-frameworks/ocaml.section.md
|
||||
- pkgs/development/compilers/ocaml/**/*
|
||||
- pkgs/development/compilers/reason/**/*
|
||||
- pkgs/development/ocaml-modules/**/*
|
||||
- pkgs/development/tools/ocaml/**/*
|
||||
- pkgs/top-level/ocaml-packages.nix
|
||||
|
||||
"6.topic: pantheon":
|
||||
- nixos/modules/services/desktops/pantheon/**/*
|
||||
- nixos/modules/services/x11/desktop-managers/pantheon.nix
|
||||
- nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
|
||||
- nixos/tests/pantheon.nix
|
||||
- pkgs/desktops/pantheon/**/*
|
||||
|
||||
"6.topic: policy discussion":
|
||||
- .github/**/*
|
||||
|
||||
"6.topic: printing":
|
||||
- nixos/modules/services/printing/cupsd.nix
|
||||
- pkgs/misc/cups/**/*
|
||||
|
||||
"6.topic: python":
|
||||
- doc/languages-frameworks/python.section.md
|
||||
- pkgs/development/interpreters/python/**/*
|
||||
- pkgs/development/python-modules/**/*
|
||||
- pkgs/top-level/python-packages.nix
|
||||
|
||||
"6.topic: qt/kde":
|
||||
- doc/languages-frameworks/qt.section.md
|
||||
- nixos/modules/services/x11/desktop-managers/plasma5.nix
|
||||
- nixos/tests/plasma5.nix
|
||||
- pkgs/applications/kde/**/*
|
||||
- pkgs/desktops/plasma-5/**/*
|
||||
- pkgs/development/libraries/kde-frameworks/**/*
|
||||
- pkgs/development/libraries/qt-5/**/*
|
||||
|
||||
"6.topic: ruby":
|
||||
- doc/languages-frameworks/ruby.section.md
|
||||
- pkgs/development/interpreters/ruby/**/*
|
||||
- pkgs/development/ruby-modules/**/*
|
||||
|
||||
"6.topic: rust":
|
||||
- doc/languages-frameworks/rust.section.md
|
||||
- pkgs/build-support/rust/**/*
|
||||
- pkgs/development/compilers/rust/**/*
|
||||
|
||||
"6.topic: stdenv":
|
||||
- pkgs/stdenv/**/*
|
||||
|
||||
"6.topic: steam":
|
||||
- pkgs/games/steam/**/*
|
||||
|
||||
"6.topic: systemd":
|
||||
- pkgs/os-specific/linux/systemd/**/*
|
||||
- nixos/modules/system/boot/systemd*/**/*
|
||||
|
||||
"6.topic: TeX":
|
||||
- doc/languages-frameworks/texlive.section.md
|
||||
- pkgs/tools/typesetting/tex/**/*
|
||||
|
||||
"6.topic: vim":
|
||||
- doc/languages-frameworks/vim.section.md
|
||||
- pkgs/applications/editors/vim/**/*
|
||||
- pkgs/misc/vim-plugins/**/*
|
||||
|
||||
"6.topic: xfce":
|
||||
- nixos/doc/manual/configuration/xfce.xml
|
||||
- nixos/modules/services/x11/desktop-managers/xfce.nix
|
||||
- nixos/tests/xfce.nix
|
||||
- pkgs/desktops/xfce/**/*
|
||||
|
||||
"8.has: changelog":
|
||||
- nixos/doc/manual/release-notes/**/*
|
||||
|
||||
"8.has: documentation":
|
||||
- doc/**/*
|
||||
- nixos/doc/**/*
|
||||
|
||||
"8.has: module (update)":
|
||||
- nixos/modules/**/*
|
||||
14
.github/workflows/labels.yml
vendored
Normal file
14
.github/workflows/labels.yml
vendored
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
name: "Label PR"
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
|
||||
jobs:
|
||||
labels:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: actions/labeler@v3
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
sync-labels: true
|
||||
|
|
@ -746,6 +746,12 @@
|
|||
githubId = 1296771;
|
||||
name = "Anders Riutta";
|
||||
};
|
||||
armijnhemel = {
|
||||
email = "armijn@tjaldur.nl";
|
||||
github = "armijnhemel";
|
||||
githubId = 10587952;
|
||||
name = "Armijn Hemel";
|
||||
};
|
||||
arnarg = {
|
||||
email = "arnarg@fastmail.com";
|
||||
github = "arnarg";
|
||||
|
|
@ -4015,6 +4021,12 @@
|
|||
githubId = 61913481;
|
||||
name = "Mat Marini";
|
||||
};
|
||||
illustris = {
|
||||
email = "me@illustris.tech";
|
||||
github = "illustris";
|
||||
githubId = 3948275;
|
||||
name = "Harikrishnan R";
|
||||
};
|
||||
ilya-fedin = {
|
||||
email = "fedin-ilja2010@ya.ru";
|
||||
github = "ilya-fedin";
|
||||
|
|
@ -9821,6 +9833,16 @@
|
|||
githubId = 16151097;
|
||||
name = "Valentin Gehrke";
|
||||
};
|
||||
tuxinaut = {
|
||||
email = "trash4you@tuxinaut.de";
|
||||
github = "tuxinaut";
|
||||
githubId = 722482;
|
||||
name = "Denny Schäfer";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0xB057455D1E567270";
|
||||
fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270";
|
||||
}];
|
||||
};
|
||||
tv = {
|
||||
email = "tv@krebsco.de";
|
||||
github = "4z3";
|
||||
|
|
@ -10216,6 +10238,12 @@
|
|||
email = "kirill.wedens@gmail.com";
|
||||
name = "wedens";
|
||||
};
|
||||
weihua = {
|
||||
email = "luwh364@gmail.com";
|
||||
github = "weihua-lu";
|
||||
githubId = 9002575;
|
||||
name = "Weihua Lu";
|
||||
};
|
||||
wheelsandmetal = {
|
||||
email = "jakob@schmutz.co.uk";
|
||||
github = "wheelsandmetal";
|
||||
|
|
|
|||
52
pkgs/applications/audio/mpdevil/default.nix
Normal file
52
pkgs/applications/audio/mpdevil/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib, fetchFromGitHub
|
||||
, python3Packages
|
||||
, gdk-pixbuf, glib, gobject-introspection, gtk3
|
||||
, intltool
|
||||
, wrapGAppsHook }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mpdevil";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoongNoonien";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0l7mqv7ys05al2hds4icb32hf14fqi3n7b0f5v1yx54cbl9cqfap";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib.dev gobject-introspection gtk3 intltool wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdk-pixbuf glib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
beautifulsoup4 distutils_extra mpd2 notify-py pygobject3 requests
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
# Prevent double wrapping.
|
||||
dontWrapGApps = true;
|
||||
# Otherwise wrapGAppsHook do not pick up the dependencies correctly.
|
||||
strictDeps = false;
|
||||
# There aren't any checks.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple music browser for MPD";
|
||||
homepage = "https://github.com/SoongNoonien/mpdevil";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bloomvdomino ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b43f02f6..4470abbf 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC)
|
||||
|
||||
include_directories (${CMAKE_SOURCE_DIR})
|
||||
|
||||
-set(Boost_USE_STATIC_LIBS ON)
|
||||
+add_definitions(-DBOOST_LOG_DYN_LINK)
|
||||
set(Boost_USE_MULTITHREADED ON)
|
||||
|
||||
if (BOOST_CUSTOM)
|
||||
|
|
@ -1,28 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL
|
||||
, qtbase}:
|
||||
, qtbase, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "nano-wallet";
|
||||
version = "20.0";
|
||||
version = "21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanocurrency";
|
||||
repo = "raiblocks";
|
||||
repo = "nano-node";
|
||||
rev = "V${version}";
|
||||
sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn";
|
||||
sha256 = "0f6chl5vrzdr4w8g3nivfxk3qm6m11js401998afnhz0xaysm4pm";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Use a patch to force dynamic linking
|
||||
patches = [
|
||||
./CMakeLists.txt.patch
|
||||
];
|
||||
|
||||
cmakeFlags = let
|
||||
options = {
|
||||
PYTHON_EXECUTABLE = "${python}/bin/python";
|
||||
NANO_SHARED_BOOST = "ON";
|
||||
BOOST_ROOT = boost;
|
||||
Boost_USE_STATIC_LIBS = "OFF";
|
||||
RAIBLOCKS_GUI = "ON";
|
||||
RAIBLOCKS_TEST = "ON";
|
||||
Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
|
||||
|
|
@ -37,17 +33,15 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ boost libGL qtbase ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make nano_wallet
|
||||
'';
|
||||
|
||||
# Move executables under bin directory
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
mv $out/nano* $out/bin/
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
./core_test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
130
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
130
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
|
|
@ -4,10 +4,10 @@
|
|||
elpaBuild {
|
||||
pname = "ace-window";
|
||||
ename = "ace-window";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ace-window-0.9.0.el";
|
||||
sha256 = "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3";
|
||||
url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar";
|
||||
sha256 = "1kfyf7za4zc41gf0k3rq8byvwkw7q5pxnyynh5i0gv686zrzak1i";
|
||||
};
|
||||
packageRequires = [ avy ];
|
||||
meta = {
|
||||
|
|
@ -343,10 +343,10 @@
|
|||
elpaBuild {
|
||||
pname = "bnf-mode";
|
||||
ename = "bnf-mode";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/bnf-mode-0.4.4.tar";
|
||||
sha256 = "0acr3x96zknxs90dc9mpnrwiaa81883h36lx5q1lxfn78vjfw14x";
|
||||
url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar";
|
||||
sha256 = "0bj5ffqi54cdrraj5bp4v2cpbxjzly1p467dx1hzrlwv2b1svy2y";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
|
|
@ -497,10 +497,10 @@
|
|||
elpaBuild {
|
||||
pname = "clipboard-collector";
|
||||
ename = "clipboard-collector";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/clipboard-collector-0.2.el";
|
||||
sha256 = "19scspkxgm3b1jkv10jy6nw9gv1q6sfjys09l37mvsva3djxa1dl";
|
||||
url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar";
|
||||
sha256 = "09zxbivmc1zhcj8ksac2a0qpqh74rrx2slnj6cwz1n1nixn19743";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -591,10 +591,10 @@
|
|||
elpaBuild {
|
||||
pname = "company-math";
|
||||
ename = "company-math";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/company-math-1.3.tar";
|
||||
sha256 = "0fc9ms0s9w81sxp3qcfva3n3d2qys0pj19pnm621a6v1xdsc7i1l";
|
||||
url = "https://elpa.gnu.org/packages/company-math-1.4.tar";
|
||||
sha256 = "17p5ib65lg8lj2gwip5qgsznww96pch16pr16b41lls5dx4k6d6z";
|
||||
};
|
||||
packageRequires = [ company math-symbol-lists ];
|
||||
meta = {
|
||||
|
|
@ -940,10 +940,10 @@
|
|||
elpaBuild {
|
||||
pname = "easy-kill";
|
||||
ename = "easy-kill";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/easy-kill-0.9.3.tar";
|
||||
sha256 = "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb";
|
||||
url = "https://elpa.gnu.org/packages/easy-kill-0.9.4.tar";
|
||||
sha256 = "1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
|
|
@ -1118,10 +1118,10 @@
|
|||
elpaBuild {
|
||||
pname = "elisp-benchmarks";
|
||||
ename = "elisp-benchmarks";
|
||||
version = "1.9";
|
||||
version = "1.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar";
|
||||
sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2";
|
||||
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.11.tar";
|
||||
sha256 = "0s1mpapvcivy25zbhw6ghpg0ym23vb4dsrz876rl4z2rfyckxral";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -1884,10 +1884,10 @@
|
|||
elpaBuild {
|
||||
pname = "kiwix";
|
||||
ename = "kiwix";
|
||||
version = "1.0.1";
|
||||
version = "1.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/kiwix-1.0.1.tar";
|
||||
sha256 = "1dly6pilf71hq3mra9kc63i6iynzkxjmp9gwy0rhnvhq4b4qr01d";
|
||||
url = "https://elpa.gnu.org/packages/kiwix-1.0.3.tar";
|
||||
sha256 = "061b816xp8ykqd56z0nvc69aql9y4mba42p6x6vc0j6gr9n3c1j6";
|
||||
};
|
||||
packageRequires = [ emacs request ];
|
||||
meta = {
|
||||
|
|
@ -1929,10 +1929,10 @@
|
|||
elpaBuild {
|
||||
pname = "leaf";
|
||||
ename = "leaf";
|
||||
version = "4.3.2";
|
||||
version = "4.4.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/leaf-4.3.2.tar";
|
||||
sha256 = "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi";
|
||||
url = "https://elpa.gnu.org/packages/leaf-4.4.4.tar";
|
||||
sha256 = "1npg06zmy21kg2qsqgfm03l7vjib697i96awypcdb0hw5mvmc1a1";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2195,31 +2195,54 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
modus-operandi-theme = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, modus-themes }:
|
||||
elpaBuild {
|
||||
pname = "modus-operandi-theme";
|
||||
ename = "modus-operandi-theme";
|
||||
version = "0.12.0";
|
||||
version = "0.13.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el";
|
||||
sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y";
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.1.tar";
|
||||
sha256 = "08l9qmhvxiscxn4mfb80x57mk4gfm5r0fs2l9c8i3gfzd4i3h091";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ emacs modus-themes ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
modus-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "1.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.2.4.tar";
|
||||
sha256 = "0wz6dgkrq4ryvj0kxnzqxwh4i8b9lw15d5dsazjpqa7gfwffpzp0";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/modus-themes.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
modus-vivendi-theme = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, modus-themes }:
|
||||
elpaBuild {
|
||||
pname = "modus-vivendi-theme";
|
||||
ename = "modus-vivendi-theme";
|
||||
version = "0.12.0";
|
||||
version = "0.13.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.12.0.el";
|
||||
sha256 = "01f6z5xjnmki1k9m83jwva42lxidb31pdpwm4wpxjzxqmb96picn";
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.1.tar";
|
||||
sha256 = "0xz304zcc872c2zwnlm8ky0m18smf7bffiyj21ygghgclr7kgma1";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ emacs modus-themes ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/modus-vivendi-theme.html";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -2763,10 +2786,10 @@
|
|||
elpaBuild {
|
||||
pname = "pyim";
|
||||
ename = "pyim";
|
||||
version = "3.5";
|
||||
version = "3.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.5.tar";
|
||||
sha256 = "0593ds3zbmpd6235b8v33f3cb3sn8cwr6arb6zbf1ba97nawjxqs";
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.6.tar";
|
||||
sha256 = "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0";
|
||||
};
|
||||
packageRequires = [ async emacs xr ];
|
||||
meta = {
|
||||
|
|
@ -3103,10 +3126,10 @@
|
|||
elpaBuild {
|
||||
pname = "rich-minority";
|
||||
ename = "rich-minority";
|
||||
version = "1.0.1";
|
||||
version = "1.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rich-minority-1.0.1.el";
|
||||
sha256 = "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc";
|
||||
url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar";
|
||||
sha256 = "1w61qvx2rw6a6gmrm61080zghil95nzdv4w06c0pvyb62m4rwab0";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
|
|
@ -3225,6 +3248,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "setup";
|
||||
ename = "setup";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/setup-0.1.1.tar";
|
||||
sha256 = "0z34m06lxw6xd6bxacm1h5cijamsksk4daf6fbzhd7kqmw3gbgqg";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/setup.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "shelisp";
|
||||
|
|
@ -3797,10 +3835,10 @@
|
|||
elpaBuild {
|
||||
pname = "valign";
|
||||
ename = "valign";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/valign-3.1.0.tar";
|
||||
sha256 = "0zx6p2nlvd4nkffj0myqv4hry8kgnhq45fcivfjzbfn62j2kp293";
|
||||
url = "https://elpa.gnu.org/packages/valign-3.1.1.tar";
|
||||
sha256 = "1nla0zfj0rxwhdjgnsy2c34wzrxfxiwl89cjb6aicyvfxninz7j0";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -4012,10 +4050,10 @@
|
|||
elpaBuild {
|
||||
pname = "which-key";
|
||||
ename = "which-key";
|
||||
version = "3.3.2";
|
||||
version = "3.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar";
|
||||
sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb";
|
||||
url = "https://elpa.gnu.org/packages/which-key-3.5.1.tar";
|
||||
sha256 = "187cssvqpd0wj01rgd19pp1k6aj9m2n5fdqznkga6w1h6cb5cm2b";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210308";
|
||||
version = "20210315";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210308.tar";
|
||||
sha256 = "1i5zga615inn5s547329g6paqbzcbhyj9hxv14c0c1m9bhra5bjs";
|
||||
url = "https://orgmode.org/elpa/org-20210315.tar";
|
||||
sha256 = "128agds82kfmvxshzrs61802vgwlf2dsm79hq9x2bljrnvf8p14l";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -19,10 +19,10 @@
|
|||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210308";
|
||||
version = "20210315";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210308.tar";
|
||||
sha256 = "1agbxhjkkmf4p8p8mwc6sv77ij22dr5fyhkpsnljvzkidiarfldf";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210315.tar";
|
||||
sha256 = "0dih4690pbbnwlphjnv1kgvsw43pkcgk41xjjiphy9sf7w9gr11j";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gophernotes";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopherdata";
|
||||
repo = "gophernotes";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27";
|
||||
sha256 = "sha256-EEMKV+k5qcep4z7J5r1nSLxmb0fbfpJOPmz5bE91cd8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs";
|
||||
vendorSha256 = "sha256-Wy4HcPlrlYUjRQHhw+UPAa+Rn1FvJobWGxgFiJKJTAg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Go kernel for Jupyter notebooks";
|
||||
|
|
|
|||
|
|
@ -270,12 +270,12 @@ in
|
|||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2020.3.2"; /* updated by script */
|
||||
version = "2020.3.3"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "10120y9ccdlhjrpvfnspfj4s7940b3v3yic78r372wj5ns4bsjax"; /* updated by script */
|
||||
sha256 = "10s0jkxi892pg7d2slh7cvrd0ch2223qms3c9v1ax0n6ymfkcw14"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
|
|
@ -296,12 +296,12 @@ in
|
|||
|
||||
goland = buildGoland rec {
|
||||
name = "goland-${version}";
|
||||
version = "2020.3.2"; /* updated by script */
|
||||
version = "2020.3.4"; /* updated by script */
|
||||
description = "Up and Coming Go IDE";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||
sha256 = "00wbl4g1wgb9c287z6i7a48bm5zyb1gkmyqmhasmj0n2vamaq6sz"; /* updated by script */
|
||||
sha256 = "148rs9w0fqr5xzhnq5bd473j4vnb69kf8yxxjmwdp25z2d7x47ip"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "GoLand RELEASE";
|
||||
|
|
@ -309,12 +309,12 @@ in
|
|||
|
||||
idea-community = buildIdea rec {
|
||||
name = "idea-community-${version}";
|
||||
version = "2020.3.2"; /* updated by script */
|
||||
version = "2020.3.3"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||
sha256 = "0zkjmvi27b69xrkn4s6f5788n5yn044phgf48kamfqfs37q4xf1d"; /* updated by script */
|
||||
sha256 = "1msfl8qq0aday4ssip73r0y096mrb89mr7z2j4mpqhkzgsmvpjk0"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
update-channel = "IntelliJ IDEA RELEASE";
|
||||
|
|
@ -322,12 +322,12 @@ in
|
|||
|
||||
idea-ultimate = buildIdea rec {
|
||||
name = "idea-ultimate-${version}";
|
||||
version = "2020.3.2"; /* updated by script */
|
||||
version = "2020.3.3"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
|
||||
sha256 = "1vac21d9p52z4k1dl903rc2dbbcf873xbg8rx1fp9nsaaphnc9lq"; /* updated by script */
|
||||
sha256 = "0szq8lqp1h7kci8kqd1bb3g16j3p5f4dfmbccbyrrwsram3hvjgi"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea";
|
||||
update-channel = "IntelliJ IDEA RELEASE";
|
||||
|
|
@ -335,12 +335,12 @@ in
|
|||
|
||||
mps = buildMps rec {
|
||||
name = "mps-${version}";
|
||||
version = "2020.3.1"; /* updated by script */
|
||||
version = "2020.3.2"; /* updated by script */
|
||||
description = "Create your own domain-specific language";
|
||||
license = lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz";
|
||||
sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */
|
||||
sha256 = "0vskzia48jq50bjdqw993gizvvd59f3qlszbsdp7xg5a3afbk7p3"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-mps";
|
||||
update-channel = "MPS RELEASE";
|
||||
|
|
@ -348,12 +348,12 @@ in
|
|||
|
||||
phpstorm = buildPhpStorm rec {
|
||||
name = "phpstorm-${version}";
|
||||
version = "2020.3.2"; /* updated by script */
|
||||
version = "2020.3.3"; /* updated by script */
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "1dmymlv71syjv8byb9ap9c13fimjl6c3r94dwr9kghdlj3jh7p0k"; /* updated by script */
|
||||
sha256 = "0arff0882xw1azbxpn1n3wbc5ncg8gmfim3jf6rq2dky8kp9ylkm"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
update-channel = "PhpStorm RELEASE";
|
||||
|
|
@ -361,12 +361,12 @@ in
|
|||
|
||||
pycharm-community = buildPycharm rec {
|
||||
name = "pycharm-community-${version}";
|
||||
version = "2020.3.3"; /* updated by script */
|
||||
version = "2020.3.4"; /* updated by script */
|
||||
description = "PyCharm Community Edition";
|
||||
license = lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "0p05pgfmr9515sqbqbjiksg7qzvqxcs119lxfc6dsirdvc1qhnli"; /* updated by script */
|
||||
sha256 = "0xh0hb0v3ilgqjljh22c75hkllqgqbpppplni2dz2pv9rb3r5dv5"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm-ce";
|
||||
update-channel = "PyCharm RELEASE";
|
||||
|
|
@ -374,12 +374,12 @@ in
|
|||
|
||||
pycharm-professional = buildPycharm rec {
|
||||
name = "pycharm-professional-${version}";
|
||||
version = "2020.3.3"; /* updated by script */
|
||||
version = "2020.3.4"; /* updated by script */
|
||||
description = "PyCharm Professional Edition";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "1yzv1pxpw6pvsjljqvbnf8qgdx34rs5j232zaq4vb5x2ahswf9mm"; /* updated by script */
|
||||
sha256 = "18gkjc52qpghs721rkbsj03kaf6n8c8sxg57b2d82hjckjgm6q10"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm";
|
||||
update-channel = "PyCharm RELEASE";
|
||||
|
|
@ -387,12 +387,12 @@ in
|
|||
|
||||
rider = buildRider rec {
|
||||
name = "rider-${version}";
|
||||
version = "2020.3.2"; /* updated by script */
|
||||
version = "2020.3.4"; /* updated by script */
|
||||
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
|
||||
sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */
|
||||
sha256 = "1v99yqj83aw9j400z3v24n7xnyxzw5vm0b3rwd4yb8w3ajl59gq1"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rider";
|
||||
update-channel = "Rider RELEASE";
|
||||
|
|
@ -413,12 +413,12 @@ in
|
|||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2020.3.2"; /* updated by script */
|
||||
version = "2020.3.3"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "1jpa4gfy0xmmscjqca4pvvwvh4h3lg02nbf1m5wcsjdcywbk9y40"; /* updated by script */
|
||||
sha256 = "0szq7qz5p1ksmqdy1rma5rfl0d9dy9qmhz8k5id4zdpyz2jsacfb"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm RELEASE";
|
||||
|
|
|
|||
47
pkgs/applications/graphics/eddy/default.nix
Normal file
47
pkgs/applications/graphics/eddy/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ python3Packages
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, jre
|
||||
, qt5
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "eddy";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obdasystems";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12j77bbva5py9bd57c80cmjvf8vll40h19n81h16lvv2r2r7jynh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qt5.qtbase
|
||||
wrapQtAppsHook
|
||||
python3Packages.setuptools
|
||||
python3Packages.rfc3987
|
||||
python3Packages.JPype1
|
||||
python3Packages.pyqt5
|
||||
];
|
||||
|
||||
# Tests fail with: ImportError: cannot import name 'QtXmlPatterns' from 'PyQt5'
|
||||
doCheck = false;
|
||||
|
||||
preBuild = ''
|
||||
export HOME=/tmp
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapQtApp "$out/bin/eddy" --prefix JAVA_HOME : ${jre}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.obdasystems.com/eddy";
|
||||
description = "Graphical editor for the specification and visualization of Graphol ontologies";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ koslambrou ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,9 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,--static,,g' Makefile
|
||||
substituteInPlace Makefile --replace "--static" ""
|
||||
'' + lib.optionalString stdenv.isi686 ''
|
||||
substituteInPlace Makefile --replace "-flto" ""
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
118
pkgs/applications/misc/freeplane/default.nix
Normal file
118
pkgs/applications/misc/freeplane/default.nix
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_5, which }:
|
||||
|
||||
let
|
||||
pname = "freeplane";
|
||||
version = "1.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "07xjx9pf62dvy8lx6vnbwwcn1zqy89cmdmwy792k7gb12wz81nnc";
|
||||
};
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps";
|
||||
inherit src;
|
||||
|
||||
nativeBuildInputs = [ jdk11 perl gradle_5 ];
|
||||
|
||||
buildPhase = ''
|
||||
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon jar
|
||||
'';
|
||||
|
||||
# Mavenize dependency paths
|
||||
# e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
|
||||
installPhase = ''
|
||||
find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
||||
| sh
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "0r7f6713m0whh5hlk1id7z9j5v9494r41sivn9fzl63q70kzz92g";
|
||||
};
|
||||
|
||||
# Point to our local deps repo
|
||||
gradleInit = writeText "init.gradle" ''
|
||||
logger.lifecycle 'Replacing Maven repositories with ${deps}...'
|
||||
gradle.projectsLoaded {
|
||||
rootProject.allprojects {
|
||||
buildscript {
|
||||
repositories {
|
||||
clear()
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
clear()
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
}
|
||||
}
|
||||
settingsEvaluated { settings ->
|
||||
settings.pluginManagement {
|
||||
repositories {
|
||||
maven { url '${deps}' }
|
||||
}
|
||||
}
|
||||
}
|
||||
'';
|
||||
|
||||
# downloaded from unicode.org and twemoji.maxcdn.com by code in freeplane/emoji.gradle
|
||||
# the below hash is for versions of freeplane that use twemoji 12.1.4, and emoji 12.1
|
||||
emoji = stdenv.mkDerivation rec {
|
||||
name = "${pname}-emoji";
|
||||
inherit src;
|
||||
|
||||
nativeBuildInputs = [ jdk11 gradle_5 ];
|
||||
|
||||
buildPhase = ''
|
||||
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} emojiGraphicsClasses emojiListClasses
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/emoji/txt $out/resources/images
|
||||
cp freeplane/build/emoji/txt/emojilist.txt $out/emoji/txt
|
||||
cp -r freeplane/build/emoji/resources/images/emoji/. $out/resources/images/emoji
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "0zikbakbr2fhyv4h4h52ajhznjka0hg6hiqfy1528a39i6psipn3";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ jdk11 gradle_5 ];
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p -- ./freeplane/build/emoji/{txt,resources/images}
|
||||
cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt
|
||||
cp -r ${emoji}/resources/images/emoji ./freeplane/build/emoji/resources/images/emoji
|
||||
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share
|
||||
|
||||
cp -a ./BIN/. $out/share/${pname}
|
||||
makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \
|
||||
--set FREEPLANE_BASE_DIR $out/share/${pname} \
|
||||
--set JAVA_HOME ${jdk11} \
|
||||
--prefix PATH : ${lib.makeBinPath [ jdk11 which ]}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mind-mapping software";
|
||||
homepage = "https://freeplane.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ chaduffy ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, boost
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, mkDerivationWith
|
||||
, muparser
|
||||
|
|
@ -11,36 +10,20 @@
|
|||
, qtsvg
|
||||
, qttools
|
||||
, runtimeShell
|
||||
, gcc8Stdenv
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv = gcc8Stdenv;
|
||||
in
|
||||
|
||||
# Doesn't build with gcc9
|
||||
mkDerivationWith stdenv.mkDerivation rec {
|
||||
pname = "librecad";
|
||||
version = "2.2.0-rc1";
|
||||
version = "2.2.0-rc2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreCAD";
|
||||
repo = "LibreCAD";
|
||||
rev = version;
|
||||
sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
|
||||
sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix_qt_5_11_build.patch
|
||||
(
|
||||
fetchpatch {
|
||||
# Fix missing app name and icon on Wayland.
|
||||
url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch";
|
||||
sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5";
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/postprocess-unix.sh \
|
||||
--replace /bin/sh ${runtimeShell}
|
||||
|
|
@ -88,16 +71,11 @@ mkDerivationWith stdenv.mkDerivation rec {
|
|||
qttools
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "2D CAD package based on Qt";
|
||||
homepage = "https://librecad.org";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [
|
||||
kiwi
|
||||
viric
|
||||
];
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ kiwi viric ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
|
||||
index 835e47d..2c878e8 100644
|
||||
--- a/librecad/src/ui/forms/qg_commandwidget.cpp
|
||||
+++ b/librecad/src/ui/forms/qg_commandwidget.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
+#include <QAction>
|
||||
#include <QKeyEvent>
|
||||
#include <QFileDialog>
|
||||
#include <QSettings>
|
||||
diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
|
||||
index 2beaceb..84068ad 100644
|
||||
--- a/librecad/src/ui/generic/colorwizard.cpp
|
||||
+++ b/librecad/src/ui/generic/colorwizard.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "colorwizard.h"
|
||||
#include "ui_colorwizard.h"
|
||||
|
||||
+#include <QAction>
|
||||
#include <QColorDialog>
|
||||
#include <QLineEdit>
|
||||
#include <QListWidget>
|
||||
diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
|
||||
index 7c35144..0e394f2 100644
|
||||
--- a/librecad/src/ui/generic/widgetcreator.cpp
|
||||
+++ b/librecad/src/ui/generic/widgetcreator.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "widgetcreator.h"
|
||||
#include "ui_widgetcreator.h"
|
||||
|
||||
+#include <QActionGroup>
|
||||
#include <QSettings>
|
||||
#include <QLineEdit>
|
||||
#include <QPushButton>
|
||||
52
pkgs/applications/misc/logseq/default.nix
Normal file
52
pkgs/applications/misc/logseq/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "0a7c33f7d5ylcy6lqkpxp78wwyi4n5q4jdy7b8nx7p34sn2jnpf7";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/${pname} $out/share/applications
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace Exec=Logseq Exec=${pname} \
|
||||
--replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base";
|
||||
homepage = "https://github.com/logseq/logseq";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ weihua ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
5
pkgs/applications/misc/logseq/update.sh
Executable file
5
pkgs/applications/misc/logseq/update.sh
Executable file
|
|
@ -0,0 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)"
|
||||
update-source-version logseq "$version"
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "surface-control";
|
||||
version = "0.3.1-1";
|
||||
version = "0.3.1-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wclzlix0a2naxbdg3wym7yw19p2wqpcjmkf7gn8cs00shrmzjld";
|
||||
sha256 = "sha256-SLJ4mwBafLGL5pneMTHLc4S4Tgds2xLqByWFH95TK1k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0vi26v9mvx298kx6k5g7h8dnn7r208an9knadc23vxcrrxjr6pn5";
|
||||
cargoSha256 = "sha256-a+4oOkO90TObfYnq9NZsWy5RmYFYN1BKvUKxpvjiJc8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
26
pkgs/applications/science/electronics/gnucap/default.nix
Normal file
26
pkgs/applications/science/electronics/gnucap/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucap";
|
||||
version = "20210107";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz";
|
||||
sha256 = "12rlwd4mfc54qq1wrx5k8qk578xls5z4isf94ybkf2z6qxk4mhnj";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gnu Circuit Analysis Package";
|
||||
longDescription = ''
|
||||
Gnucap is a modern general purpose circuit simulator with several advantages over Spice derivatives.
|
||||
It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis.
|
||||
'';
|
||||
homepage = "http://www.gnucap.org/";
|
||||
changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.raboof ];
|
||||
};
|
||||
}
|
||||
|
|
@ -21,19 +21,21 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.6.4";
|
||||
version = "1.7.0";
|
||||
|
||||
# build stimuli file for PGO build and the script to generate it
|
||||
# independently of the foot's build, so we can cache the result
|
||||
# and avoid unnecessary rebuilds as it can take relatively long
|
||||
# to generate
|
||||
#
|
||||
# For every bump, make sure that the hash is still accurate.
|
||||
stimulusGenerator = stdenv.mkDerivation {
|
||||
pname = "foot-generate-alt-random-writes";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py";
|
||||
sha256 = "0pnc5nvqrbgx5618ylrkrs9fyxjh4jcsbryfk6vlnk8x4wyyaibz";
|
||||
sha256 = "019bdiqfi3wx2lwrv3nhq83knc1r3lmqd5zgisa33wwshm2kyv7p";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -87,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
|
||||
sha256 = "0awv53l3039s1rnkhdkzc0gwawlnd1m8cl4qhaijhxzzq68w0dfb";
|
||||
sha256 = "0w07fw7y31g891335ji3fm783r4dsk5py82qp0zx6z3rfr07paby";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,21 +13,21 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.15.4";
|
||||
version = "1.16.3";
|
||||
# Using two URLs as the first one will break as soon as a new version is released
|
||||
src_bin = fetchurl {
|
||||
urls = [
|
||||
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
|
||||
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-Reun5hp7Rnsf6N5yL6iQ1Vbhnz/AKnt/jYRqyOK625o=";
|
||||
hash = "sha256-G2XceMwiFu4fWT4L3HJzDB/rD3eSX6ko6RdVw72QLzg=";
|
||||
};
|
||||
src_oss = fetchurl {
|
||||
urls = [
|
||||
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
|
||||
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-gtBi1IRNF5ASk/ZdzkDmOuEIT9gazNaRNCftqbLEP+M=";
|
||||
hash = "sha256-YUGozP9B6vmWQ4WxctSbezzu+0yLJXNKQk9TwnQF8F0=";
|
||||
};
|
||||
in mkDerivation {
|
||||
pname = "makemkv";
|
||||
|
|
|
|||
36
pkgs/applications/video/mpv/scripts/thumbnail.nix
Normal file
36
pkgs/applications/video/mpv/scripts/thumbnail.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ fetchFromGitHub, lib, python3, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpv_thumbnail_script";
|
||||
version = "unstable-2020-01-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theamm";
|
||||
repo = pname;
|
||||
rev = "682becf5b5115c2a206b4f0bdee413d4be8b5bef";
|
||||
sha256 = "0dgfrb8ypc5vlq35kzn423fm6l6348ivl85vb6j3ccc9a51xprw3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs concat_files.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp mpv_thumbnail_script_{client_osc,server}.lua $out/share/mpv/scripts
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lua script to show preview thumbnails in mpv's OSC seekbar";
|
||||
homepage = "https://github.com/theamm/mpv_thumbnail_script";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
multimediaSupport ? true
|
||||
}:
|
||||
let
|
||||
version = "2.1.5";
|
||||
version = "2.2.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "notcurses";
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
|||
owner = "dankamongmen";
|
||||
repo = "notcurses";
|
||||
rev = "v${version}";
|
||||
sha256 = "02x9a0z7mbgry2wsfai1l3jwb2zpcg4gq6a2w5d920ap2fixzy8b";
|
||||
sha256 = "sha256-PzSstz5jODWbMLSClm3yZSHJKMXuDfxwj/h9Qo6kAVg=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
|
||||
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, gtk2 }:
|
||||
|
||||
mkDerivation {
|
||||
name = "qtstyleplugins-2017-03-11";
|
||||
pname = "qtstyleplugins";
|
||||
version = "unstable-2017-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
|
|
@ -10,7 +11,18 @@ mkDerivation {
|
|||
sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy";
|
||||
};
|
||||
|
||||
patches = [ ./fix-build-against-Qt-5.15.patch ];
|
||||
patches = [
|
||||
(fetchpatch rec {
|
||||
name = "0001-fix-build-against-Qt-5.15.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins";
|
||||
sha256 = "j0CgfutqFawy11IqFnlrkfMsMD01NjX/MkfVEVxj1QM=";
|
||||
})
|
||||
(fetchpatch rec {
|
||||
name = "0002-fix-gtk2-background.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins";
|
||||
sha256 = "qUOkNckrSUEzXY1PUZKfbiCjhNyB5ZBw2IN/j32GKM4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
buildInputs = [ gtk2 ];
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Thu, 28 May 2020 12:35:42 +0200
|
||||
Subject: [PATCH] fix build against Qt 5.15
|
||||
|
||||
With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application
|
||||
palette handling between QGuiApplication and QApplication")
|
||||
QApplicationPrivate::setSystemPalette is no longer used and necessary.
|
||||
---
|
||||
src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
|
||||
src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
|
||||
index 36169c9..2544593 100644
|
||||
--- a/src/plugins/styles/gtk2/qgtkstyle.cpp
|
||||
+++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
|
||||
@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app)
|
||||
// not supported as these should be entirely determined by
|
||||
// current Gtk settings
|
||||
if (app->desktopSettingsAware() && d->isThemeAvailable()) {
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
QApplicationPrivate::setSystemPalette(standardPalette());
|
||||
+#endif
|
||||
QApplicationPrivate::setSystemFont(d->getThemeFont());
|
||||
d->applyCustomPaletteHash();
|
||||
if (!d->isKDE4Session())
|
||||
diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
|
||||
index e57b3d8..e71beb0 100644
|
||||
--- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp
|
||||
+++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
|
||||
@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme()
|
||||
if (oldTheme != QGtkStylePrivate::getThemeName()) {
|
||||
oldTheme = QGtkStylePrivate::getThemeName();
|
||||
QPalette newPalette = qApp->style()->standardPalette();
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
QApplicationPrivate::setSystemPalette(newPalette);
|
||||
+#endif
|
||||
QApplication::setPalette(newPalette);
|
||||
if (!QGtkStylePrivate::instances.isEmpty()) {
|
||||
QGtkStylePrivate::instances.last()->initGtkWidgets();
|
||||
--
|
||||
2.26.2
|
||||
|
||||
51
pkgs/development/python-modules/aionotion/default.nix
Normal file
51
pkgs/development/python-modules/aionotion/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aionotion";
|
||||
version = "3.0.1";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ydrazg7gcwf53006n1fvxh9zm77by6zi36haq1bmy5skqccyiki";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [ "examples" ];
|
||||
|
||||
pythonImportsCheck = [ "aionotion" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for Notion Home Monitoring";
|
||||
homepage = "https://github.com/bachya/aionotion";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,19 +4,18 @@
|
|||
, ecdsa
|
||||
, hidapi
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, pyaes
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ckcc-protocol";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d83a77d94e9563c3fb0e982d847ec88ba6ac45e3e008e5e53729c0b9800097fc";
|
||||
sha256 = "b660225ac06fc06ad17b33ece428126eef785388450e14313f72d25d4082c5ab";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
|
||||
|
|
|
|||
36
pkgs/development/python-modules/cmigemo/default.nix
Normal file
36
pkgs/development/python-modules/cmigemo/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, six, cmigemo, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cmigemo";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09j68kvcskav2cqb7pj12caksmj4wh2lhjp0csq00xpn0wqal4vk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
preConfigure = ''
|
||||
export LDFLAGS="-L${cmigemo}/lib"
|
||||
export CPPFLAGS="-I${cmigemo}/include"
|
||||
export LD_LIBRARY_PATH="${cmigemo}/lib"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's~dict_path_base = "/usr/share/cmigemo"~dict_path_base = "/${cmigemo}/share/migemo"~g' test/test_cmigemo.py
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [ "test/" ];
|
||||
|
||||
pythonImportsCheck = [ "cmigemo" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mooz/python-cmigemo";
|
||||
description = "A pure python binding for C/Migemo";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ illustris ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,29 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
, toml
|
||||
, importlib-metadata
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cssutils";
|
||||
version = "2.0.0";
|
||||
version = "2.2.0";
|
||||
|
||||
disabled = isPy27;
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "984b5dbe3a2a0483d7cb131609a17f4cbaa34dda306c419924858a88588fed7c";
|
||||
sha256 = "5bef59f6b59bdccbea8e36cb292d2be1b6be1b485fc4a9f5886616f19eb31aaf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
toml
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_parseUrl" # accesses network
|
||||
# access network
|
||||
"test_parseUrl"
|
||||
"encutils"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cssutils" ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "digi-xbee";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2ed798faee0853bf7ae9ca5aa4bdcbab496e3c2d56c9f0719a8e3e0d13270891";
|
||||
sha256 = "664737d1aab453ea40b9745f1ee1e88920acff1cce2e07c42e7f5aa64a16e6aa";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyserial srp ];
|
||||
|
|
@ -15,6 +15,24 @@ buildPythonPackage rec {
|
|||
# Upstream doesn't contain unit tests, only functional tests which require specific hardware
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"digi.xbee.models"
|
||||
"digi.xbee.packets"
|
||||
"digi.xbee.util"
|
||||
"digi.xbee.comm_interface"
|
||||
"digi.xbee.devices"
|
||||
"digi.xbee.exception"
|
||||
"digi.xbee.filesystem"
|
||||
"digi.xbee.firmware"
|
||||
"digi.xbee.io"
|
||||
"digi.xbee.profile"
|
||||
"digi.xbee.reader"
|
||||
"digi.xbee.recovery"
|
||||
"digi.xbee.sender"
|
||||
"digi.xbee.serial"
|
||||
"digi.xbee.xsocket"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to interact with Digi International's XBee radio frequency modules";
|
||||
homepage = "https://github.com/digidotcom/xbee-python";
|
||||
|
|
|
|||
36
pkgs/development/python-modules/django-cacheops/default.nix
Normal file
36
pkgs/development/python-modules/django-cacheops/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, lib
|
||||
, django
|
||||
, funcy
|
||||
, redis
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-cacheops";
|
||||
version = "5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
funcy
|
||||
redis
|
||||
six
|
||||
];
|
||||
|
||||
# tests need a redis server
|
||||
# pythonImportsCheck not possible since DJANGO_SETTINGS_MODULE needs to be set
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A slick ORM cache with automatic granular event-driven invalidation for Django";
|
||||
homepage = "https://github.com/Suor/django-cacheops";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ petabyteboy ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
pname = "ftputil";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0dc82fa0a8ea385e8222b72bedb1ec31caac07822b6a1a9139adc98b0b051d06";
|
||||
sha256 = "394997ccb3cd4825c6e22b5e349c62cf5016c35db4d60940f3513db66d205561";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest freezegun ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glances-api";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-glances-api";
|
||||
rev = version;
|
||||
sha256 = "0rgv77n0lvr7d3vk4qc8svipxafmm6s4lfxrl976hsygrhaqidch";
|
||||
sha256 = "sha256-mbkZZg2fmus4kOXFxHE/UV/nxemFAsoEZu8IUa7SPsg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-packaging";
|
||||
version = "0.7.12";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-sUAyV3GIGn33t/LRSZe2GQY/51rnVrkCWFLkNGAAu7g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ packaging ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# disable tests depending on network connection
|
||||
disabledTests = [ "test_develop" "test_install" ];
|
||||
|
||||
pythonImportsCheck = [ "jupyter_packaging" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jupyter Packaging Utilities";
|
||||
homepage = "https://github.com/jupyter/jupyter-packaging";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.elohmeier ];
|
||||
};
|
||||
}
|
||||
75
pkgs/development/python-modules/jupyter_server/default.nix
Normal file
75
pkgs/development/python-modules/jupyter_server/default.nix
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, pytest-tornasync
|
||||
, jinja2
|
||||
, tornado
|
||||
, pyzmq
|
||||
, ipython_genutils
|
||||
, traitlets
|
||||
, jupyter_core
|
||||
, jupyter_client
|
||||
, nbformat
|
||||
, nbconvert
|
||||
, send2trash
|
||||
, terminado
|
||||
, prometheus_client
|
||||
, anyio
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter_server";
|
||||
version = "1.4.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-sBJvI39nlTPuxGJEz8ZtYeOh+OwPrS1HNS+hnT51Tkc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "anyio>=2.0.2" "anyio"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
tornado
|
||||
pyzmq
|
||||
ipython_genutils
|
||||
traitlets
|
||||
jupyter_core
|
||||
jupyter_client
|
||||
nbformat
|
||||
nbconvert
|
||||
send2trash
|
||||
terminado
|
||||
prometheus_client
|
||||
anyio
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-tornasync
|
||||
requests
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [ "jupyter_server/tests/" ];
|
||||
|
||||
# disabled failing tests
|
||||
disabledTests = [ "test_server_extension_list" "test_list_formats" "test_base_url" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications.";
|
||||
homepage = "https://github.com/jupyter-server/jupyter_server";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = [ maintainers.elohmeier ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,19 +4,21 @@
|
|||
, jupyterlab_server
|
||||
, notebook
|
||||
, pythonOlder
|
||||
, jupyter-packaging
|
||||
, nbclassic
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "2.2.9";
|
||||
version = "3.0.11";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3be8f8edea173753dd838c1b6d3bbcb6f5c801121f824a477025c1b6a1d33dc6";
|
||||
sha256 = "sha256-zkz08xFjzlGu0BPAGoV8BdQ6k8Ru1pAWbkhkT255R94=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jupyterlab_server notebook ];
|
||||
propagatedBuildInputs = [ jupyterlab_server notebook jupyter-packaging nbclassic ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab"
|
||||
|
|
|
|||
|
|
@ -1,34 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, notebook
|
||||
, jsonschema
|
||||
, pythonOlder
|
||||
, requests
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pyjson5
|
||||
, Babel
|
||||
, jupyter_server
|
||||
, pytest-tornasync
|
||||
, pytestcov
|
||||
, strict-rfc3339
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab_server";
|
||||
version = "1.2.0";
|
||||
version = "2.3.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5431d9dde96659364b7cc877693d5d21e7b80cea7ae3959ecc2b87518e5f5d8c";
|
||||
sha256 = "sha256-56AkWqPeI6GAPeLv9AHkykWUU42fWYBhNPMEGabYtqM=";
|
||||
};
|
||||
|
||||
checkInputs = [ requests pytest ];
|
||||
propagatedBuildInputs = [ notebook jsonschema pyjson5 ];
|
||||
propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ];
|
||||
|
||||
# test_listing test fails
|
||||
# this is a new package and not all tests pass
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-tornasync
|
||||
pytestcov
|
||||
strict-rfc3339
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
disabledTests = [
|
||||
"test_get_locale"
|
||||
"test_get_installed_language_pack_locales_passes"
|
||||
"test_get_installed_package_locales"
|
||||
"test_get_installed_packages_locale"
|
||||
"test_get_language_packs"
|
||||
"test_get_language_pack"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "JupyterLab Server";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "luftdaten";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1w1f0kmiwslg1dxn7gq0ak8f5wajlwl03r5zklshjc11j34b4d5i";
|
||||
sha256 = "sha256-5SFb+psULyg9UKVY3oJPNLF3TGS/W+Bxoj79iTzReL4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp async-timeout ];
|
||||
|
|
@ -16,9 +16,11 @@ buildPythonPackage rec {
|
|||
# No tests implemented
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "luftdaten" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for interacting with luftdaten.info";
|
||||
homepage = "https://github.com/fabaff/python-luftdaten";
|
||||
homepage = "https://github.com/home-assistant-ecosystem/python-luftdaten";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mat2";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "jvoisin";
|
||||
repo = "mat2";
|
||||
rev = version;
|
||||
sha256 = "0amxwwmcf47dakfm6zvsksv6ja7rz7dpmd1z2rsspy8yds6zgxs7";
|
||||
sha256 = "sha256-TxHelOr7ygp4R+dW+oJ034l2w9zrB4gn0QLs5Pa4EFE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
26
pkgs/development/python-modules/mplfinance/default.nix
Normal file
26
pkgs/development/python-modules/mplfinance/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, matplotlib, pandas }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mplfinance";
|
||||
version = "0.12.7a7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pATiprTELt8GrEkeKjILPfpdNDVoex5t+Mc+6Gg7cPY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ matplotlib pandas ];
|
||||
|
||||
# tests are only included on GitHub where this version misses a tag
|
||||
# and half of them fail
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "mplfinance" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Matplotlib utilities for the visualization, and visual analysis, of financial data";
|
||||
homepage = "https://github.com/matplotlib/mplfinance";
|
||||
license = [ licenses.bsd3 ];
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
};
|
||||
}
|
||||
37
pkgs/development/python-modules/nbclassic/default.nix
Normal file
37
pkgs/development/python-modules/nbclassic/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, notebook
|
||||
, pythonOlder
|
||||
, jupyter_server
|
||||
, pytestCheckHook
|
||||
, pytest-tornasync
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbclassic";
|
||||
version = "0.2.6";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
# tests only on github
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyterlab";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-stp0LZJAOCrnObvJIPEVt8mMb8yL29nlHECypbTg3ec=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jupyter_server notebook ];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-tornasync
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jupyter lab environment notebook server extension.";
|
||||
license = with licenses; [ bsd3 ];
|
||||
homepage = "https://github.com/jupyterlab/nbclassic";
|
||||
maintainers = [ maintainers.elohmeier ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "netdata";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "14kyjp1q3clizs1bqx4rp31d2awjmi5v65z8sarr2ycgwqqmkrzw";
|
||||
sha256 = "sha256-oGOT4RvftI/2Ri2icM/AtglNZXt10jkFh/rlr6A46YE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, packaging
|
||||
, toml
|
||||
, structlog
|
||||
, appdirs
|
||||
|
|
@ -19,18 +21,26 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nvchecker";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
# Tests not included in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "lilydjwg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0b17pikqyxcsid69lwnjl44n8z46ydjmxxdnbzasfdl7r83l7ijr";
|
||||
sha256 = "0ikqjlw6v7va69i8qskj1lf07ik84q4n3qgsb7khk520gv2ks3sx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix test that fail in sandbox build. See https://github.com/lilydjwg/nvchecker/pull/179
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lilydjwg/nvchecker/commit/7366d82bfc3dcf231f7908e259bf2437cf7dafd5.patch";
|
||||
sha256 = "0pwrwa2wyy4i668lk2mqzzy6y3xi08mq3w520b4954kfm07g75a9";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles docutils ];
|
||||
propagatedBuildInputs = [ setuptools toml structlog appdirs tornado pycurl aiohttp ];
|
||||
propagatedBuildInputs = [ setuptools packaging toml structlog appdirs tornado pycurl aiohttp ];
|
||||
checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ];
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "opensensemap-api";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1f3iqwl8ynvrkdd961v2hjsbldwbr217pv5pay2m5f0m974bhblx";
|
||||
sha256 = "sha256-e60aVIoKFqo++WJHUYGutugkjB8YgyNQgJbILgAyOOY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
{ buildPythonPackage, fetchPypi, lib, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "packageurl-python";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0mpvj8imsaqhrgfq1cxx16flc5201y78kqa7bh2i5zxsc29843mx";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "packageurl" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python parser and builder for package URLs";
|
||||
homepage = "https://github.com/package-url/packageurl-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ armijnhemel ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +1,26 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, six
|
||||
}:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, cmigemo }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "percol";
|
||||
version = "0.2.1";
|
||||
disabled = isPy3k;
|
||||
version = "unstable-2019-07-24";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mooz";
|
||||
repo = "percol";
|
||||
rev = "4b28037e328da3d0fe8165c11b800cbaddcb525e";
|
||||
sha256 = "07sq3517wzn04j2dzlmczmcvx3w6r7xnzz3634zgf1zi6dbr2a3g";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
propagatedBuildInputs = [ cmigemo ];
|
||||
|
||||
# package has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "percol" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mooz/percol";
|
||||
description = "Adds flavor of interactive filtering to the traditional pipe concept of shell";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ koral ];
|
||||
broken = true; # missing cmigemo package which is missing libmigemo.so
|
||||
# also doesn't support python3
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests
|
||||
|
||||
, cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script
|
||||
, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow
|
||||
, python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel
|
||||
, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2
|
||||
, pydash
|
||||
|
||||
, mock, pytest, responses, testfixtures
|
||||
, mock, pytestCheckHook, responses, testfixtures
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "privacyIDEA";
|
||||
version = "3.3";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "188ki924dig899wlih45xfsm0s7mjkya56vii26bg02h91izrb4b";
|
||||
sha256 = "sha256-XJnrrpU0x2Axu7W4G3oDTjSJuqEyh3C/0Aga5D0gw9k=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -24,11 +26,24 @@ buildPythonPackage rec {
|
|||
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
|
||||
python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
|
||||
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
|
||||
pydash
|
||||
];
|
||||
|
||||
checkInputs = [ openssl mock pytest responses testfixtures ];
|
||||
# issues with hardware token tests
|
||||
doCheck = false;
|
||||
passthru.tests = { inherit (nixosTests) privacyidea; };
|
||||
|
||||
checkInputs = [ openssl mock pytestCheckHook responses testfixtures ];
|
||||
disabledTests = [
|
||||
"AESHardwareSecurityModuleTestCase"
|
||||
"test_01_cert_request"
|
||||
"test_01_loading_scripts"
|
||||
"test_02_cert_enrolled"
|
||||
"test_02_enroll_rights"
|
||||
"test_02_get_resolvers"
|
||||
"test_02_success"
|
||||
"test_03_get_identifiers"
|
||||
"test_04_remote_user_auth"
|
||||
"test_14_convert_timestamp_to_utc"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "privacyidea" ];
|
||||
|
||||
|
|
@ -46,6 +61,6 @@ buildPythonPackage rec {
|
|||
description = "Multi factor authentication system (2FA, MFA, OTP Server)";
|
||||
license = licenses.agpl3Plus;
|
||||
homepage = "http://www.privacyidea.org";
|
||||
maintainers = [ maintainers.globin ];
|
||||
maintainers = with maintainers; [ globin ma27 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
From 2fe7a445bafedee2c43050e40697d8b0fd7f7b30 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Fri, 19 Mar 2021 19:37:34 +0100
|
||||
Subject: [PATCH] Only build unit-tests
|
||||
|
||||
---
|
||||
setup.cfg | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/setup.cfg b/setup.cfg
|
||||
index 2c2f49f..a5ec152 100644
|
||||
--- a/setup.cfg
|
||||
+++ b/setup.cfg
|
||||
@@ -83,13 +83,6 @@ force_sort_within_sections = true
|
||||
junit_family = xunit2
|
||||
addopts =
|
||||
--verbose
|
||||
- --doctest-modules
|
||||
- --no-cov-on-fail
|
||||
- --cov-fail-under=100
|
||||
- --cov-report=term-missing
|
||||
- --cov-report=xml:build/coverage/coverage.xml
|
||||
- --cov-report=html:build/coverage
|
||||
- --junitxml=build/testresults/junit.xml
|
||||
|
||||
[coverage:run]
|
||||
omit =
|
||||
--
|
||||
2.29.3
|
||||
|
||||
24
pkgs/development/python-modules/pydash/default.nix
Normal file
24
pkgs/development/python-modules/pydash/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, mock, pytestCheckHook, invoke }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydash";
|
||||
version = "4.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgilland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Only-build-unit-tests.patch ];
|
||||
|
||||
checkInputs = [ mock pytestCheckHook invoke ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dgilland/pydash";
|
||||
description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,6 +9,14 @@ buildPythonPackage rec {
|
|||
sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with pytest ≥ 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51
|
||||
(fetchpatch {
|
||||
url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch";
|
||||
sha256 = "0ka892j0rrlnfvk900fcph0f6lsnr9dy06q5k2s2byzwijhdw6n5";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-opendata-transport";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "python_opendata_transport";
|
||||
inherit version;
|
||||
sha256 = "0pxs9zqk00vn1s74cx1416mqmixrr74wb0jb0j6b1c3xpvzlfbks";
|
||||
sha256 = "sha256-Z0VHkKYHpwbBwwFrMtA5JRy0m7f0566IjCmGizoKEoo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, python-engineio
|
||||
, python-socketio
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, voluptuous
|
||||
, websockets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "9.6.9";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1q5w5pvrgj94bzd5wig79l4hipkfrcdah54rvwyi7b8q46gw77sg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
python-engineio
|
||||
python-socketio
|
||||
pytz
|
||||
voluptuous
|
||||
websockets
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
asynctest
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [ "examples/" ];
|
||||
|
||||
pythonImportsCheck = [ "simplipy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library the SimpliSafe API";
|
||||
homepage = "https://simplisafe-python.readthedocs.io/";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "volkszaehler";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13zhxq08wn5y9yn6xbazfl0gxxysmirwpc26wcnr6jk2va1kpc4l";
|
||||
sha256 = "sha256-1oqzhC3Yq2V30F3ilr80vKFnTmI/CdIVLuzMlIr40xI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-mockery";
|
||||
version = "2.5.1";
|
||||
version = "2.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vektra";
|
||||
repo = "mockery";
|
||||
rev = "v${version}";
|
||||
sha256 = "5W5WGWqxpZzOqk1VOlLeggIqfneRb7s7ZT5faNEhDos=";
|
||||
sha256 = "sha256-St8QgUZUU7THM9H8i7Z+bgKu9LhXhUqH/B14LGmDCn0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
|
||||
vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/vektra/mockery";
|
||||
|
|
|
|||
25
pkgs/development/tools/trunk/default.nix
Normal file
25
pkgs/development/tools/trunk/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trunk";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thedodd";
|
||||
repo = "trunk";
|
||||
rev = "v${version}";
|
||||
sha256 = "W6d05MKquG1QFkvofqWk94+6j5q8yuAjNgZFG3Z3kNo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thedodd/trunk";
|
||||
description = "Build, bundle & ship your Rust WASM application to the web";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = with licenses; [ asl20 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
|
||||
sha256 = "04x7729hk6zw1xj3n4s4lvaviijsnbjf5rhzvjxlr5fygvg4l6z1";
|
||||
sha256 = "0b53jzl64i49rk3n3c3x0hibwbl7vih2xym8jq5s56klg61qdxa1";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,29 +1,45 @@
|
|||
{ stdenv, lib, perl, fetchurl, python2
|
||||
, pkg-config, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
|
||||
{ stdenv, lib, perl, fetchurl, python2, fmt, libidn
|
||||
, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
|
||||
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
|
||||
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
|
||||
, gloox, nvidia-texture-tools
|
||||
, withEditor ? true, wxGTK ? null
|
||||
, gloox, nvidia-texture-tools, zeroad-data
|
||||
, withEditor ? true, wxGTK
|
||||
}:
|
||||
|
||||
assert withEditor -> wxGTK != null;
|
||||
# You can find more instructions on how to build 0ad here:
|
||||
# https://trac.wildfiregames.com/wiki/BuildInstructions
|
||||
|
||||
let
|
||||
# the game requires a special version 78.6.0 of spidermonkey, otherwise
|
||||
# we get compilation errors. We override the src attribute of spidermonkey_78
|
||||
# in order to reuse that declartion, while giving it a different source input.
|
||||
spidermonkey_78_6 = spidermonkey_78.overrideAttrs(old: rec {
|
||||
version = "78.6.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "0lyg65v380j8i2lrylwz8a5ya80822l8vcnlx3dfqpd3s6zzjsay";
|
||||
};
|
||||
patches = (old.patches or []) ++ [
|
||||
./spidermonkey-cargo-toml.patch
|
||||
];
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "0ad";
|
||||
version = "0.0.23b";
|
||||
version = "0.0.24b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
|
||||
sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1";
|
||||
sha256 = "1a1py45hkh2cswi09vbf9chikgxdv9xplsmg6sv6xhdznv4j6p1j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python2 perl pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
spidermonkey_38 boost icu libxml2 libpng libjpeg
|
||||
zlib curl libogg libvorbis enet miniupnpc openal
|
||||
spidermonkey_78_6 boost icu libxml2 libpng libjpeg
|
||||
zlib curl libogg libvorbis enet miniupnpc openal libidn
|
||||
libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox
|
||||
nvidia-texture-tools libsodium
|
||||
nvidia-texture-tools libsodium fmt
|
||||
] ++ lib.optional withEditor wxGTK;
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
|
|
@ -31,35 +47,22 @@ stdenv.mkDerivation rec {
|
|||
"-I${libX11.dev}/include/X11"
|
||||
"-I${libXcursor.dev}/include/X11"
|
||||
"-I${SDL2}/include/SDL2"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./rootdir_env.patch
|
||||
# Fixes build with spidermonkey-38.8.0, includes the minor version check:
|
||||
# https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b
|
||||
(fetchurl {
|
||||
url = "https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch";
|
||||
sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa";
|
||||
})
|
||||
"-I${fmt.dev}/include"
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
# Delete shipped libraries which we don't need.
|
||||
rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
|
||||
|
||||
# Workaround invalid pkg-config name for mozjs
|
||||
mkdir pkg-config
|
||||
ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc
|
||||
PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"
|
||||
|
||||
# Update Makefiles
|
||||
pushd build/workspaces
|
||||
./update-workspaces.sh \
|
||||
--with-system-nvtt \
|
||||
--with-system-mozjs38 \
|
||||
--with-system-mozjs \
|
||||
${lib.optionalString withEditor "--enable-atlas"} \
|
||||
--bindir="$out"/bin \
|
||||
--libdir="$out"/lib/0ad \
|
||||
--datadir="$out"/share/0ad/data \
|
||||
--without-tests \
|
||||
-j $NIX_BUILD_CORES
|
||||
popd
|
||||
|
|
@ -82,6 +85,11 @@ stdenv.mkDerivation rec {
|
|||
# Copy l10n data.
|
||||
install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
|
||||
|
||||
# Link in game data from package
|
||||
ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config
|
||||
ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods
|
||||
ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools
|
||||
|
||||
# Copy libraries.
|
||||
install -Dm644 -t $out/lib/0ad binaries/system/*.so
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
diff -ru3 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp
|
||||
--- 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 2015-02-14 04:45:13.000000000 +0300
|
||||
+++ 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp 2016-11-03 16:23:47.241514876 +0300
|
||||
@@ -155,32 +155,8 @@
|
||||
|
||||
/*static*/ OsPath Paths::Root(const OsPath& argv0)
|
||||
{
|
||||
-#if OS_ANDROID
|
||||
- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus
|
||||
-#else
|
||||
-
|
||||
- // get full path to executable
|
||||
- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation
|
||||
- if(pathname.empty()) // failed, use argv[0] instead
|
||||
- {
|
||||
- errno = 0;
|
||||
- pathname = wrealpath(argv0);
|
||||
- if(pathname.empty())
|
||||
- WARN_IF_ERR(StatusFromErrno());
|
||||
- }
|
||||
-
|
||||
- // make sure it's valid
|
||||
- if(!FileExists(pathname))
|
||||
- {
|
||||
- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8());
|
||||
- WARN_IF_ERR(StatusFromErrno());
|
||||
- }
|
||||
-
|
||||
- for(size_t i = 0; i < 2; i++) // remove "system/name.exe"
|
||||
- pathname = pathname.Parent();
|
||||
- return pathname;
|
||||
-
|
||||
-#endif
|
||||
+ UNUSED2(argv0);
|
||||
+ return getenv("ZEROAD_ROOTDIR");
|
||||
}
|
||||
|
||||
/*static*/ OsPath Paths::RootData(const OsPath& argv0)
|
||||
15
pkgs/games/0ad/spidermonkey-cargo-toml.patch
Normal file
15
pkgs/games/0ad/spidermonkey-cargo-toml.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 6f6199ab26..c3f92db9d8 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -68,8 +68,8 @@ panic = "abort"
|
||||
libudev-sys = { path = "dom/webauthn/libudev-sys" }
|
||||
packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
|
||||
rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
|
||||
-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
|
||||
-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
|
||||
+nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1" }
|
||||
+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
|
||||
# failure's backtrace feature might break our builds, see bug 1608157.
|
||||
failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
|
||||
failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
|
||||
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "3.13.7-patch2";
|
||||
version = "3.13.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
sha256 = "sha256-5QYUYTnRblWWLYnhR1DBzoAt4d9EiYeXhzJRODmDHUA=";
|
||||
sha256 = "sha256-upT0ZtVYzbrQolik0c/2URNwU2LDLgiMWyFEiOZFijc=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8 }:
|
||||
{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:
|
||||
|
||||
let
|
||||
inherit (vscode-utils) buildVscodeMarketplaceExtension;
|
||||
|
|
@ -594,6 +594,20 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
redhat.java = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "java";
|
||||
publisher = "redhat";
|
||||
version = "0.76.0";
|
||||
sha256 = "0xb9brki4s00piv4kqgz6idm16nk6x1j6502jljz7y9pif38z32y";
|
||||
};
|
||||
buildInputs = [ jdk ];
|
||||
meta = {
|
||||
license = lib.licenses.epl20;
|
||||
broken = lib.versionAtLeast "11" jdk.version;
|
||||
};
|
||||
};
|
||||
|
||||
redhat.vscode-yaml = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-yaml";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "bcc";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
disabled = !stdenv.isLinux;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
|
||||
sha256 = "sha256-0F8tppVFu7cnuSnlgcEvbEdykxYhGJnTc04I98/yIVs=";
|
||||
sha256 = "sha256-TEH8Gmp+8ghLQ8UsGy5hBCMLqfMeApWEFr8THYSOdOQ=";
|
||||
};
|
||||
format = "other";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.11.1";
|
||||
version = "5.11.5";
|
||||
suffix = "lqx1";
|
||||
in
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ buildLinux (args // {
|
|||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "00cji0dkfsjz6agwvcqpy7771hqbzcxk8awpbhlhpwa5j161r7l4";
|
||||
sha256 = "1rf8x08l7zjwhfwaal8kh2wz2qfbrqrjhr4wh0pj7yayaa10877f";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.11.1";
|
||||
version = "5.11.5";
|
||||
suffix = "zen1";
|
||||
in
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ buildLinux (args // {
|
|||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "10xpb6r1ccqy2lsndf16dksi40z1cgm3wqjp3yjwzhad8zdjlm5d";
|
||||
sha256 = "1w8cksbxnby4xjmycynmiy9y4q5fsnpsbva1804kgan7mhxrppjc";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
|
|
|||
|
|
@ -563,7 +563,7 @@
|
|||
"norway_air" = ps: with ps; [ pymetno ];
|
||||
"notify" = ps: with ps; [ ];
|
||||
"notify_events" = ps: with ps; [ ]; # missing inputs: notify-events
|
||||
"notion" = ps: with ps; [ ]; # missing inputs: aionotion
|
||||
"notion" = ps: with ps; [ aionotion ];
|
||||
"nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client
|
||||
"nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents
|
||||
"nuheat" = ps: with ps; [ ]; # missing inputs: nuheat
|
||||
|
|
@ -741,7 +741,7 @@
|
|||
"sighthound" = ps: with ps; [ pillow simplehound ];
|
||||
"signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
|
||||
"simplepush" = ps: with ps; [ ]; # missing inputs: simplepush
|
||||
"simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python
|
||||
"simplisafe" = ps: with ps; [ simplisafe-python ];
|
||||
"simulated" = ps: with ps; [ ];
|
||||
"sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms
|
||||
"sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control
|
||||
|
|
|
|||
|
|
@ -250,6 +250,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"mqtt_statestream"
|
||||
"mullvad"
|
||||
"notify"
|
||||
"notion"
|
||||
"number"
|
||||
"ozw"
|
||||
"panel_custom"
|
||||
|
|
@ -274,6 +275,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"search"
|
||||
"shell_command"
|
||||
"shopping_list"
|
||||
"simplisafe"
|
||||
"simulated"
|
||||
"sensor"
|
||||
"smarttub"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ stdenv, lib, coreutils, gnused, gawk, fetchurl }:
|
||||
{ lib, stdenv, coreutils, gawk, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rsbep";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.thanassis.space/rsbep-0.1.0-ttsiodras.tar.bz2";
|
||||
sha256 = "1zji34kc9srxp0h1s1m7k60mvgsir1wrx1n3wc990jszfplr32zc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ttsiodras";
|
||||
repo = "rsbep-backup";
|
||||
rev = "v${version}";
|
||||
sha256 = "0is4jgil3wdqbvx9h66xcyzbqy84ndyydnnay2g9k81a4mcz4dns";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
|
|
@ -18,20 +20,27 @@ stdenv.mkDerivation {
|
|||
mv rsbep_chopper $libexecDir
|
||||
|
||||
# Fix store dependencies in scripts
|
||||
path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gnused gawk ]}"
|
||||
path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gawk ]}"
|
||||
sed -i "2i$path" freeze.sh
|
||||
sed -i "2i$path" melt.sh
|
||||
|
||||
substituteInPlace freeze.sh --replace /bin/ls ls
|
||||
|
||||
# Remove unneded binary
|
||||
rm poorZFS.py
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
cd $TMP
|
||||
echo hello > input
|
||||
$out/bin/freeze.sh input > packed
|
||||
$out/bin/melt.sh packed > output
|
||||
diff -u input output
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create resilient backups with Reed-Solomon error correction and byte-spreading";
|
||||
homepage = "https://www.thanassis.space/rsbep.html";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.earvstedt ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
28
pkgs/tools/misc/librespeed-cli/default.nix
Normal file
28
pkgs/tools/misc/librespeed-cli/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "librespeed-cli";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librespeed";
|
||||
repo = "speedtest-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "03bhxx33fy1cgp83anm51fm8v079v0az0d0p785dz98jg14vzibl";
|
||||
};
|
||||
|
||||
vendorSha256 = "1kccxmmzbkzbrxypcrz0j1zz51c0q1d5hh25lcpfbkm3498mj02c";
|
||||
|
||||
# Tests have additonal requirements
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line client for LibreSpeed";
|
||||
homepage = "https://github.com/librespeed/speedtest-cli";
|
||||
license = with licenses; [ lgpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
39
pkgs/tools/misc/past-time/default.nix
Normal file
39
pkgs/tools/misc/past-time/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, freezegun
|
||||
, pytestCheckHook
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "past-time";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabaff";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0yhc0630rmcx4ia9y6klpx002mavfmqf1s3jb2gz54jlccwqbfgl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
tqdm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "past_time" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to visualize the progress of the year based on the past days";
|
||||
homepage = "https://github.com/fabaff/past-time";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, openssh, makeWrapper }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, openssh
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "assh";
|
||||
|
|
@ -15,6 +20,10 @@ buildGoModule rec {
|
|||
|
||||
doCheck = false;
|
||||
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X moul.io/assh/v2/pkg/version.Version=${version}")
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "The fastest and cross-platform subdomain enumerator";
|
||||
homepage = "https://github.com/Edu4rdSHL/findomain";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ Br1ght0ne ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
35
pkgs/tools/networking/lychee/default.nix
Normal file
35
pkgs/tools/networking/lychee/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lychee";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lycheeverse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "03dsp0384mwr51dkqfl25xba0m17sppabiz7slhxcig89b0ksykm";
|
||||
};
|
||||
|
||||
cargoSha256 = "08y2wpm2qgm2jsy257b2p2anxy4q3bj2kfdr5cnb6wnaz9g4ypq2";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
# Disabled because they currently fail
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast, async, resource-friendly link checker written in Rust.";
|
||||
homepage = "https://github.com/lycheeverse/lychee";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ tuxinaut ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Mail sorter for Maildirs";
|
||||
homepage = "http://philter.sourceforge.net";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/danderson/netboot/tree/master/pixiecore";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ bbigras danderson ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/wiire/pixiewps";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.nico202 ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/troglobit/redir";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/kpcyrd/rshijack";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
|||
description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power";
|
||||
homepage = "https://gitlab.com/surfraw/Surfraw";
|
||||
maintainers = [];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.publicDomain;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif";
|
||||
description = "Convert ASCII-armored PGP keys to animated QR code";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ asymmetric ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
|||
supergenpass will ask for your master password interactively, and it will not be displayed on your terminal.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
homepage = "https://github.com/lanzz/bash-supergenpass";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,22 +7,22 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "genpass";
|
||||
version = "0.4.9";
|
||||
version = "0.4.12";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~cyplo/genpass";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dpv2iyd48xd8yw9bmymjjrkhsgmpwvsl5b9zx3lpaaq59ypi9g9";
|
||||
sha256 = "154kprbqc59f06ciz60il4ax299zapwa0hz8vjn25rl4gr5gzn4l";
|
||||
};
|
||||
|
||||
cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x";
|
||||
cargoSha256 = "1nc699n7f732lhzfhsfknay6z3igyiqy5jymm5x815mv9y1vwaj1";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple yet robust commandline random password generator";
|
||||
homepage = "https://sr.ht/~cyplo/genpass/";
|
||||
license = licenses.agpl3;
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ cyplo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://pdfcrack.sourceforge.net/";
|
||||
description = "Small command line driven tool for recovering passwords and content from PDF files";
|
||||
license = with licenses; [ gpl2 ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ qoelet ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://neurobin.org/projects/softwares/unix/shc/";
|
||||
description = "Shell Script Compiler";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://gt5.sourceforge.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [viric];
|
||||
platforms = with lib.platforms; linux;
|
||||
platforms = with lib.platforms; all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -820,6 +820,10 @@ in
|
|||
flavour = "git";
|
||||
};
|
||||
|
||||
logseq = callPackage ../applications/misc/logseq {
|
||||
electron = electron_11;
|
||||
};
|
||||
|
||||
lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
|
||||
|
||||
microcom = callPackage ../applications/terminal-emulators/microcom { };
|
||||
|
|
@ -1413,6 +1417,8 @@ in
|
|||
|
||||
lesspass-cli = callPackage ../tools/security/lesspass-cli { };
|
||||
|
||||
mpdevil = callPackage ../applications/audio/mpdevil { };
|
||||
|
||||
pacparser = callPackage ../tools/networking/pacparser { };
|
||||
|
||||
pass = callPackage ../tools/security/pass { };
|
||||
|
|
@ -2280,6 +2286,8 @@ in
|
|||
|
||||
edac-utils = callPackage ../os-specific/linux/edac-utils { };
|
||||
|
||||
eddy = libsForQt5.callPackage ../applications/graphics/eddy { };
|
||||
|
||||
eggdrop = callPackage ../tools/networking/eggdrop { };
|
||||
|
||||
eksctl = callPackage ../tools/admin/eksctl { };
|
||||
|
|
@ -3934,6 +3942,8 @@ in
|
|||
|
||||
kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
|
||||
|
||||
lychee = callPackage ../tools/networking/lychee { };
|
||||
|
||||
magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { };
|
||||
|
||||
mcrcon = callPackage ../tools/networking/mcrcon {};
|
||||
|
|
@ -4850,6 +4860,8 @@ in
|
|||
|
||||
gnuapl = callPackage ../development/interpreters/gnu-apl { };
|
||||
|
||||
gnucap = callPackage ../applications/science/electronics/gnucap { };
|
||||
|
||||
gnu-cobol = callPackage ../development/compilers/gnu-cobol { };
|
||||
|
||||
gnuclad = callPackage ../applications/graphics/gnuclad { };
|
||||
|
|
@ -6157,6 +6169,8 @@ in
|
|||
|
||||
libzmf = callPackage ../development/libraries/libzmf {};
|
||||
|
||||
librespeed-cli = callPackage ../tools/misc/librespeed-cli { };
|
||||
|
||||
libreswan = callPackage ../tools/networking/libreswan { };
|
||||
|
||||
librest = callPackage ../development/libraries/librest { };
|
||||
|
|
@ -7412,6 +7426,8 @@ in
|
|||
|
||||
cntlm = callPackage ../tools/networking/cntlm { };
|
||||
|
||||
past-time = python3Packages.callPackage ../tools/misc/past-time { };
|
||||
|
||||
pastebinit = callPackage ../tools/misc/pastebinit { };
|
||||
|
||||
pifi = callPackage ../applications/audio/pifi { };
|
||||
|
|
@ -8635,6 +8651,8 @@ in
|
|||
|
||||
trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
|
||||
|
||||
trunk = callPackage ../development/tools/trunk { };
|
||||
|
||||
tthsum = callPackage ../applications/misc/tthsum { };
|
||||
|
||||
chaps = callPackage ../tools/security/chaps { };
|
||||
|
|
@ -22712,6 +22730,8 @@ in
|
|||
|
||||
freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {};
|
||||
|
||||
freeplane = callPackage ../applications/misc/freeplane { };
|
||||
|
||||
freepv = callPackage ../applications/graphics/freepv { };
|
||||
|
||||
xfontsel = callPackage ../applications/misc/xfontsel { };
|
||||
|
|
@ -24144,6 +24164,7 @@ in
|
|||
mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {};
|
||||
simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {};
|
||||
sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};
|
||||
thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };
|
||||
};
|
||||
|
||||
mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
|
||||
|
|
@ -27819,7 +27840,6 @@ in
|
|||
|
||||
zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
|
||||
wxGTK = wxGTK30;
|
||||
stdenv = gcc9Stdenv;
|
||||
});
|
||||
|
||||
zeroad = zeroadPackages.zeroad;
|
||||
|
|
|
|||
|
|
@ -8682,6 +8682,10 @@ let
|
|||
url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.003001.tar.gz";
|
||||
sha256 = "1q7im0zj238k5agwi7d1mz26a8r0wrxwfwp1l8n5k777gx3b5xhp";
|
||||
};
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
shortenPerlShebang $out/bin/git-autofixup
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ maintainers.DamienCassou ];
|
||||
description = "Create fixup commits for topic branches";
|
||||
|
|
|
|||
|
|
@ -302,6 +302,8 @@ in {
|
|||
|
||||
aionotify = callPackage ../development/python-modules/aionotify { };
|
||||
|
||||
aionotion = callPackage ../development/python-modules/aionotion { };
|
||||
|
||||
aioprocessing = callPackage ../development/python-modules/aioprocessing { };
|
||||
|
||||
aiopulse = callPackage ../development/python-modules/aiopulse { };
|
||||
|
|
@ -1422,6 +1424,10 @@ in {
|
|||
|
||||
cmdtest = callPackage ../development/python-modules/cmdtest { };
|
||||
|
||||
cmigemo = callPackage ../development/python-modules/cmigemo {
|
||||
inherit (pkgs) cmigemo;
|
||||
};
|
||||
|
||||
cmsis-svd = callPackage ../development/python-modules/cmsis-svd { };
|
||||
|
||||
cntk = callPackage ../development/python-modules/cntk { };
|
||||
|
|
@ -1843,6 +1849,8 @@ in {
|
|||
|
||||
django-cache-url = callPackage ../development/python-modules/django-cache-url { };
|
||||
|
||||
django-cacheops = callPackage ../development/python-modules/django-cacheops { };
|
||||
|
||||
django_classytags = callPackage ../development/python-modules/django_classytags { };
|
||||
|
||||
django-cleanup = callPackage ../development/python-modules/django-cleanup { };
|
||||
|
|
@ -3565,6 +3573,8 @@ in {
|
|||
|
||||
jupyter_core = callPackage ../development/python-modules/jupyter_core { };
|
||||
|
||||
jupyter_server = callPackage ../development/python-modules/jupyter_server { };
|
||||
|
||||
jupyterhub = callPackage ../development/python-modules/jupyterhub { };
|
||||
|
||||
jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { };
|
||||
|
|
@ -3583,6 +3593,8 @@ in {
|
|||
|
||||
jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { };
|
||||
|
||||
jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { };
|
||||
|
||||
jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker {
|
||||
pkgs-docker = pkgs.docker;
|
||||
};
|
||||
|
|
@ -4365,6 +4377,8 @@ in {
|
|||
|
||||
mpi4py = callPackage ../development/python-modules/mpi4py { };
|
||||
|
||||
mplfinance = callPackage ../development/python-modules/mplfinance { };
|
||||
|
||||
mplleaflet = callPackage ../development/python-modules/mplleaflet { };
|
||||
|
||||
mpmath = callPackage ../development/python-modules/mpmath { };
|
||||
|
|
@ -4486,6 +4500,8 @@ in {
|
|||
|
||||
naturalsort = callPackage ../development/python-modules/naturalsort { };
|
||||
|
||||
nbclassic = callPackage ../development/python-modules/nbclassic { };
|
||||
|
||||
nbclient = callPackage ../development/python-modules/nbclient { };
|
||||
|
||||
nbconflux = callPackage ../development/python-modules/nbconflux { };
|
||||
|
|
@ -4838,6 +4854,8 @@ in {
|
|||
|
||||
oyaml = callPackage ../development/python-modules/oyaml { };
|
||||
|
||||
packageurl-python = callPackage ../development/python-modules/packageurl-python { };
|
||||
|
||||
packaging = if isPy3k
|
||||
then callPackage ../development/python-modules/packaging { }
|
||||
else callPackage ../development/python-modules/packaging/2.nix { };
|
||||
|
|
@ -5587,6 +5605,8 @@ in {
|
|||
|
||||
pydantic = callPackage ../development/python-modules/pydantic { };
|
||||
|
||||
pydash = callPackage ../development/python-modules/pydash { };
|
||||
|
||||
pydbus = callPackage ../development/python-modules/pydbus { };
|
||||
|
||||
pydenticon = callPackage ../development/python-modules/pydenticon { };
|
||||
|
|
@ -7629,6 +7649,8 @@ in {
|
|||
|
||||
simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { };
|
||||
|
||||
simplisafe-python = callPackage ../development/python-modules/simplisafe-python { };
|
||||
|
||||
simpy = callPackage ../development/python-modules/simpy { };
|
||||
|
||||
singledispatch = callPackage ../development/python-modules/singledispatch { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue