Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
6d0026d4d6
69 changed files with 525 additions and 249 deletions
|
|
@ -1435,7 +1435,7 @@ Superuser created successfully.
|
|||
<para>
|
||||
The default GNAT version has been changed: The
|
||||
<literal>gnat</literal> attribute now points to
|
||||
<literal>gnat11</literal> instead of <literal>gnat9</literal>.
|
||||
<literal>gnat12</literal> instead of <literal>gnat9</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
|
|
|||
|
|
@ -1694,6 +1694,22 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [
|
|||
<literal>picom</literal> to quit instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>haskellPackage.callHackage</literal> is not always
|
||||
invalidated if <literal>all-cabal-hashes</literal> changes,
|
||||
leading to less rebuilds of haskell dependencies.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>haskellPackages.callHackage</literal> and
|
||||
<literal>haskellPackages.callCabal2nix</literal> (and related
|
||||
functions) no longer keep a reference to the
|
||||
<literal>cabal2nix</literal> call used to generate them. As a
|
||||
result, they will be garbage collected more often.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `services.ddclient.password` option was removed, and replaced with `services.ddclient.passwordFile`.
|
||||
|
||||
- The default GNAT version has been changed: The `gnat` attribute now points to `gnat11`
|
||||
- The default GNAT version has been changed: The `gnat` attribute now points to `gnat12`
|
||||
instead of `gnat9`.
|
||||
|
||||
- `retroArchCores` has been removed. This means that using `nixpkgs.config.retroarch` to customize RetroArch cores is not supported anymore. Instead, use package overrides, for example: `retroarch.override { cores = with libretro; [ citra snes9x ]; };`. Also, `retroarchFull` derivation is available for those who want to have all RetroArch cores available.
|
||||
|
|
|
|||
|
|
@ -529,4 +529,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- The option `services.picom.experimentalBackends` was removed since it is now the default and the option will cause `picom` to quit instead.
|
||||
|
||||
- `haskellPackage.callHackage` is not always invalidated if `all-cabal-hashes` changes, leading to less rebuilds of haskell dependencies.
|
||||
|
||||
- `haskellPackages.callHackage` and `haskellPackages.callCabal2nix` (and related functions) no longer keep a reference to the `cabal2nix` call used to generate them. As a result, they will be garbage collected more often.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
f: {
|
||||
system ? builtins.currentSystem,
|
||||
pkgs ? import ../.. { inherit system; },
|
||||
pkgs ? import ../.. { inherit system; config = {}; overlays = []; },
|
||||
...
|
||||
} @ args:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,34 @@
|
|||
{ lib, stdenv, fetchurl, sconsPackages, pkg-config
|
||||
, libsamplerate, libsndfile, liblo, libjack2, boost }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, sconsPackages
|
||||
, rubberband
|
||||
, boost
|
||||
, libjack2
|
||||
, liblo
|
||||
, libsamplerate
|
||||
, libsndfile
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klick";
|
||||
version = "0.12.2";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Allfifthstuning";
|
||||
repo = "klick";
|
||||
rev = version;
|
||||
hash = "sha256-jHyeVCmyy9ipbVaF7GSW19DOVpU9EQJoLcGq9uos+eY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rubberband
|
||||
sconsPackages.scons_latest
|
||||
];
|
||||
buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ];
|
||||
prefixKey = "PREFIX=";
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
meta = {
|
||||
homepage = "http://das.nasophon.de/klick/";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, perl
|
||||
, makeWrapper
|
||||
, writeText
|
||||
, jdk11
|
||||
, jdk
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
|
|
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeWrapper $out/share/mucommander/mucommander.sh $out/bin/mucommander \
|
||||
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
|
||||
--set JAVA_HOME ${jdk11}
|
||||
--set JAVA_HOME ${jdk}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "feedbackd";
|
||||
# Not an actual upstream project release,
|
||||
# only a Debian package release that is tagged in the upstream repo
|
||||
version = "0.0.0+git20220520";
|
||||
version = "0.0.1";
|
||||
|
||||
outputs = [ "out" "dev" ]
|
||||
# remove if cross-compiling gobject-introspection works
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "Librem5";
|
||||
repo = "feedbackd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4ftPC6LnX0kKFYVyH85yCH43B3YjuaZM5rzr8TGgZvc=";
|
||||
hash = "sha256-l1FhECLPq8K9lzQ50sI/aH7fwR9xW1ATyk7EWRmLzuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gostatic";
|
||||
version = "2.34";
|
||||
version = "2.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piranha";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rdbiIFRZcn9dVaF2anl2iy6FM6boz38vjn+hCpMwcis=";
|
||||
hash = "sha256-pxk9tauB7u0oe6g4maHh+dREZXKwMz44v3KB43yYW6c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9YCt9crLuYjd+TUXJyx/EAYIMWM5TD+ZyzLeu0RMxVc=";
|
||||
|
|
|
|||
|
|
@ -1,32 +1,38 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, unixODBC
|
||||
, icu
|
||||
, nix-update-script
|
||||
, testers
|
||||
, usql
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "usql";
|
||||
version = "0.12.13";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xo";
|
||||
repo = "usql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F/eOD7/w8HjJBeiXagaf4yBLZcZVuy93rfVFeSESlZo=";
|
||||
hash = "sha256-bdejXGyvY+HAE4sOxhsZYZ5fCISEVxvfOlEjL/CgBLQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7rMCqTfUs89AX0VP689BmKsuvLJWU5ANJVki+JMVf7g=";
|
||||
|
||||
buildInputs = [ unixODBC icu ];
|
||||
|
||||
# Exclude broken impala driver
|
||||
# The driver breaks too often and is not used.
|
||||
vendorHash = "sha256-+4eRdr5MY9d0ordaDv8hZf4wGoZsp14MpOEp1vhr75w=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Exclude broken impala & hive driver
|
||||
# These drivers break too often and are not used.
|
||||
#
|
||||
# See https://github.com/xo/usql/pull/347
|
||||
#
|
||||
excludedPackages = [
|
||||
"impala"
|
||||
"hive"
|
||||
];
|
||||
|
||||
# These tags and flags are copied from build-release.sh
|
||||
|
|
@ -52,9 +58,21 @@ buildGoModule rec {
|
|||
# All the checks currently require docker instances to run the databases.
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
tests.version = testers.testVersion {
|
||||
inherit version;
|
||||
package = usql;
|
||||
command = "usql --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Universal command-line interface for SQL databases";
|
||||
homepage = "https://github.com/xo/usql";
|
||||
changelog = "https://github.com/xo/usql/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ georgyo anthonyroussel ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, fetchurl
|
||||
, openjdk
|
||||
, libnotify
|
||||
, makeWrapper
|
||||
, tor
|
||||
, p7zip
|
||||
|
|
@ -18,14 +19,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "briar-desktop";
|
||||
version = "0.2.1-beta";
|
||||
version = "0.3.1-beta";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://code.briarproject.org/briar/briar-desktop/-/jobs/18424/artifacts/download?file_type=archive";
|
||||
sha256 = "sha256-ivMbgo0+iZE4/Iffq9HUBErGIQMVLrRZUQ6R3V3X8II=";
|
||||
extension = "zip";
|
||||
src = fetchurl {
|
||||
url = "https://desktop.briarproject.org/jars/linux/0.3.1-beta/briar-desktop-linux-0.3.1-beta.jar";
|
||||
sha256 = "841dc198101e6e8aa6b5ab6bd6b80e9c6b2593cb88bc3b2592f947baf963389d";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
p7zip
|
||||
|
|
@ -33,9 +35,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,lib}
|
||||
cp ${src}/briar-desktop.jar $out/lib/
|
||||
cp ${src} $out/lib/briar-desktop.jar
|
||||
makeWrapper ${openjdk}/bin/java $out/bin/briar-desktop \
|
||||
--add-flags "-jar $out/lib/briar-desktop.jar"
|
||||
--add-flags "-jar $out/lib/briar-desktop.jar" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
|
||||
libnotify
|
||||
]}"
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
|
|
|
|||
|
|
@ -13,28 +13,22 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gomuks";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c=";
|
||||
sha256 = "sha256-gLyjqmGZudj8PmsYUGXHOjetZzi6u5CFI7Y50y2XAzk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE=";
|
||||
vendorSha256 = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ olm ];
|
||||
|
||||
# Upstream issue: https://github.com/tulir/gomuks/issues/260
|
||||
patches = lib.optional stdenv.isLinux (substituteAll {
|
||||
src = ./hardcoded_path.patch;
|
||||
soundTheme = sound-theme-freedesktop;
|
||||
});
|
||||
|
||||
postInstall = ''
|
||||
cp -r ${
|
||||
makeDesktopItem {
|
||||
|
|
@ -49,7 +43,9 @@ buildGoModule rec {
|
|||
}/* $out/
|
||||
substituteAllInPlace $out/share/applications/*
|
||||
wrapProgram $out/bin/gomuks \
|
||||
--prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}"
|
||||
--prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" \
|
||||
--set-default GOMUKS_SOUND_NORMAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/message-new-instant.oga" \
|
||||
--set-default GOMUKS_SOUND_CRITICAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/complete.oga"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go
|
||||
index 7f102b8..996c15f 100644
|
||||
--- a/lib/notification/notify_xdg.go
|
||||
+++ b/lib/notification/notify_xdg.go
|
||||
@@ -26,8 +26,8 @@ import (
|
||||
var notifySendPath string
|
||||
var audioCommand string
|
||||
var tryAudioCommands = []string{"ogg123", "paplay"}
|
||||
-var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga"
|
||||
-var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga"
|
||||
+var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga"
|
||||
+var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga"
|
||||
|
||||
func getSoundPath(env, defaultPath string) string {
|
||||
if path, ok := os.LookupEnv(env); ok {
|
||||
|
|
@ -1,20 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, pidgin, intltool, python2 } :
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pidgin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "purple-plugin-pack";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-${version}.tar.bz2";
|
||||
sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
|
||||
url = "mirror://sourceforge/pidgin/purple-plugin-pack-2.8.0.tar.xz";
|
||||
hash = "sha256-gszemnJRp1t+A6P5qSkBTY4AjBtvRuWGOPX0dto+JC0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [ pidgin python2 ];
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "PURPLE.get_pkgconfig_variable('plugindir')" "'$out/lib/purple-2'" \
|
||||
--replace "PURPLE.get_pkgconfig_variable('datadir')" "'$out/share'" \
|
||||
--replace "PIDGIN.get_pkgconfig_variable('plugindir')" "'$out/lib/pidgin'" \
|
||||
--replace "PIDGIN.get_pkgconfig_variable('datadir')" "'$out/share'"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pidgin
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack";
|
||||
description = "Plugin pack for Pidgin 2.x";
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://keep.imfreedom.org/pidgin/purple-plugin-pack";
|
||||
description = "Collection of plugins for purple-based clients such as Pidgin";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bdimcheff ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, python3
|
||||
, pkg-config
|
||||
, libuuid
|
||||
, openjdk11
|
||||
, openjdk
|
||||
, gperftools
|
||||
, flatbuffers
|
||||
, fetchpatch
|
||||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
openjdk11
|
||||
openjdk
|
||||
(python3.withPackages (p: with p; [
|
||||
psutil
|
||||
orderedmultidict
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
let
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
suffix = {
|
||||
x86_64-linux = "x86_64";
|
||||
|
|
@ -22,8 +23,8 @@ stdenv.mkDerivation {
|
|||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-RkFlc+atTB9zHRAjQSqe4nJ9N7I9FE/RBeEcXoCk0T8=";
|
||||
aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc=";
|
||||
x86_64-linux = "sha256-3+CqVBOb2haknQIMzE9kl99pDWm9wZPUX92FlVov3No=";
|
||||
aarch64-linux = "sha256-ii+x4YEZIZJuM+1Njvxe1dz6WOvAK1SWqfuodC7a4yo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, python2, libkkc }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, python3, libkkc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkkc-data";
|
||||
|
|
@ -9,7 +9,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python2.pkgs.marisa ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "build-python3.patch";
|
||||
url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch";
|
||||
relative = "data/templates/libkkc-data";
|
||||
hash = "sha256-q4zUclJtDQ1E5v2PW00zRZz6GXllLUcp2h3tugufrRU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.marisa ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "15.0";
|
||||
version = "16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GjBIAir4xTWnc1VXe5CF+FPcZJTSyJpi8MqlJUpkyy4=";
|
||||
sha256 = "sha256-kBXGYXOrza4tb5J9hmheDhZcwEd1xT6wLUc9cBGJ/AY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MywgFoydV58oBJ2dGK1lWSu7o3SkuOhLpKhy7WDAJ3I=";
|
||||
sha256 = "sha256-LLl3T7VvDyyeq47vgZPkQhcPk2yZMRsCta8EqduNvuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-VcC7G0m/GYpxUZ+c+orFkCaqiNO3fUjymE29Z1pMqek=";
|
||||
cargoSha256 = "sha256-vMgU66LhhRrSA9Dx3eyVmUwrYKVtAfE12tQC8WzTimo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
|
|
|
|||
|
|
@ -161,17 +161,13 @@ let
|
|||
src = "${component}/${name}.cabal";
|
||||
};
|
||||
|
||||
# Adds a nix file as an input to the haskell derivation it
|
||||
# produces. This is useful for callHackage / callCabal2nix to
|
||||
# prevent the generated default.nix from being garbage collected
|
||||
# (requiring it to be frequently rebuilt), which can be an
|
||||
# annoyance.
|
||||
# Adds a nix file derived from cabal2nix in the passthru of the derivation it
|
||||
# produces. This is useful to debug callHackage / callCabal2nix by looking at
|
||||
# the content of the nix file pointed by `cabal2nixDeriver`.
|
||||
# However, it does not keep a reference to that file, which may be garbage
|
||||
# collected, which may be an annoyance.
|
||||
callPackageKeepDeriver = src: args:
|
||||
overrideCabal (orig: {
|
||||
preConfigure = ''
|
||||
# Generated from ${src}
|
||||
${orig.preConfigure or ""}
|
||||
'';
|
||||
passthru = orig.passthru or {} // {
|
||||
# When using callCabal2nix or callHackage, it is often useful
|
||||
# to debug a failure by inspecting the Nix expression
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swiften";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
|
||||
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
|
||||
url = "http://swift.im/git/swift/snapshot/swift-${version}.tar.bz2";
|
||||
hash = "sha256-aj+T6AevtR8birbsj+83nfzFC6cf72q+7nwSM0jaZrA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
sconsPackages.scons_3_1_2
|
||||
sconsPackages.scons_latest
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -65,6 +65,10 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
# Ensure bundled dependencies cannot be used.
|
||||
rm -rf 3rdParty
|
||||
|
||||
find . \( \
|
||||
-name '*.py' -o -name SConscript -o -name SConstruct \
|
||||
\) -exec 2to3 -w {} +
|
||||
'';
|
||||
|
||||
installTargets = "${placeholder "out"}";
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ let
|
|||
removeSuffix
|
||||
hasInfix
|
||||
optionalString
|
||||
makeBinPath
|
||||
makeLibraryPath
|
||||
makeSearchPath
|
||||
recurseIntoAttrs
|
||||
|
|
@ -249,6 +250,12 @@ let
|
|||
then pkgs.applyPatches { inherit (args) src patches; }
|
||||
else args.src;
|
||||
patches = [];
|
||||
|
||||
# make sure that propagated build-inputs from lispLibs are propagated
|
||||
propagatedBuildInputs = lib.unique
|
||||
(builtins.concatLists
|
||||
(lib.catAttrs "propagatedBuildInputs"
|
||||
(builtins.concatLists [[args] lispLibs nativeLibs javaLibs])));
|
||||
})));
|
||||
|
||||
# Build the set of lisp packages using `lisp`
|
||||
|
|
@ -353,7 +360,9 @@ let
|
|||
--prefix LD_LIBRARY_PATH : "${o.LD_LIBRARY_PATH}" \
|
||||
--prefix LD_LIBRARY_PATH : "${makeLibraryPath o.nativeLibs}" \
|
||||
--prefix CLASSPATH : "${o.CLASSPATH}" \
|
||||
--prefix CLASSPATH : "${makeSearchPath "share/java/*" o.javaLibs}"
|
||||
--prefix CLASSPATH : "${makeSearchPath "share/java/*" o.javaLibs}" \
|
||||
--prefix PATH : "${makeBinPath (o.buildInputs or [])}" \
|
||||
--prefix PATH : "${makeBinPath (o.propagatedBuildInputs or [])}"
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
From 2040fcab5a7be2f28add46a1412bef62ac5ccf11 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Marx <mmarx@wh2.tu-dresden.de>
|
||||
Date: Thu, 24 Nov 2022 20:00:33 +0100
|
||||
Subject: [PATCH] Use glucose binary from PATH if present
|
||||
|
||||
---
|
||||
src/package.lisp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/package.lisp b/src/package.lisp
|
||||
index b6e26ac..bdb2581 100644
|
||||
--- a/src/package.lisp
|
||||
+++ b/src/package.lisp
|
||||
@@ -13,7 +13,9 @@
|
||||
(defvar *glucose-home* (asdf:system-relative-pathname :cl-sat.glucose "glucose-syrup/"))
|
||||
|
||||
(defun glucose-binary (&optional (*glucose-home* *glucose-home*))
|
||||
- (merge-pathnames "simp/glucose_static" *glucose-home*))
|
||||
+ (if (trivial-package-manager:which "glucose")
|
||||
+ "glucose"
|
||||
+ (merge-pathnames "simp/glucose_static" *glucose-home*)))
|
||||
|
||||
(defmethod solve ((input pathname) (solver (eql :glucose)) &rest options &key debug &allow-other-keys)
|
||||
(remf options :debug)
|
||||
--
|
||||
2.36.2
|
||||
|
||||
|
|
@ -190,6 +190,17 @@ let
|
|||
nativeBuildInputs = [ pkgs.zeromq ];
|
||||
nativeLibs = [ pkgs.zeromq ];
|
||||
};
|
||||
trivial-package-manager = pkg: {
|
||||
propagatedBuildInputs = [ pkgs.which ];
|
||||
};
|
||||
"cl-sat.glucose" = pkg: {
|
||||
propagatedBuildInputs = [ pkgs.glucose ];
|
||||
patches = [ ./patches/cl-sat.glucose-binary-from-PATH-if-present.patch ];
|
||||
|
||||
};
|
||||
"cl-sat.minisat" = pkg: {
|
||||
propagatedBuildInputs = [ pkgs.minisat ];
|
||||
};
|
||||
};
|
||||
|
||||
qlpkgs =
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, openssl
|
||||
, pylsqpack
|
||||
|
|
@ -17,6 +18,19 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch is here because it's required by the next patch.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/3930580b50831a034d21ee4689362188b21a4d6a.patch";
|
||||
hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag=";
|
||||
})
|
||||
# https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22
|
||||
(assert lib.versions.major pyopenssl.version == "22"; fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch";
|
||||
hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
pylsqpack
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "1.4.6";
|
||||
version = "1.4.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-76IYH9IWeHU+PAtpLFGT5f8oG2roY3raW0NC3KUnFls=";
|
||||
hash = "sha256-FTDbQ9RZs1XleferFS8BAioWP0iWyHrDbytY68q/0tQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
|
@ -69,6 +69,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Annotation based documentation for your Ansible roles";
|
||||
homepage = "https://github.com/thegeeklab/ansible-doctor";
|
||||
changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/v${version}";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ tboerger ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "3.0.2";
|
||||
version = "4.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-y+ZOTvWnqSHBpuqquA0IvkWj1B/BmovTUqg1Oddjd5c=";
|
||||
sha256 = "sha256-tGvhbhldevMsa9091GDBq2vLRgMdOqc9kiEF8OZeUI8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder
|
||||
, clang_12, python2, python
|
||||
, clang_12, python
|
||||
, graphviz, matplotlib, numpy, pandas, plotly, scipy, six
|
||||
, withCuda ? false, cudatoolkit }:
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ clang_12 python2 ];
|
||||
nativeBuildInputs = [ clang_12 ];
|
||||
|
||||
propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ]
|
||||
++ lib.optionals withCuda [ cudatoolkit ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi-mail";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "sabuhish";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-58j3hb9selJTWitWQT8nkkhRJiPoFr0/mj5viSnnwlA=";
|
||||
hash = "sha256-+i/p4KVppsOkj2TEoZKmjrlnkhk2wxPg2enh2QCXiQI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gdown";
|
||||
version = "4.5.3";
|
||||
version = "4.5.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bL991BCFiMc0qliBMdjh1S5k8Ic4cPcfdMusGV8MYO8=";
|
||||
hash = "sha256-av9n0esi+zpa7StFY3lKo1Bsct8IP4ax7EkyUnCcpo8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A CLI tool for downloading large files from Google Drive";
|
||||
homepage = "https://github.com/wkentaro/gdown";
|
||||
changelog = "https://github.com/wkentaro/gdown/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ breakds ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -56,6 +56,10 @@ let
|
|||
url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-7Ir55ZhBkccqfoa56WVBF8QwFAC2ws4KFHDkfVw6zm0=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_10_14_x86_64.whl";
|
||||
hash = "sha256-bOoQI+T+YsTUNA+cDu6wwYTcq9fyyzCpK9qrdCrNVoA=";
|
||||
};
|
||||
};
|
||||
|
||||
gpuSrc = fetchurl {
|
||||
|
|
@ -121,6 +125,6 @@ buildPythonPackage rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
platforms = [ "aarch64-darwin" "x86_64-linux" ];
|
||||
platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
32
pkgs/development/python-modules/marisa/default.nix
Normal file
32
pkgs/development/python-modules/marisa/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, marisa
|
||||
, swig
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marisa";
|
||||
inherit (marisa) src version;
|
||||
|
||||
nativeBuildInputs = [ swig ];
|
||||
|
||||
buildInputs = [ marisa ];
|
||||
|
||||
preBuild = ''
|
||||
make -C bindings swig-python
|
||||
|
||||
cd bindings/python
|
||||
'';
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "marisa" ];
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for marisa";
|
||||
homepage = "https://github.com/s-yata/marisa-trie";
|
||||
license = with lib.licenses; [ bsd2 lgpl21Plus ];
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyskyqremote";
|
||||
version = "0.3.20";
|
||||
version = "0.3.21";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "RogerSelwyn";
|
||||
repo = "skyq_remote";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-HLiLFuMJL9iXv7FckoVVK02jOhSRMrU8FohkD4gKjmM=";
|
||||
hash = "sha256-SVNvgQe4OonR6sVIMUeMYfs7fjL6JMnVEsQuw7VrJhQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -37,6 +37,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module for accessing SkyQ boxes";
|
||||
homepage = "https://github.com/RogerSelwyn/skyq_remote";
|
||||
changelog = "https://github.com/RogerSelwyn/skyq_remote/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "typeddjango";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-7Qow315zuZB6BNIIm6QR9ZMFH6E/VSp2vRBpONlqYhM=";
|
||||
hash = "sha256-7Qow315zuZB6BNIIm6QR9ZMFH6E/VSp2vRBpONlqYhM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -50,9 +50,18 @@ buildPythonPackage rec {
|
|||
"pytest_mypy_plugins"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# ...TypecheckAssertionError: Invalid output:
|
||||
"with_out"
|
||||
"add_mypypath_env_var_to_package_searc"
|
||||
"error_case"
|
||||
"skip_if_false"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest plugin for testing mypy types, stubs, and plugins";
|
||||
homepage = "https://github.com/TypedDjango/pytest-mypy-plugins";
|
||||
changelog = "https://github.com/typeddjango/pytest-mypy-plugins/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SomeoneSerge ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-mystrom";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "050dkx29wrmdd8z7pmyk36k2ihpapqi4qmyb70bm6xl5l4jh4k7j";
|
||||
sha256 = "sha256-Kqv5rUdwkynOzssID77gVYyzs0CDR/bUWh6zpt5zOP8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -39,6 +39,7 @@ buildPythonPackage rec {
|
|||
There is support for bulbs, motion sensors, plugs and buttons.
|
||||
'';
|
||||
homepage = "https://github.com/home-assistant-ecosystem/python-mystrom";
|
||||
changelog = "https://github.com/home-assistant-ecosystem/python-mystrom/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
sed -i '/--cov/d' pytest.ini
|
||||
sed -i '/--mypy/d' pytest.ini
|
||||
'';
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
@ -49,6 +50,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module with some convenient utilities";
|
||||
homepage = "https://github.com/WoLpH/python-utils";
|
||||
changelog = "https://github.com/wolph/python-utils/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skodaconnect";
|
||||
version = "1.1.26";
|
||||
version = "1.1.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "lendy007";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zuS19oM3V+o0yiby6yOX2RSxXY3m5qhqjlX2v9jmpIk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CK5u2Nx1Z7XPDL5W24XxYCo3GfMYCAqKwxpQ8QTfQ0o=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
@ -55,6 +55,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module to communicate with Skoda Connect";
|
||||
homepage = "https://github.com/lendy007/skodaconnect";
|
||||
changelog = "https://github.com/lendy007/skodaconnect/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-colorama";
|
||||
version = "0.4.15.3";
|
||||
version = "0.4.15.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k2L0kWdQX3EbvJpjUtrmZQSVswUzg4aPf3a/642SMAI=";
|
||||
hash = "sha256-YPfWJXkTE1IYVkzxudLpZ4wM5ywFHZ/6oadMdpBOWAg=";
|
||||
};
|
||||
|
||||
# Module has no tests
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-setuptools";
|
||||
version = "65.5.0.3";
|
||||
version = "65.6.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-F3aRcfXyotxpslwNMQZVKlzadnu/azbLYhKyba5aqfw=";
|
||||
sha256 = "sha256-MnC+rbmbxvpLmlzDUQbnFEpcMwKM5ImSsQ50rcjMXII=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchzip, openjdk11, gradle, makeWrapper, maven }:
|
||||
{ lib, stdenv, fetchzip, openjdk, gradle, makeWrapper, maven }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin-language-server";
|
||||
|
|
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ gradle makeWrapper ];
|
||||
buildInputs = [ openjdk11 gradle ];
|
||||
buildInputs = [ openjdk gradle ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk11} --prefix PATH : ${lib.strings.makeBinPath [ openjdk11 maven ] }
|
||||
wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk} --prefix PATH : ${lib.strings.makeBinPath [ openjdk maven ] }
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||
using the Language Server Protocol Topics'';
|
||||
maintainers = with lib.maintainers; [ vtuan10 ];
|
||||
homepage = "https://github.com/fwcd/kotlin-language-server";
|
||||
changelog = "https://github.com/fwcd/kotlin-language-server/blob/${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
let ccache = stdenv.mkDerivation rec {
|
||||
pname = "ccache";
|
||||
version = "4.7.3";
|
||||
version = "4.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i5VOKBNAzu65Ha3Lj3Hh6k+EMGPRAo5/qnwnJipDnMI=";
|
||||
sha256 = "sha256-mt5udwSdzGaspfpAdUavQ55dBeJdhbZjcQpd9xNOQms=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -4,28 +4,28 @@ GEM
|
|||
ast (2.4.2)
|
||||
bugsnag (6.24.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
concurrent-ruby (1.1.9)
|
||||
concurrent-ruby (1.1.10)
|
||||
ffi (1.15.5)
|
||||
liquid (5.2.0)
|
||||
liquid (5.4.0)
|
||||
listen (3.7.1)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
mini_portile2 (2.8.0)
|
||||
nokogiri (1.13.3)
|
||||
nokogiri (1.13.9)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
parser (3.1.1.0)
|
||||
parser (3.1.2.1)
|
||||
ast (~> 2.4.1)
|
||||
racc (1.6.0)
|
||||
rb-fsevent (0.11.1)
|
||||
rb-fsevent (0.11.2)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
shopify-cli (2.14.0)
|
||||
shopify-cli (2.32.0)
|
||||
bugsnag (~> 6.22)
|
||||
listen (~> 3.7.0)
|
||||
theme-check (~> 1.10.1)
|
||||
theme-check (1.10.2)
|
||||
liquid (>= 5.1.0)
|
||||
theme-check (~> 1.11.0)
|
||||
theme-check (1.11.0)
|
||||
liquid (>= 5.4.0)
|
||||
nokogiri (>= 1.12)
|
||||
parser (~> 3)
|
||||
|
||||
|
|
@ -36,4 +36,4 @@ DEPENDENCIES
|
|||
shopify-cli
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.33
|
||||
2.3.25
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ let
|
|||
rubyEnv = bundlerEnv {
|
||||
name = "shopify-cli";
|
||||
gemdir = ./.;
|
||||
ruby = ruby;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default"];
|
||||
|
|
@ -45,10 +45,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16aqzbvhvm254hbl274l4883h38j8wlwkcarmg09c7wzgpi0jnl1";
|
||||
sha256 = "0h0d0ghdf01lkv4x0mzp6zdkrnj7gsfq3widkhyni26bf6648qp3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.0";
|
||||
version = "5.4.0";
|
||||
};
|
||||
listen = {
|
||||
dependencies = ["rb-fsevent" "rb-inotify"];
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
|
||||
sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.3";
|
||||
version = "1.13.9";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
|
|
@ -88,10 +88,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
|
||||
sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.1.0";
|
||||
version = "3.1.2.1";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
|
|
@ -108,10 +108,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm";
|
||||
sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
};
|
||||
rb-inotify = {
|
||||
dependencies = ["ffi"];
|
||||
|
|
@ -130,10 +130,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fjqahhvmvqvmpfwa337ran9hhn9wk0ylm502qvcy5i4xy5hvd2r";
|
||||
sha256 = "1zwq99zlsk624g5k706daapzhwm9v4whc8l6h3yw48265b6wkdwv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.14.0";
|
||||
version = "2.32.0";
|
||||
};
|
||||
theme-check = {
|
||||
dependencies = ["liquid" "nokogiri" "parser"];
|
||||
|
|
@ -141,9 +141,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0314f49fg354wgqavvipfaf6a03090kqrgv48qvkb0ikhvqawpdr";
|
||||
sha256 = "0971ma7qnbbycfnlwwq3pfz8f6axcslif9dbzmgimv7ad0nrjpp2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.2";
|
||||
version = "1.11.0";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,69 @@
|
|||
{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs
|
||||
, boost, expat, freetype, libjpeg, wxGTK32, lua, perl, pkg-config, zlib, zip, bzip2
|
||||
, libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }:
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, stdenv
|
||||
, SDL
|
||||
, SDL_image
|
||||
, SDL_mixer
|
||||
, SDL_sound
|
||||
, libsigcxx
|
||||
, physfs
|
||||
, boost
|
||||
, expat
|
||||
, freetype
|
||||
, libjpeg
|
||||
, wxGTK32
|
||||
, lua
|
||||
, perl
|
||||
, pkg-config
|
||||
, zlib
|
||||
, zip
|
||||
, bzip2
|
||||
, libpng
|
||||
, libtiff
|
||||
, fluidsynth
|
||||
, libmikmod
|
||||
, libvorbis
|
||||
, flac
|
||||
, libogg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asc";
|
||||
version = "2.6.0.0";
|
||||
version = "2.6.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/asc-hq/asc-${version}.tar.bz2";
|
||||
sha256 = "1fybasb6srqfg6pqbvh0s0vvzjq9r0n6aq0z44hs7n68kmaam775";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValHaris";
|
||||
repo = "asc-hq";
|
||||
rev = "fa3bca082a5cea2b35812349f99b877f0113aef0";
|
||||
sha256 = "atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-paragui" "--disable-paraguitest" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing -std=c++11"; # I'm too lazy to catch all gcc47-related problems
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat
|
||||
freetype libjpeg wxGTK32 lua perl zlib zip bzip2 libpng
|
||||
libtiff fluidsynth libmikmod flac libvorbis libogg
|
||||
SDL
|
||||
SDL_image
|
||||
SDL_mixer
|
||||
SDL_sound
|
||||
physfs
|
||||
boost
|
||||
expat
|
||||
freetype
|
||||
libjpeg
|
||||
wxGTK32
|
||||
lua
|
||||
perl
|
||||
zlib
|
||||
zip
|
||||
bzip2
|
||||
libpng
|
||||
libtiff
|
||||
fluidsynth
|
||||
libmikmod
|
||||
flac
|
||||
libvorbis
|
||||
libogg
|
||||
libsigcxx
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost,
|
||||
pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip,
|
||||
{ fetchFromGitHub, lib, stdenv, wxGTK30-gtk3, freeimage, cmake, zziplib, libGLU, libGL, boost,
|
||||
pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip,
|
||||
angelscript, ogrepaged, mysocketw, libxcb
|
||||
}:
|
||||
|
||||
|
|
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./gtk3.patch
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
|
||||
mkdir -p $out/share/rigsofrods
|
||||
|
|
@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config unzip ];
|
||||
buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost
|
||||
libuuid openal ogre ois curl gtk2 mygui angelscript
|
||||
buildInputs = [ wxGTK30-gtk3 freeimage zziplib libGLU libGL boost
|
||||
libuuid openal ogre ois curl gtk3 mygui angelscript
|
||||
ogrepaged mysocketw libxcb ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -34,6 +38,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
29
pkgs/games/rigsofrods/gtk3.patch
Normal file
29
pkgs/games/rigsofrods/gtk3.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake
|
||||
index 1bdf93c..4773fca 100644
|
||||
--- a/cmake/DependenciesConfig.cmake
|
||||
+++ b/cmake/DependenciesConfig.cmake
|
||||
@@ -187,10 +187,8 @@ endmacro(importLib)
|
||||
|
||||
ELSEIF(UNIX)
|
||||
find_package(PkgConfig)
|
||||
- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED)
|
||||
- PKG_CHECK_MODULES (GTK_PIXBUF gdk-pixbuf-2.0 REQUIRED)
|
||||
+ PKG_CHECK_MODULES (GTK gtk+-3.0 REQUIRED)
|
||||
include_directories(${GTK_INCLUDE_DIRS})
|
||||
- include_directories(${GTK_PIXBUF_INCLUDE_DIRS})
|
||||
|
||||
# Ogre basics
|
||||
PKG_CHECK_MODULES (Ogre OGRE REQUIRED)
|
||||
diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt
|
||||
index 51cc350..7f723b6 100644
|
||||
--- a/source/configurator/CMakeLists.txt
|
||||
+++ b/source/configurator/CMakeLists.txt
|
||||
@@ -56,7 +56,7 @@ IF(WIN32)
|
||||
endif(ROR_USE_OPENCL)
|
||||
ELSEIF(UNIX)
|
||||
find_package(PkgConfig)
|
||||
- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED)
|
||||
+ PKG_CHECK_MODULES (GTK gtk+-3.0 REQUIRED)
|
||||
INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
|
||||
|
||||
PKG_CHECK_MODULES (Ogre OGRE REQUIRED)
|
||||
|
|
@ -1,27 +1,30 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, readline, systemd, liburcu, json_c, kmod, nixosTests }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, perl
|
||||
, lvm2
|
||||
, libaio
|
||||
, readline
|
||||
, systemd
|
||||
, liburcu
|
||||
, json_c
|
||||
, kmod
|
||||
, cmocka
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "multipath-tools";
|
||||
version = "0.8.3";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz";
|
||||
sha256 = "1mgjylklh1cx8px8ffgl12kyc0ln3445vbabd2sy8chq31rpiiq8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "opensvc";
|
||||
repo = "multipath-tools";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with json-c 0.14 https://www.redhat.com/archives/dm-devel/2020-May/msg00261.html
|
||||
./json-c-0.14.patch
|
||||
|
||||
# pull upstream fix for -fno-common toolchains like clang-12
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/opensvc/multipath-tools/commit/23a9247fa89cd0c84fe7e0f32468fd698b1caa48.patch";
|
||||
sha256 = "10hq0g2jfkfbmwhm4x4q5cgsswj30lm34ib153alqzjzsxc1hqjk";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libmultipath/Makefile \
|
||||
--replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h
|
||||
|
|
@ -53,10 +56,17 @@ stdenv.mkDerivation rec {
|
|||
"SYSTEMDPATH=lib"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
# skip test attempting to access /sys/dev/block
|
||||
substituteInPlace tests/Makefile --replace ' devt ' ' '
|
||||
'';
|
||||
checkInputs = [ cmocka ];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for the Linux multipathing driver";
|
||||
description = "Tools for the Linux multipathing storage driver";
|
||||
homepage = "http://christophe.varoqui.free.fr/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
|
||||
index ac85b63f..b1a6ddea 100644
|
||||
--- a/libdmmp/libdmmp_private.h
|
||||
+++ b/libdmmp/libdmmp_private.h
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
+#include <stdbool.h>
|
||||
#include <json.h>
|
||||
|
||||
#include "libdmmp/libdmmp.h"
|
||||
@@ -82,7 +83,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
|
||||
do { \
|
||||
json_type j_type = json_type_null; \
|
||||
json_object *j_obj_tmp = NULL; \
|
||||
- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
|
||||
+ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != true) { \
|
||||
_error(ctx, "Invalid JSON output from multipathd IPC: " \
|
||||
"key '%s' not found", key); \
|
||||
rc = DMMP_ERR_IPC_ERROR; \
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "new-lg4ff";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "berarma";
|
||||
repo = "new-lg4ff";
|
||||
rev = "${version}";
|
||||
sha256 = "+05xDpNI4m6wTS+YPgA0fP4iM10nMOZOtCrdQxpevBU=";
|
||||
sha256 = "ZFwNdeJcSxzWtqjOF86SZpqhuz8jXZ2drvlQeIqsaNY=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ stdenv, lib, fetchFromGitHub, python2 }:
|
||||
{ stdenv, lib, fetchFromGitHub, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
python = python3.withPackages (p: [ p.pexpect ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "0.9.0";
|
||||
pname = "reptyr";
|
||||
|
||||
|
|
@ -13,9 +15,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
|
||||
|
||||
checkInputs = [ (python2.withPackages (p: [ p.pexpect ])) ];
|
||||
checkInputs = [ python ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkFlags = [
|
||||
"PYTHON_CMD=${python.interpreter}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
, libffi
|
||||
, libusb1
|
||||
, wxGTK30-gtk3
|
||||
, python2
|
||||
, python3
|
||||
, gcc-arm-embedded
|
||||
, klipper
|
||||
|
|
@ -20,7 +19,6 @@
|
|||
src = klipper.src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
python2
|
||||
python3
|
||||
pkgsCross.avr.stdenv.cc
|
||||
gcc-arm-embedded
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, pkgsCross
|
||||
, klipper
|
||||
, klipper-firmware
|
||||
, python2
|
||||
, python3
|
||||
, avrdude
|
||||
, stm32flash
|
||||
, mcu ? "mcu"
|
||||
|
|
@ -19,7 +19,7 @@ in
|
|||
writeShellApplication {
|
||||
name = "klipper-flash-${mcu}";
|
||||
runtimeInputs = [
|
||||
python2
|
||||
python3
|
||||
pkgsCross.avr.stdenv.cc
|
||||
gnumake
|
||||
] ++ lib.optionals (boardArch == "avr") [ avrdude ] ++ lib.optionals (boardArch == "stm32") [ stm32flash ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ writeShellApplication
|
||||
, klipper
|
||||
, python2
|
||||
, python3
|
||||
, gnumake
|
||||
, pkgsCross
|
||||
}: writeShellApplication {
|
||||
name = "klipper-genconf";
|
||||
runtimeInputs = [
|
||||
python2
|
||||
python3
|
||||
pkgsCross.avr.stdenv.cc
|
||||
gnumake
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, coreutils, installShellFiles, scdoc, nixosTests }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, pam, coreutils, installShellFiles, scdoc, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "maddy";
|
||||
|
|
@ -13,10 +13,14 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-10cLNl9jWYX8XIKQkCxJ+/ymZC1YJRHUJWZQhq7zeV4=";
|
||||
|
||||
tags = [ "libpam" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ];
|
||||
|
||||
subPackages = [ "cmd/maddy" ];
|
||||
|
||||
buildInputs = [ pam ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles scdoc ];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ let
|
|||
generic =
|
||||
# dependencies
|
||||
{ stdenv, lib, fetchurl, makeWrapper
|
||||
, glibc, zlib, readline, openssl, icu, lz4, systemd, libossp_uuid
|
||||
, glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid
|
||||
, pkg-config, libxml2, tzdata, libkrb5
|
||||
|
||||
# This is important to obtain a version of `libpq` that does not depend on systemd.
|
||||
|
|
@ -22,6 +22,7 @@ let
|
|||
let
|
||||
atLeast = lib.versionAtLeast version;
|
||||
lz4Enabled = atLeast "14";
|
||||
zstdEnabled = atLeast "15";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "postgresql";
|
||||
|
|
@ -45,6 +46,7 @@ let
|
|||
icu
|
||||
]
|
||||
++ lib.optionals lz4Enabled [ lz4 ]
|
||||
++ lib.optionals zstdEnabled [ zstd ]
|
||||
++ lib.optionals enableSystemd [ systemd ]
|
||||
++ lib.optionals gssSupport [ libkrb5 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
|
||||
|
|
@ -76,6 +78,7 @@ let
|
|||
(lib.optionalString enableSystemd "--with-systemd")
|
||||
(if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid")
|
||||
] ++ lib.optionals lz4Enabled [ "--with-lz4" ]
|
||||
++ lib.optionals zstdEnabled [ "--with-zstd" ]
|
||||
++ lib.optionals gssSupport [ "--with-gssapi" ]
|
||||
++ lib.optionals stdenv.hostPlatform.isRiscV [ "--disable-spinlocks" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btrfs-progs";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
||||
sha256 = "sha256-tTFv/x2BHirToGeXMQnrkSuw2SgFc1Yl/YuC5wAgHEg=";
|
||||
sha256 = "sha256-ZmWGMEnZRfwyzNrMVacwZ2eqj2QPO4sfpeBWijmucBg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, vala, gobject-introspection, intltool, python2Packages, glib
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, vala, gobject-introspection, intltool, python3, glib
|
||||
, pkg-config
|
||||
, libgee, json-glib, marisa, libkkc-data
|
||||
}:
|
||||
|
|
@ -13,9 +13,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "build-python3.patch";
|
||||
url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch";
|
||||
hash = "sha256-4IVpcJJFrxmxJGNiRHteleAa6trOwbvMHRTE/qyjOPY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala gobject-introspection
|
||||
python2Packages.python python2Packages.marisa
|
||||
python3 python3.pkgs.marisa
|
||||
intltool glib pkg-config
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fsmon";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nowsecure";
|
||||
repo = "fsmon";
|
||||
rev = version;
|
||||
sha256 = "sha256-4KF8h+YdCMrF9Yk/9y71WqNjzyoEZnddriDZAdpIaa4=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vAlAnGeFMgLIKaqUusBV7QalYh0+dZdifUvZwebk65U=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -18,8 +21,9 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "FileSystem Monitor utility";
|
||||
homepage = "https://github.com/nowsecure/fsmon";
|
||||
changelog = "https://github.com/nowsecure/fsmon/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.dezgeg ];
|
||||
maintainers = with maintainers; [ dezgeg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pmbootstrap";
|
||||
version = "1.45.0";
|
||||
version = "1.50.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-75ZFzhRsczkwhiUl1upKjSvmqN0RkXaM8cKr4zLgi4w=";
|
||||
hash = "sha256-UtXUq+B3EMHS3CTqfzbyQK0gHgrFwcwQ6zTzw/EwIuA=";
|
||||
};
|
||||
|
||||
repo = fetchFromGitLab {
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonApplication rec {
|
|||
owner = "postmarketOS";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tG1+vUJW9JIdYpcRn8J0fCIZh29hYo8wSlBKwTUxyMU=";
|
||||
hash = "sha256-wuNsmc7FBk05VgH+E4uwMJeZRTlqAUe6kLvHqCLAwEY=";
|
||||
};
|
||||
|
||||
pmb_test = "${repo}/test";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass";
|
||||
version = "1.14.10";
|
||||
version = "1.14.11";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
|
|
@ -21,10 +21,10 @@ buildGoModule rec {
|
|||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a+JE/s94ynazX50LxVyywzVI5JINK22H76HHwEtw7K0=";
|
||||
hash = "sha256-ItscbCt8BA0OLvzBVAG/q73Dpy44eQxzbA4aUazyFfk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2TlV2cRV/1kugDWo9mhQfDy5jRm6LzTIW54BhZlVt+0=";
|
||||
vendorHash = "sha256-JdPkRFbV5KbQdl8yY0lScHhqZH2TLsOA/lUbaWj1W/0=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-gopass";
|
||||
version = "1.14.9";
|
||||
version = "1.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ULR/Rbl9wt7Vmb9d46/fVkihz10mlIwKA0tUTSU0PSk=";
|
||||
hash = "sha256-JA5VpiImpdxdGSnuzXDBPW8JiLspEhjeR+rlfN41BBM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7wDDHgLLoSIh/Qojz6cudUBN/HzS+ViZn0IZPRymAfg=";
|
||||
vendorHash = "sha256-6GRK1M358LC6S/sjiN42+whz1Z3S+PRKyPOZr8n+daQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-hibp";
|
||||
version = "1.14.9";
|
||||
version = "1.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hakRd581apcP0Nw+j5O3y7ERjIai0FmfXPBQz5ARZaQ=";
|
||||
hash = "sha256-meTLjyxIRR55c2rw7Qh9mJASf6kmakGkfVXnfNHO8dM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TX/4DL1LxM6ldfEViFj3PYtGgI8oAYJfoQvV5gjc4CA=";
|
||||
vendorHash = "sha256-M1o5t4vv75m/0FBO0IBBxsv/pr3G0BX926yRDMyYo+s=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-jsonapi";
|
||||
version = "1.14.9";
|
||||
version = "1.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dyscOIlJjZ8P6sEMC9YqhAAI6ewruyztnxOawLfYUWE=";
|
||||
hash = "sha256-pQ94SMGhIh3Hh/y6kUXQSFb+ADgOZGcLaNVdzGosse0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AAicxPFPYiEB8L33lp4hVaM0bCU1sshdPBV1P55eI/4=";
|
||||
vendorHash = "sha256-eKbO0NFQzNa6TOQu7M1tUk9xXC0K7enHR8ujlNIWfzc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-summon-provider";
|
||||
version = "1.14.9";
|
||||
version = "1.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6uPW83/BnFtjfqCq5D3qpAZkqJG94ROUrgFbsEJBBcg=";
|
||||
hash = "sha256-UHho7obnpAYgtw269A07gKPgZawNeY4/bzXv1kGvgVw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7wDDHgLLoSIh/Qojz6cudUBN/HzS+ViZn0IZPRymAfg=";
|
||||
vendorHash = "sha256-6GRK1M358LC6S/sjiN42+whz1Z3S+PRKyPOZr8n+daQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "graphinder";
|
||||
version = "1.11.5";
|
||||
version = "1.11.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Escape-Technologies";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ds0XPDDeBtN9AXGIyxqj9aDJyQWekWVL8zbSYRKWw18=";
|
||||
hash = "sha256-TDc6aIFkxShlfC6fLYMKULfrFUAYhQZrIHZNDuMh68g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Tool to find GraphQL endpoints using subdomain enumeration";
|
||||
homepage = "https://github.com/Escape-Technologies/graphinder";
|
||||
changelog = "https://github.com/Escape-Technologies/graphinder/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wgetpaste";
|
||||
version = "2.32";
|
||||
version = "2.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zlin/wgetpaste/releases/download/${version}/wgetpaste-${version}.tar.xz";
|
||||
sha256 = "04yv1hndxhrc5axwiw1yy0yrw1kli5fk4yj4267l7xdwqzxvl7b2";
|
||||
sha256 = "sha256-6TWdhKOmO7vRKGIVNcUwLy46heI6UiAOgej6ubd+lxs=";
|
||||
};
|
||||
# currently zsh-autocompletion support is not installed
|
||||
|
||||
|
|
|
|||
|
|
@ -33960,7 +33960,6 @@ with pkgs;
|
|||
|
||||
asc = callPackage ../games/asc {
|
||||
lua = lua5_1;
|
||||
libsigcxx = libsigcxx12;
|
||||
physfs = physfs_2;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5535,6 +5535,10 @@ self: super: with self; {
|
|||
|
||||
mariadb = callPackage ../development/python-modules/mariadb { };
|
||||
|
||||
marisa = callPackage ../development/python-modules/marisa {
|
||||
inherit (pkgs) marisa;
|
||||
};
|
||||
|
||||
marisa-trie = callPackage ../development/python-modules/marisa-trie { };
|
||||
|
||||
markdown2 = callPackage ../development/python-modules/markdown2 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue