mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 00:53:12 +03:00
Merge staging-next into staging
This commit is contained in:
commit
7f765c49f6
@ -163,3 +163,30 @@ or "hg"), `domain` and `fetchSubmodules`.
|
||||
If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit`
|
||||
or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,
|
||||
respectively. Otherwise, the fetcher uses `fetchzip`.
|
||||
|
||||
## `requireFile` {#requirefile}
|
||||
|
||||
`requireFile` allows requesting files that cannot be fetched automatically, but whose content is known.
|
||||
This is a useful last-resort workaround for license restrictions that prohibit redistribution, or for downloads that are only accessible after authenticating interactively in a browser.
|
||||
If the requested file is present in the Nix store, the resulting derivation will not be built, because its expected output is already available.
|
||||
Otherwise, the builder will run, but fail with a message explaining to the user how to provide the file. The following code, for example:
|
||||
|
||||
```
|
||||
requireFile {
|
||||
name = "jdk-${version}_linux-x64_bin.tar.gz";
|
||||
url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html";
|
||||
sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2";
|
||||
}
|
||||
```
|
||||
results in this error message:
|
||||
```
|
||||
***
|
||||
Unfortunately, we cannot download file jdk-11.0.10_linux-x64_bin.tar.gz automatically.
|
||||
Please go to https://www.oracle.com/java/technologies/javase-jdk11-downloads.html to download it yourself, and add it to the Nix store
|
||||
using either
|
||||
nix-store --add-fixed sha256 jdk-11.0.10_linux-x64_bin.tar.gz
|
||||
or
|
||||
nix-prefetch-url --type sha256 file:///path/to/jdk-11.0.10_linux-x64_bin.tar.gz
|
||||
|
||||
***
|
||||
```
|
||||
|
@ -8930,8 +8930,8 @@
|
||||
githubId = 2914269;
|
||||
name = "Malo Bourgon";
|
||||
};
|
||||
malvo = {
|
||||
email = "malte@malvo.org";
|
||||
malte-v = {
|
||||
email = "nixpkgs@mal.tc";
|
||||
github = "malte-v";
|
||||
githubId = 34393802;
|
||||
name = "Malte Voos";
|
||||
|
@ -120,5 +120,5 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ malvo ];
|
||||
meta.maintainers = with maintainers; [ malte-v ];
|
||||
}
|
||||
|
@ -26,4 +26,4 @@ foldl
|
||||
};
|
||||
})
|
||||
{ }
|
||||
[ 24 25 26 ]
|
||||
[ 24 25 ]
|
||||
|
@ -66,6 +66,10 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <memory>' -i Source/TitleBar.h # gcc12
|
||||
'';
|
||||
|
||||
cmakeBuildType = "Release";
|
||||
|
||||
cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ];
|
||||
|
@ -60,5 +60,6 @@ mkDerivation rec {
|
||||
# Darwin requires CoreMIDI from SDK 11.3, we use the upstream built .dmg
|
||||
# file in ./darwin.nix in the meantime.
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "mscore";
|
||||
};
|
||||
}
|
||||
|
@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <utility>' -i \
|
||||
libs/JUCELV2/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <utility>' -i \
|
||||
lib/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -46,6 +46,11 @@ mkDerivation rec {
|
||||
url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch";
|
||||
sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "support-libraw-0.21.patch";
|
||||
url = "https://github.com/jcelaya/hdrmerge/commit/779e566b3e2807280b78c79affda2cdfa64bde87.diff";
|
||||
sha256 = "48sivCfJWEtGiBXTrO+SWTVlT9xyx92w2kkB8Wt/clk=";
|
||||
})
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
|
@ -97,7 +97,7 @@ mkDerivation rec {
|
||||
description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
|
||||
homepage = "https://apps.kde.org/kalendar/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ chuangzhu ];
|
||||
maintainers = with maintainers; [ Thra11 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -4,11 +4,11 @@ let
|
||||
inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;
|
||||
in buildDotnetPackage rec {
|
||||
pname = "keepass";
|
||||
version = "2.52";
|
||||
version = "2.53";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
|
||||
sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA=";
|
||||
hash = "sha256-wpXbLH9VyjJyb+KuQ8xmbik1jq+xqAFRxsxAuLM5MI0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
@ -140,13 +140,16 @@ in stdenv.mkDerivation rec {
|
||||
patchShebangs tools/get_wb_version.sh
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString ([
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated
|
||||
"-Wno-error=deprecated-declarations"
|
||||
] ++ lib.optionals stdenv.isAarch64 [
|
||||
# error: narrowing conversion of '-1' from 'int' to 'char'
|
||||
"-Wno-error=narrowing"
|
||||
]);
|
||||
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but problematic with some old GCCs
|
||||
"-Wno-error=maybe-uninitalized"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
|
||||
|
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "0.40.0";
|
||||
version = "0.40.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8gyALVW+ort76r/zevWAhZlJ/fg5DBmwUNvjZ21wWKY=";
|
||||
hash = "sha256-riYrvg83mNdj4W8o/2cdZO+zie/WB+HVWXORJ4Uo/CE=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.dpaetzel ];
|
||||
platforms = platforms.all;
|
||||
broken = true; # on 2022-11-23 this package builds, but produces an executable that fails immediately
|
||||
};
|
||||
}
|
||||
|
@ -21,13 +21,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "variety";
|
||||
version = "0.8.9";
|
||||
version = "0.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "varietywalls";
|
||||
repo = "variety";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Tm8RXn2S/NDUD3JWeCHKqSFkxZPJdNMojPGnU4WEpr0=";
|
||||
hash = "sha256-Uln0uoaEZgV9FN3HEBTeFOD7d6RkAQLgQZw7bcgu26A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.45";
|
||||
version = "1.0.47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wYZC4eEvxvHgtb0l+kpP2msQgt8InJu59lgS5cwGxRI=";
|
||||
sha256 = "sha256-iowBEtO+Ol6mFJrwLaDa88wsQB8nZEe9OFPuhbH4t1s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-42ZTPl4kI+dgr78s9WvLFchQU9uvkMkkio53REjvpbw=";
|
||||
vendorHash = "sha256-QzTu6/iFK+CS8UXoXSVq3OTuwk/xcHnAX4UpCU/Scpk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.27.0";
|
||||
version = "0.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-optEMGB6izGlpcq2AJOY4lTt8igYBilE0Bg8KxE8AsU=";
|
||||
sha256 = "sha256-9wdc3Wiqry8+q/60Y7mPzH0k4dp1nKIGinxfkYBaHJY=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
|
||||
tags = [ "netgo" ];
|
||||
|
||||
vendorHash = "sha256-57JrBmund2hwcgqWkLos/h1EOgZQb9HfKUf1BX0MYGQ=";
|
||||
vendorHash = "sha256-8H7siVl6gXifQOBOLtyCeDbYflhKjaIRmP0KOTWVJk0=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
@ -32,6 +32,6 @@ buildGoModule rec {
|
||||
description = "Your everyday IRC student";
|
||||
homepage = "https://ellidri.org/senpai";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
maintainers = with maintainers; [ malte-v ];
|
||||
};
|
||||
}
|
||||
|
@ -60,6 +60,6 @@ buildGoModule rec {
|
||||
homepage = "https://soju.im";
|
||||
changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ azahi malvo ];
|
||||
maintainers = with maintainers; [ azahi malte-v ];
|
||||
};
|
||||
}
|
||||
|
@ -80,6 +80,11 @@ stdenv.mkDerivation rec {
|
||||
# guile warning
|
||||
GUILE_AUTO_COMPILE="0";
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but breaks on darwin (with clang) or older gcc
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
# `make check` target does not define its prerequisites but expects them to
|
||||
# have already been built. The list of targets below was built through trial
|
||||
# and error based on failing tests.
|
||||
|
@ -49,13 +49,10 @@ stdenv.mkDerivation rec {
|
||||
--replace "1.2.0" "${libadwaita.version}"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/io.posidon.Paper $out/bin/paper
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Take notes in Markdown";
|
||||
homepage = "https://posidon.io/paper/";
|
||||
description = "A pretty note-taking app for GNOME";
|
||||
homepage = "https://gitlab.com/posidon_software/paper";
|
||||
mainProgram = "io.posidon.Paper";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ j0lol ];
|
||||
|
@ -3,7 +3,7 @@
|
||||
, cmake
|
||||
, corrosion
|
||||
, extra-cmake-modules
|
||||
, gcc11
|
||||
, gcc12
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kdbusaddons
|
||||
@ -45,7 +45,7 @@ mkDerivation rec {
|
||||
cmake
|
||||
corrosion
|
||||
extra-cmake-modules
|
||||
gcc11 # doesn't build with GCC 9 from stdenv on aarch64
|
||||
gcc12 # doesn't build with GCC 9 from stdenv on aarch64
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
|
@ -2,7 +2,7 @@
|
||||
, mkDerivation
|
||||
|
||||
, extra-cmake-modules
|
||||
, gcc11
|
||||
, gcc12
|
||||
, wrapGAppsHook
|
||||
|
||||
, gst_all_1
|
||||
@ -22,7 +22,7 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
wrapGAppsHook
|
||||
gcc11 # doesn't build with GCC 9 from stdenv on aarch64
|
||||
gcc12 # doesn't build with GCC 9 from stdenv on aarch64
|
||||
python3Packages.wrapPython
|
||||
python3Packages.pybind11
|
||||
];
|
||||
|
@ -1,18 +1,19 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, nix-update-script
|
||||
, nwjs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gridtracker";
|
||||
version = "1.23.0110";
|
||||
version = "1.23.0206";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gridtracker.org";
|
||||
repo = "gridtracker";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yQWdBNt7maYTzroB+P1hsGIeivkP+soR3/b847HLYZY=";
|
||||
sha256 = "sha256-XWjKJga9aQrMb0ZfA4ElsPU1CfMwFtwYSK1vjgtlKes=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "An amateur radio companion to WSJT-X or JTDX";
|
||||
longDescription = ''
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
let
|
||||
pkgDescription = "A digital logic designer and circuit simulator.";
|
||||
version = "0.29";
|
||||
buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date
|
||||
version = "0.30";
|
||||
buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
type = "Application";
|
||||
@ -24,7 +24,8 @@ let
|
||||
# inspect the .git folder to find the version number we are building, we then
|
||||
# provide that version number manually as a property.
|
||||
# (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481)
|
||||
mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}";
|
||||
# Also use the commit date as a build and output timestamp.
|
||||
mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "digital";
|
||||
@ -33,20 +34,16 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hneemann";
|
||||
repo = "Digital";
|
||||
rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c";
|
||||
sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg=";
|
||||
rev = "932791eb6486d04f2ea938d83bcdb71b56d3a3f6";
|
||||
sha256 = "cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM=";
|
||||
};
|
||||
|
||||
# Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to
|
||||
# a version where they support reproducible builds
|
||||
patches = [ ./pom.xml.patch ];
|
||||
|
||||
# Fetching maven dependencies from "central" needs the network at build phase,
|
||||
# we do that in this extra derivation that explicitely specifies its
|
||||
# outputHash to ensure determinism.
|
||||
mavenDeps = stdenv.mkDerivation {
|
||||
name = "${pname}-${version}-maven-deps";
|
||||
inherit src nativeBuildInputs version patches postPatch;
|
||||
inherit src nativeBuildInputs version;
|
||||
dontFixup = true;
|
||||
buildPhase = ''
|
||||
mvn package ${mvnOptions} -Dmaven.repo.local=$out
|
||||
@ -62,15 +59,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI=";
|
||||
outputHash = "1Cgw+5V2E/RENMRMm368+2yvY7y6v9gTlo+LRgrCXcE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps}
|
||||
'';
|
||||
|
@ -1,30 +0,0 @@
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index d5f8330b4..58ed18b63 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -129,7 +130,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
- <version>2.5</version>
|
||||
+ <version>3.2.0</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
@@ -188,6 +189,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
+ <version>3.2.0</version>
|
||||
<configuration>
|
||||
<finalName>Digital</finalName>
|
||||
<appendAssemblyId>false</appendAssemblyId>
|
||||
@@ -202,7 +204,7 @@
|
||||
</manifest>
|
||||
<manifestEntries>
|
||||
<Build-SCM-Revision>${git.commit.id.describe}</Build-SCM-Revision>
|
||||
- <Build-Time>${maven.build.timestamp}</Build-Time>
|
||||
+ <Build-Time>@buildDate@</Build-Time>
|
||||
<SplashScreen-Image>icons/splash.png</SplashScreen-Image>
|
||||
</manifestEntries>
|
||||
</archive>
|
@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
|
||||
--prefix PATH : "$out/share/cbmc" \
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
|
||||
# Needed with GCC 12 but breaks on darwin (with clang)
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
# fix "argument unused during compilation"
|
||||
|
@ -14,21 +14,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.17.2";
|
||||
version = "1.17.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"
|
||||
];
|
||||
sha256 = "sha256-gACMzJ7oZCk/INSeJaV7GnF9hy/6F9d0QDLp5jPiF4k=";
|
||||
sha256 = "1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0";
|
||||
};
|
||||
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"
|
||||
];
|
||||
sha256 = "sha256-qD+Kuz8j3vDch4PlNQYqdbffL3YSKRqKg6IfkLk/LaQ=";
|
||||
sha256 = "16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb";
|
||||
};
|
||||
|
||||
in mkDerivation {
|
||||
|
@ -99,6 +99,8 @@ stdenv.mkDerivation rec {
|
||||
cp -r ${expected-wrap} ${expected-wrap.name}
|
||||
cp -r ${wlroots-wrap} ${wlroots-wrap.name}
|
||||
)
|
||||
|
||||
sed '1i#include <functional>' -i cardboard/ViewAnimation.h # gcc12
|
||||
'';
|
||||
|
||||
# "Inherited" from Nixpkgs expression for wlroots
|
||||
@ -108,6 +110,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dwlroots:libseat=disabled"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ]; # gcc12
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/cardboardwm/cardboard";
|
||||
description = "A scrollable, tiling Wayland compositor inspired on PaperWM";
|
||||
|
@ -509,8 +509,8 @@ rec {
|
||||
''
|
||||
mkdir -p $out
|
||||
for i in $(cat $pathsPath); do
|
||||
${lndir}/bin/lndir -silent $i $out
|
||||
done
|
||||
${lndir}/bin/lndir $i $out
|
||||
done 2>&1 | sed 's/^/symlinkJoin: warning: keeping existing file: /'
|
||||
${postBuild}
|
||||
'';
|
||||
|
||||
|
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "poppler-data";
|
||||
version = "0.4.11";
|
||||
version = "0.4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw=";
|
||||
sha256 = "yDW2QKQM41fhuDZmqr2V7f+iTd3dSbja/2OtuFHNq3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -165,7 +165,6 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
# TODO: remove libiconv once 1.66 is used to bootstrap
|
||||
++ optionals stdenv.isDarwin [ libiconv Security ]
|
||||
++ optional (!withBundledLLVM) llvmShared;
|
||||
|
||||
|
@ -29,12 +29,13 @@ stdenv.mkDerivation rec {
|
||||
# Do not build static libraries
|
||||
cmakeFlags = [ "-DENABLE_STATIC=NO" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=cast-function-type"
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=stringop-overflow"
|
||||
# Needed with GCC 12
|
||||
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but problematic with some old GCCs and probably clang
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bullet";
|
||||
version = "3.24";
|
||||
version = "3.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bulletphysics";
|
||||
repo = "bullet3";
|
||||
rev = version;
|
||||
sha256 = "sha256-1zQZI1MdW0Ipg5XJeiFZQi/6cI0t6Ckralc5DE3auow=";
|
||||
sha256 = "sha256-AGP05GoxLjHqlnW63/KkZe+TjO3IKcgBi+Qb/osQuCM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
mainProgram = "cd-paranoia";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -6,17 +6,18 @@
|
||||
, pkg-config
|
||||
, libuuid
|
||||
, openssl
|
||||
, libossp_uuid
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libks";
|
||||
version = "1.8.0";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalwire";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Bfp8+jqXu1utlaYuPewm+t3zHxaTWEw+cGZu1nFzkDk=";
|
||||
sha256 = "sha256-TJ3q97K3m3zYGB1D5lLVyrh61L3vtnP5I64lP/DYzW4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -33,16 +34,15 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libuuid
|
||||
openssl
|
||||
];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional stdenv.isLinux libuuid
|
||||
++ lib.optional stdenv.isDarwin libossp_uuid;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Foundational support for signalwire C products";
|
||||
homepage = "https://github.com/signalwire/libks";
|
||||
maintainers = with lib.maintainers; [ misuzu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
@ -55,6 +55,11 @@ mkDerivation rec {
|
||||
"-DMBGL_WITH_QT_HEADLESS=OFF"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but problematic with some old GCCs
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source alternative to Mapbox GL Native";
|
||||
homepage = "https://maplibre.org/";
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY=";
|
||||
sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "poppler-${suffix}";
|
||||
version = "22.11.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
version = "23.02.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
|
||||
hash = "sha256-CTuphE7XdChVFzYcFeIaMbpN8nikmSY9RAPMp08tqCg=";
|
||||
hash = "sha256-MxXdonD+KzXPH0HSdZSMOWUvqGO5DeB2b2spPZpVj8k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openmm";
|
||||
version = "7.7.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openmm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2PYUGTMVQ5qVDeeABrwR45U3JIgo2xMXKlD6da7y3Dw=";
|
||||
hash = "sha256-89ngeZHdjyL/OoGuQ+F5eaXE1/od0EEfIgw9eKdLtL8=";
|
||||
};
|
||||
|
||||
# "This test is stochastic and may occassionally fail". It does.
|
||||
|
@ -68,7 +68,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.38.3";
|
||||
version = "2.38.4";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-QfAB0e1EjGk2s5Sp8g5GQO6/g6fwgmLfKFBPdBBgSlo=";
|
||||
hash = "sha256-T0fqKaLU1fFe7z3J4tbG8Gfo3oY6P2RFXhzPlpPMHTY=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
@ -1,42 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, btrfs-progs
|
||||
, contextlib2
|
||||
, pyxdg
|
||||
, pycparser
|
||||
, alembic
|
||||
, cffi
|
||||
, pythonOlder
|
||||
, isPyPy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.10.1";
|
||||
pname = "bedup";
|
||||
disabled = pythonOlder "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g2p";
|
||||
repo = "bedup";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6";
|
||||
};
|
||||
|
||||
buildInputs = [ btrfs-progs ];
|
||||
propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ]
|
||||
++ lib.optionals (!isPyPy) [ cffi ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deduplication for Btrfs";
|
||||
longDescription = ''
|
||||
Deduplication for Btrfs. bedup looks for new and changed files,
|
||||
making sure that multiple copies of identical files share space
|
||||
on disk. It integrates deeply with btrfs so that scans are
|
||||
incremental and low-impact.
|
||||
'';
|
||||
homepage = "https://github.com/g2p/bedup";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ bluescreen303 ];
|
||||
};
|
||||
}
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, autopep8
|
||||
, buildPythonPackage
|
||||
, contextlib2
|
||||
, django
|
||||
, factory_boy
|
||||
, fetchFromGitHub
|
||||
@ -72,7 +71,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
freezegun
|
||||
contextlib2
|
||||
networkx
|
||||
pydot
|
||||
factory_boy
|
||||
|
@ -2,13 +2,11 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, contextlib2
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, vcrpy
|
||||
, citeproc-py
|
||||
, requests
|
||||
, setuptools
|
||||
, six
|
||||
}:
|
||||
|
||||
@ -22,10 +20,9 @@ buildPythonPackage rec {
|
||||
sha256 = "f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8";
|
||||
};
|
||||
|
||||
# bin/duecredit requires setuptools at runtime
|
||||
propagatedBuildInputs = [ citeproc-py requests setuptools six ];
|
||||
propagatedBuildInputs = [ citeproc-py requests six ];
|
||||
|
||||
nativeCheckInputs = [ contextlib2 pytest pytestCheckHook vcrpy ];
|
||||
nativeCheckInputs = [ pytest pytestCheckHook vcrpy ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
@ -3,7 +3,6 @@
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, contextlib2
|
||||
, cython
|
||||
, fuse
|
||||
, pkg-config
|
||||
@ -29,8 +28,6 @@ buildPythonPackage rec {
|
||||
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
propagatedBuildInputs = [ contextlib2 ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'"
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nltk";
|
||||
version = "3.8";
|
||||
version = "3.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-dLMIJqN9eNU0JxBbvQN92IAlG+Jp/KZO5TCDikbtVfw=";
|
||||
hash = "sha256-GDTaPQaCy6Tyzt4vmq1rD6+2RhukUdsO+2+cOXmNZNM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, coveralls
|
||||
, numpy
|
||||
, contextlib2
|
||||
, decopatch
|
||||
, more-itertools
|
||||
, nestedtext
|
||||
@ -24,6 +24,14 @@ buildPythonPackage rec {
|
||||
sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "replace contextlib2-with-contextlib.patch";
|
||||
url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch";
|
||||
hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ=";
|
||||
})
|
||||
];
|
||||
|
||||
# patch out coveralls since it doesn't provide us value
|
||||
preBuild = ''
|
||||
sed -i '/coveralls/d' ./pyproject.toml
|
||||
@ -38,7 +46,6 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
contextlib2
|
||||
decopatch
|
||||
more-itertools
|
||||
nestedtext
|
||||
|
@ -2,8 +2,8 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, jinja2
|
||||
, pygments
|
||||
, markupsafe
|
||||
@ -14,17 +14,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdoc";
|
||||
version = "12.0.2";
|
||||
version = "12.3.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
# the Pypi version does not include tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitmproxy";
|
||||
repo = "pdoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "FVfPO/QoHQQqg7QU05GMrrad0CbRR5AQVYUpBhZoRi0=";
|
||||
sha256 = "sha256-SaLrE/eHxKnlm6BZYbcZZrbrUZMeHJ4eCcqMsFvyZ7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
pygments
|
||||
@ -48,6 +54,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "pdoc" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md";
|
||||
homepage = "https://pdoc.dev/";
|
||||
description = "API Documentation for Python Projects";
|
||||
license = licenses.unlicense;
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, contextlib2
|
||||
, fetchPypi
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -19,8 +19,12 @@ buildPythonPackage rec {
|
||||
hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
contextlib2
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"contextlib2"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy-splash";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a7c17735415151ae01f07b03c7624e7276a343779b3c5f4546f655f6133df42f";
|
||||
sha256 = "sha256-7PEwJk3AjgxGHIYH7K13dGimStAd7bJinA+BvV/NcpU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ scrapy six ];
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Scrapy";
|
||||
hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4=";
|
||||
hash = "sha256-gHGsbGXxhewsdv6FCflNmf6ggFGf3CBvkIqSDV4F/kM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -118,12 +118,18 @@ buildPythonPackage rec {
|
||||
"test_xmliter_encoding"
|
||||
"test_download"
|
||||
"test_reactor_default_twisted_reactor_select"
|
||||
"URIParamsSettingTest"
|
||||
"URIParamsFeedOptionTest"
|
||||
# flaky on darwin-aarch64
|
||||
"test_fixed_delay"
|
||||
"test_start_requests_laziness"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage extras/scrapy.1
|
||||
install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy
|
||||
install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy
|
||||
installShellCompletion --cmd scrapy \
|
||||
--zsh extras/scrapy_zsh_completion \
|
||||
--bash extras/scrapy_bash_completion
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
@ -143,6 +149,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
41
pkgs/development/tools/initool/default.nix
Normal file
41
pkgs/development/tools/initool/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ stdenv
|
||||
, mlton
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "initool";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbohdan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pszlP9gy1zjQjNNr0L1NY0XViejUUuvUZH6JHtUxdJI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ mlton ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp initool $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (mlton.meta) platforms;
|
||||
|
||||
description = "Manipulate INI files from the command line";
|
||||
homepage = "https://github.com/dbohdan/initool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ e1mo ];
|
||||
changelog = "https://github.com/dbohdan/initool/releases/tag/v${version}";
|
||||
};
|
||||
}
|
||||
|
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "controller-tools";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mtAP8qRfSdt2koKs6LSI9iiXsyK92q1yWOC9zV8utFg=";
|
||||
sha256 = "sha256-gTSgfykTg2cWV7PCwNcbuFY89RRk9MoV24L4EuEd378=";
|
||||
};
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
vendorSha256 = "sha256-9IGdsAqvi01Jf0FpxfL+O+LrDchh4dGgJX4JJIvL3vE=";
|
||||
vendorHash = "sha256-nZyDoME5fVqRoAeLADjrQ7i6mVf3ujGN2+BUfrSHck8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.41";
|
||||
version = "0.2.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nfMLw3fjEex1XV+Vhi84xR+ghBLrmKDtuFIIeNhP/yQ=";
|
||||
hash = "sha256-+1ciEHBMl78aFDu/NzIAdsGtAZJOfHZRDDZCR1+YuEM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qXjDeR0VZyyhASpt6zv6OyltEZDoguILhhD1ejpd0F4=";
|
||||
|
@ -30,6 +30,8 @@ mkDerivation rec {
|
||||
|
||||
# Change default optional terminal program path to one that is more likely to work on NixOS.
|
||||
substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm";
|
||||
|
||||
sed '1i#include <memory>' -i include/{RegisterViewModelBase,State,IState}.h # gcc12
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
26
pkgs/development/tools/swc/default.nix
Normal file
26
pkgs/development/tools/swc/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swc";
|
||||
version = "0.91.19";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "swc_cli";
|
||||
inherit version;
|
||||
sha256 = "sha256-BzReetAOKSGzHhITXpm+J2Rz8d9Hq2HUagQmfst74Ag=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1U9YLrPYENv9iJobCxtgnQakJLDctWQwnDUtpLG3PGc=";
|
||||
|
||||
buildFeatures = [ "swc_core/plugin_transform_host_native" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rust-based platform for the Web";
|
||||
homepage = "https://github.com/swc-project/swc";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2020.3.13";
|
||||
version = "2020.3.17";
|
||||
shortVersion = builtins.substring 0 6 version;
|
||||
data = stdenv.mkDerivation rec {
|
||||
pname = "flightgear-data";
|
||||
@ -14,7 +14,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz";
|
||||
sha256 = "sha256-C3iUVA7IJQ77OdXcaBnSpDphMFjmFZmn0nozQvdxSJM=";
|
||||
sha256 = "sha256-Kl66K5rmejaRKFgzps4/a73z8gIp9YcdfJQOFR1U2Og=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-Zhq/r0davIz9G6tXVZRp76ZivG0D9Y6Nl3OFAD/lqow=";
|
||||
sha256 = "sha256-ZnDe3qyiaDrKd/nwa/nR2AYq4yoqVFnd3IqgmJxfGFQ=";
|
||||
};
|
||||
|
||||
# Of all the files in the source and data archives, there doesn't seem to be
|
||||
|
@ -30,11 +30,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=deprecated-declarations"
|
||||
# Needed with GCC 12
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but problematic with some old GCCs
|
||||
"-Wno-error=address"
|
||||
"-Wno-error=use-after-free"
|
||||
] ++ [
|
||||
"-Wno-error=deprecated-declarations"
|
||||
# Avoid GL_GLEXT_VERSION double definition
|
||||
" -DNO_SDL_GLEXT"
|
||||
];
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
name = "lunar-client";
|
||||
version = "2.10.1";
|
||||
version = "2.15.1";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "lunar-client";
|
||||
@ -21,7 +21,7 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
name = "lunar-client.AppImage";
|
||||
hash = "sha256-3h2FFpIIRta6hEsa/H0xo8+DUvhdQyBv9dqdd/vlwZ4=";
|
||||
hash = "sha256-8F6inLctNLCrTvO/f4IWHclpm/6vqW44NKbct0Epp4s=";
|
||||
};
|
||||
in
|
||||
appimageTools.wrapType1 rec {
|
||||
|
@ -63,6 +63,10 @@ mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
|
||||
./0001-fix-build-with-ffmpeg-4.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <ctime>' -i src/arch/ArchHooks/ArchHooks.h # gcc12
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake nasm ];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1xkr3ka2sxp5s0spp84iv294i29s1vxqzazb6kmjc0n415h0x57p";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <memory>' -i external/partio_zip/zip_manager.hpp # gcc12
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -33,15 +33,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.53.2";
|
||||
binary-deps-version = "6";
|
||||
version = "0.54.0";
|
||||
binary-deps-version = "8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Unvanquished";
|
||||
repo = "Unvanquished";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-VqMhA6GEYh/m+dzOgXS+5Jqo4x7RrQf4qIwstdTTU+E=";
|
||||
sha256 = "sha256-X2c6BHI4W6fOurLiBWIBZzJrZ+7RHMEwN8GJGz6e350=";
|
||||
};
|
||||
|
||||
unvanquished-binary-deps = stdenv.mkDerivation rec {
|
||||
@ -50,8 +50,8 @@ let
|
||||
version = binary-deps-version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2";
|
||||
sha256 = "sha256-ERfg89oTf9JTtv/qRnTRIzFP+zMpHT8W4WAIxqogy9E=";
|
||||
url = "https://dl.unvanquished.net/deps/linux-amd64-default_${version}.tar.xz ";
|
||||
sha256 = "sha256-6r9j0HRMDC/7i8f4f5bBK4NmwsTpSChHrRWwz0ENAZo=";
|
||||
};
|
||||
|
||||
dontPatchELF = true;
|
||||
@ -119,7 +119,7 @@ let
|
||||
pname = "unvanquished-assets";
|
||||
inherit version src;
|
||||
|
||||
outputHash = "sha256-MPqyqcZGc5KlkftGCspWhISBJ/h+Os29g7ZK6yWz0cQ=";
|
||||
outputHash = "sha256-ua9Q5E5C4t8z/yNQp6qn1i9NNDAk4ohzvgpMbCBxb8Q=";
|
||||
outputHashMode = "recursive";
|
||||
|
||||
nativeBuildInputs = [ aria2 cacert ];
|
||||
@ -135,9 +135,10 @@ in stdenv.mkDerivation rec {
|
||||
inherit version src binary-deps-version;
|
||||
|
||||
preConfigure = ''
|
||||
mkdir daemon/external_deps/linux64-${binary-deps-version}/
|
||||
cp -r ${unvanquished-binary-deps}/* daemon/external_deps/linux64-${binary-deps-version}/
|
||||
chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/
|
||||
TARGET="linux-amd64-default_${binary-deps-version}"
|
||||
mkdir daemon/external_deps/"$TARGET"
|
||||
cp -r ${unvanquished-binary-deps}/* daemon/external_deps/"$TARGET"/
|
||||
chmod +w -R daemon/external_deps/"$TARGET"/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -202,7 +203,7 @@ in stdenv.mkDerivation rec {
|
||||
for f in daemon daemon-tty daemonded nacl_loader nacl_helper_bootstrap; do
|
||||
install -Dm0755 -t $out/lib/ $f
|
||||
done
|
||||
install -Dm0644 -t $out/lib/ irt_core-x86_64.nexe
|
||||
install -Dm0644 -t $out/lib/ irt_core-amd64.nexe
|
||||
|
||||
mkdir $out/bin/
|
||||
${wrapBinary "daemon" "unvanquished"}
|
||||
|
@ -22,6 +22,9 @@ let
|
||||
url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz";
|
||||
sha256 = "017v96aflrv07g8j8zk9mq8f8rqxl5228rjff5blq8dxpsv1sx7h";
|
||||
};
|
||||
postPatch = ''
|
||||
sed '1i#include <ctime>' -i zod_src/common.cpp # gcc12
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
@ -37,7 +40,7 @@ let
|
||||
hardeningDisable = [ "format" ];
|
||||
NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
|
||||
zod_engine = stdenv.mkDerivation {
|
||||
inherit version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS;
|
||||
inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS;
|
||||
pname = "${name}-engine";
|
||||
enableParallelBuilding = true;
|
||||
preBuild = "cd zod_src";
|
||||
@ -48,7 +51,7 @@ let
|
||||
'';
|
||||
};
|
||||
zod_map_editor = stdenv.mkDerivation {
|
||||
inherit version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS;
|
||||
inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS;
|
||||
pname = "${name}-map_editor";
|
||||
enableParallelBuilding = true;
|
||||
preBuild = "cd zod_src";
|
||||
|
@ -42,6 +42,11 @@ let
|
||||
python3
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but breaks on darwin (with clang) or older gcc
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ClusterLabs/resource-agents";
|
||||
description = "Combined repository of OCF agents from the RHCS and Linux-HA projects";
|
||||
|
@ -13,6 +13,10 @@ mkDerivation rec {
|
||||
sha256 = "sha256-kg6oYtJ4H5A6RNATBg+XvMfCb9FlhEBFjfxamGosMQg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <array>' -i src/device.h # gcc12
|
||||
'';
|
||||
|
||||
buildInputs = [ qtbase qtgraphicaleffects ];
|
||||
nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config ];
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slurm";
|
||||
version = "22.05.7.1";
|
||||
version = "22.05.8.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "1hr62c9g0z3brgpa2l68pskraqxk52dk1iq1xkb0dr5w0cwhdpij";
|
||||
sha256 = "sha256-hL/FnHl+Fj62xGH1FVkB9jVtvrVxbPU73DlMWC6CyJ0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
||||
description = "OpenSMTPD filter for DKIM signing";
|
||||
homepage = "http://imperialat.at/dev/filter-dkimsign/";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
maintainers = with maintainers; [ malte-v ];
|
||||
};
|
||||
}
|
||||
|
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Library for creating OpenSMTPD filters";
|
||||
homepage = "http://imperialat.at/dev/libopensmtpd/";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
maintainers = with maintainers; [ malte-v ];
|
||||
};
|
||||
}
|
||||
|
@ -2,18 +2,17 @@
|
||||
|
||||
let
|
||||
generic = {
|
||||
version, hash,
|
||||
version, sha256,
|
||||
eol ? false, extraVulnerabilities ? []
|
||||
}: let
|
||||
major = lib.versions.major version;
|
||||
prerelease = builtins.length (lib.versions.splitVersion version) > 3;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "nextcloud";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.nextcloud.com/server/${if prerelease then "prereleases" else "release"}/${pname}-${version}.tar.bz2";
|
||||
inherit hash;
|
||||
url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
patches = [ (./patches + "/v${major}/0001-Setup-remove-custom-dbuser-creation-behavior.patch") ];
|
||||
@ -52,19 +51,14 @@ in {
|
||||
|
||||
nextcloud24 = generic {
|
||||
version = "24.0.9";
|
||||
hash = "sha256-WAozhMnAmu+46bQVU9IabiAAF5lUnb0lsx3qIR2X3R4=";
|
||||
sha256 = "580a3384c9c09aefb8e9b41553d21a6e20001799549dbd25b31dea211d97dd1e";
|
||||
};
|
||||
|
||||
nextcloud25 = generic {
|
||||
version = "25.0.3";
|
||||
hash = "sha256-SysUI3Nu+SRpCW/iT2HCTK2Ho04HwceoGzhdPqJcAOw=";
|
||||
sha256 = "4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec";
|
||||
};
|
||||
|
||||
nextcloud26 = generic {
|
||||
version = "26.0.0beta1";
|
||||
hash = "sha256-EfSfn0KjQzciHa3VcrDhGC/aZUw/KDjihXs+qVIcYX0=";
|
||||
};
|
||||
|
||||
# tip: get hash with:
|
||||
# nix hash to-sri --type sha256 $(curl https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256 | cut -d' ' -f1)
|
||||
# tip: get the sha with:
|
||||
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
|
||||
}
|
||||
|
@ -20,9 +20,9 @@
|
||||
]
|
||||
},
|
||||
"contacts": {
|
||||
"sha256": "1996f97w74slmh7ihv8p1lxl32rri5nnzp90mbb1imclpgac2i63",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.4/contacts-v4.2.4.tar.gz",
|
||||
"version": "4.2.4",
|
||||
"sha256": "0qv3c7wmf9j74562xbjvhk6kbpna6ansiw3724dh4w8j5sldqysd",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.3/contacts-v4.2.3.tar.gz",
|
||||
"version": "4.2.3",
|
||||
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
|
||||
"homepage": "https://github.com/nextcloud/contacts#readme",
|
||||
"licenses": [
|
||||
@ -110,9 +110,9 @@
|
||||
]
|
||||
},
|
||||
"news": {
|
||||
"sha256": "0iz1yrl7h60yhc1d1gkalkzc5vlj8sq6lff0ggns6a6qpsdpn9c5",
|
||||
"url": "https://github.com/nextcloud/news/releases/download/20.0.1/news.tar.gz",
|
||||
"version": "20.0.1",
|
||||
"sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7",
|
||||
"url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz",
|
||||
"version": "20.0.0",
|
||||
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
|
||||
"homepage": "https://github.com/nextcloud/news",
|
||||
"licenses": [
|
||||
@ -140,9 +140,9 @@
|
||||
]
|
||||
},
|
||||
"polls": {
|
||||
"sha256": "0qdm0hnljkv0df1s929awyjj1gsp3d6xv9llr52cxv66kkfx086y",
|
||||
"url": "https://github.com/nextcloud/polls/releases/download/v3.8.4/polls.tar.gz",
|
||||
"version": "3.8.4",
|
||||
"sha256": "b6ef0e8b34cdb5169341e30340bc9cefaa1254a1a6020e951f86e828f8591a11",
|
||||
"url": "https://github.com/nextcloud/polls/releases/download/v3.8.3/polls.tar.gz",
|
||||
"version": "3.8.3",
|
||||
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
|
||||
"homepage": "https://github.com/nextcloud/polls",
|
||||
"licenses": [
|
||||
@ -160,9 +160,9 @@
|
||||
]
|
||||
},
|
||||
"spreed": {
|
||||
"sha256": "0c5b46g5vi8fsjcd2r0wqza7iqyvbgznwww5zcyajf29a32950c6",
|
||||
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.8/spreed-v14.0.8.tar.gz",
|
||||
"version": "14.0.8",
|
||||
"sha256": "0frilxny4mvp34fxw0k8al3r5apy3q6vq7z35jkph3vaq1889m9k",
|
||||
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.7/spreed-v14.0.7.tar.gz",
|
||||
"version": "14.0.7",
|
||||
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds",
|
||||
"homepage": "https://github.com/nextcloud/spreed",
|
||||
"licenses": [
|
||||
|
@ -10,9 +10,9 @@
|
||||
]
|
||||
},
|
||||
"calendar": {
|
||||
"sha256": "0yqpfp5nbzd7zar2rbcx3bhfgjxrp1sy6a57fdagndfi4y0r56hq",
|
||||
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.2/calendar-v4.2.2.tar.gz",
|
||||
"version": "4.2.2",
|
||||
"sha256": "04g1xm3q46j7harxr0n56r7kkkqjxvah7xijddyq5fj7icr6qf5d",
|
||||
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.1/calendar-v4.2.1.tar.gz",
|
||||
"version": "4.2.1",
|
||||
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
|
||||
"homepage": "https://github.com/nextcloud/calendar/",
|
||||
"licenses": [
|
||||
@ -20,9 +20,9 @@
|
||||
]
|
||||
},
|
||||
"contacts": {
|
||||
"sha256": "181lycyz4v7v1yir6ylmblgha625sn23nf3661g3izq1whi0wgr9",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.3/contacts-v5.0.3.tar.gz",
|
||||
"version": "5.0.3",
|
||||
"sha256": "097a71if6kkc7nphfc8b6llqlsskjwp1vg83134hzgfscvllvaj8",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.2/contacts-v5.0.2.tar.gz",
|
||||
"version": "5.0.2",
|
||||
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
|
||||
"homepage": "https://github.com/nextcloud/contacts#readme",
|
||||
"licenses": [
|
||||
@ -90,9 +90,9 @@
|
||||
]
|
||||
},
|
||||
"news": {
|
||||
"sha256": "0iz1yrl7h60yhc1d1gkalkzc5vlj8sq6lff0ggns6a6qpsdpn9c5",
|
||||
"url": "https://github.com/nextcloud/news/releases/download/20.0.1/news.tar.gz",
|
||||
"version": "20.0.1",
|
||||
"sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7",
|
||||
"url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz",
|
||||
"version": "20.0.0",
|
||||
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
|
||||
"homepage": "https://github.com/nextcloud/news",
|
||||
"licenses": [
|
||||
@ -120,9 +120,9 @@
|
||||
]
|
||||
},
|
||||
"polls": {
|
||||
"sha256": "0mqc9zmxrm98byy6v13si3hwii8hx85998c4kv91vk6ad0sfxjhb",
|
||||
"url": "https://github.com/nextcloud/polls/releases/download/v4.1.2/polls.tar.gz",
|
||||
"version": "4.1.2",
|
||||
"sha256": "1amywiw91acp4g90wazmqmnw51s7z6rf27bdrzxrcqryd8igsniq",
|
||||
"url": "https://github.com/nextcloud/polls/releases/download/v4.1.0-beta4/polls.tar.gz",
|
||||
"version": "4.1.0-beta4",
|
||||
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
|
||||
"homepage": "https://github.com/nextcloud/polls",
|
||||
"licenses": [
|
||||
@ -140,9 +140,9 @@
|
||||
]
|
||||
},
|
||||
"spreed": {
|
||||
"sha256": "07nh7nlz8di69ms1156fklj29526i3phlvki5vf2mxnlcz8ihg27",
|
||||
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.3/spreed-v15.0.3.tar.gz",
|
||||
"version": "15.0.3",
|
||||
"sha256": "1w5v866lkd0skv666vhz75zwalr2w83shrhdvv354kill9k53awh",
|
||||
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.2/spreed-v15.0.2.tar.gz",
|
||||
"version": "15.0.2",
|
||||
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds",
|
||||
"homepage": "https://github.com/nextcloud/spreed",
|
||||
"licenses": [
|
||||
|
@ -1,62 +0,0 @@
|
||||
{
|
||||
"calendar": {
|
||||
"sha256": "0yqpfp5nbzd7zar2rbcx3bhfgjxrp1sy6a57fdagndfi4y0r56hq",
|
||||
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.2/calendar-v4.2.2.tar.gz",
|
||||
"version": "4.2.2",
|
||||
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
|
||||
"homepage": "https://github.com/nextcloud/calendar/",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"files_texteditor": {
|
||||
"sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss",
|
||||
"url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz",
|
||||
"version": "2.15.0",
|
||||
"description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.",
|
||||
"homepage": "https://github.com/nextcloud/files_texteditor",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"mail": {
|
||||
"sha256": "",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.2/mail-v2.2.2.tar.gz",
|
||||
"version": "2.2.2",
|
||||
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!",
|
||||
"homepage": "https://github.com/nextcloud/mail#readme",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"notes": {
|
||||
"sha256": "1jcgv3awr45jq3n3qv851qlpbdl2plixba0iq2s54dmhciypdckl",
|
||||
"url": "https://github.com/nextcloud/notes/releases/download/v4.6.0/notes.tar.gz",
|
||||
"version": "4.6.0",
|
||||
"description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
|
||||
"homepage": "https://github.com/nextcloud/notes",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"tasks": {
|
||||
"sha256": "0jm13d6nm7cfsw27yfiq1il9xjlh0qrq8xby2yz9dmggn7lk1dx5",
|
||||
"url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz",
|
||||
"version": "0.14.5",
|
||||
"description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
|
||||
"homepage": "https://github.com/nextcloud/tasks/",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"unsplash": {
|
||||
"sha256": "17qqn6kwpvkq21c92jyy3pfvjaj5xms1hr07fnn39zxg0nmwjdd8",
|
||||
"url": "https://github.com/nextcloud/unsplash/releases/download/v2.1.1/unsplash.tar.gz",
|
||||
"version": "2.1.1",
|
||||
"description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!",
|
||||
"homepage": "https://github.com/nextcloud/unsplash/",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
}
|
||||
}
|
@ -1,149 +0,0 @@
|
||||
From fc3e14155b3c4300b691ab46579830e725457a54 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 10 Sep 2022 15:18:05 +0200
|
||||
Subject: [PATCH] Setup: remove custom dbuser creation behavior
|
||||
|
||||
Both PostgreSQL and MySQL can be authenticated against from Nextcloud by
|
||||
supplying a database password. Now, during setup the following things
|
||||
happen:
|
||||
|
||||
* When using postgres and the db user has elevated permissions, a new
|
||||
unprivileged db user is created and the settings `dbuser`/`dbpass` are
|
||||
altered in `config.php`.
|
||||
|
||||
* When using MySQL, the password is **always** regenerated since
|
||||
24.0.5/23.0.9[1].
|
||||
|
||||
I consider both cases problematic: the reason why people do configuration
|
||||
management is to have it as single source of truth! So, IMHO any
|
||||
application that silently alters config and thus causes deployed
|
||||
nodes to diverge from the configuration is harmful for that.
|
||||
|
||||
I guess it was sheer luck that it worked for so long in NixOS because
|
||||
nobody has apparently used password authentication with a privileged
|
||||
user to operate Nextcloud (which is a good thing in fact).
|
||||
|
||||
[1] https://github.com/nextcloud/server/pull/33513
|
||||
---
|
||||
lib/private/Setup/MySQL.php | 53 --------------------------------
|
||||
lib/private/Setup/PostgreSQL.php | 37 ----------------------
|
||||
2 files changed, 90 deletions(-)
|
||||
|
||||
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
|
||||
index e3004c269bc..bc958e84e44 100644
|
||||
--- a/lib/private/Setup/MySQL.php
|
||||
+++ b/lib/private/Setup/MySQL.php
|
||||
@@ -141,62 +141,6 @@
|
||||
$rootUser = $this->dbUser;
|
||||
$rootPassword = $this->dbPassword;
|
||||
|
||||
- //create a random password so we don't need to store the admin password in the config file
|
||||
- $saveSymbols = str_replace(['\"', '\\', '\'', '`'], '', ISecureRandom::CHAR_SYMBOLS);
|
||||
- $password = $this->random->generate(22, ISecureRandom::CHAR_ALPHANUMERIC . $saveSymbols)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_UPPER)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_LOWER)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_DIGITS)
|
||||
- . $this->random->generate(2, $saveSymbols)
|
||||
- ;
|
||||
- $this->dbPassword = str_shuffle($password);
|
||||
-
|
||||
- try {
|
||||
- //user already specified in config
|
||||
- $oldUser = $this->config->getValue('dbuser', false);
|
||||
-
|
||||
- //we don't have a dbuser specified in config
|
||||
- if ($this->dbUser !== $oldUser) {
|
||||
- //add prefix to the admin username to prevent collisions
|
||||
- $adminUser = substr('oc_' . $username, 0, 16);
|
||||
-
|
||||
- $i = 1;
|
||||
- while (true) {
|
||||
- //this should be enough to check for admin rights in mysql
|
||||
- $query = 'SELECT user FROM mysql.user WHERE user=?';
|
||||
- $result = $connection->executeQuery($query, [$adminUser]);
|
||||
-
|
||||
- //current dbuser has admin rights
|
||||
- $data = $result->fetchAll();
|
||||
- $result->closeCursor();
|
||||
- //new dbuser does not exist
|
||||
- if (count($data) === 0) {
|
||||
- //use the admin login data for the new database user
|
||||
- $this->dbUser = $adminUser;
|
||||
- $this->createDBUser($connection);
|
||||
-
|
||||
- break;
|
||||
- } else {
|
||||
- //repeat with different username
|
||||
- $length = strlen((string)$i);
|
||||
- $adminUser = substr('oc_' . $username, 0, 16 - $length) . $i;
|
||||
- $i++;
|
||||
- }
|
||||
- }
|
||||
- } else {
|
||||
- // Reuse existing password if a database config is already present
|
||||
- $this->dbPassword = $rootPassword;
|
||||
- }
|
||||
- } catch (\Exception $ex) {
|
||||
- $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [
|
||||
- 'exception' => $ex,
|
||||
- 'app' => 'mysql.setup',
|
||||
- ]);
|
||||
- // Restore the original credentials
|
||||
- $this->dbUser = $rootUser;
|
||||
- $this->dbPassword = $rootPassword;
|
||||
- }
|
||||
-
|
||||
$this->config->setValues([
|
||||
'dbuser' => $this->dbUser,
|
||||
'dbpassword' => $this->dbPassword,
|
||||
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
|
||||
index af816c7ad04..e49e5508e15 100644
|
||||
--- a/lib/private/Setup/PostgreSQL.php
|
||||
+++ b/lib/private/Setup/PostgreSQL.php
|
||||
@@ -45,43 +45,6 @@ class PostgreSQL extends AbstractDatabase {
|
||||
$connection = $this->connect([
|
||||
'dbname' => 'postgres'
|
||||
]);
|
||||
- //check for roles creation rights in postgresql
|
||||
- $builder = $connection->getQueryBuilder();
|
||||
- $builder->automaticTablePrefix(false);
|
||||
- $query = $builder
|
||||
- ->select('rolname')
|
||||
- ->from('pg_roles')
|
||||
- ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE')))
|
||||
- ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
|
||||
-
|
||||
- try {
|
||||
- $result = $query->execute();
|
||||
- $canCreateRoles = $result->rowCount() > 0;
|
||||
- } catch (DatabaseException $e) {
|
||||
- $canCreateRoles = false;
|
||||
- }
|
||||
-
|
||||
- if ($canCreateRoles) {
|
||||
- $connectionMainDatabase = $this->connect();
|
||||
- //use the admin login data for the new database user
|
||||
-
|
||||
- //add prefix to the postgresql user name to prevent collisions
|
||||
- $this->dbUser = 'oc_' . strtolower($username);
|
||||
- //create a new password so we don't need to store the admin config in the config file
|
||||
- $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, ISecureRandom::CHAR_ALPHANUMERIC);
|
||||
-
|
||||
- $this->createDBUser($connection);
|
||||
-
|
||||
- // Go to the main database and grant create on the public schema
|
||||
- // The code below is implemented to make installing possible with PostgreSQL version 15:
|
||||
- // https://www.postgresql.org/docs/release/15.0/
|
||||
- // From the release notes: For new databases having no need to defend against insider threats, granting CREATE permission will yield the behavior of prior releases
|
||||
- // Therefore we assume that the database is only used by one user/service which is Nextcloud
|
||||
- // Additional services should get installed in a separate database in order to stay secure
|
||||
- // Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS
|
||||
- $connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO ' . addslashes($this->dbUser));
|
||||
- $connectionMainDatabase->close();
|
||||
- }
|
||||
|
||||
$this->config->setValues([
|
||||
'dbuser' => $this->dbUser,
|
||||
--
|
||||
2.38.1
|
||||
|
@ -88,12 +88,12 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeswitch";
|
||||
version = "1.10.8";
|
||||
version = "1.10.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalwire";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-66kwEN42LjTh/oEdFeOyXP2fU88tjR1K5ZWQJkKcDLQ=";
|
||||
sha256 = "sha256-65DH2HxiF8wqzmzbIqaQZjSa/JPERHIS2FW6F18c6Pw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -153,5 +153,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.mpl11;
|
||||
maintainers = with lib.maintainers; [ misuzu ];
|
||||
platforms = with lib.platforms; unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
@ -27,11 +27,19 @@ stdenv.mkDerivation {
|
||||
"https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"
|
||||
"https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-a30z9rdXcfc2eVuShEobgDWWHr9TfMwq9WwaWdrI3QU=";
|
||||
hash = "sha256-3o5LFGPd4oFz3leKzCy7lIjQ3ELSLqZuIswptB7i24U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./wallabag-data.patch # exposes $WALLABAG_DATA
|
||||
|
||||
# Use sendmail from php.ini instead of FHS path.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/symfony/swiftmailer-bundle/commit/31a4fed8f621f141ba70cb42ffb8f73184995f4c.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "vendor/symfony/swiftmailer-bundle/";
|
||||
sha256 = "rxHiGhKFd/ZWnIfTt6omFLLoNFlyxOYNCHIv/UtxCho=";
|
||||
})
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
|
||||
description = "ACMEv2 client written in plain C with minimal dependencies";
|
||||
homepage = "https://github.com/ndilieto/uacme";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
maintainers = with maintainers; [ malte-v ];
|
||||
};
|
||||
}
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whisper-cpp";
|
||||
version = "1.0.4";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "whisper.cpp";
|
||||
rev = version;
|
||||
sha256 = "sha256-lw+POI47bW66NlmMPJKAkqAYhOnyGaFqcS2cX5LRBbk=";
|
||||
rev = "refs/tags/v${version}" ;
|
||||
hash = "sha256-7/10t1yE7Gbs+cyj8I9vJoDeaxEz9Azc2j3f6QCjDGM=";
|
||||
};
|
||||
|
||||
# The upstream download script tries to download the models to the
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh
|
||||
index cf54623..5e9c905 100755
|
||||
index 7075080..5e9c905 100755
|
||||
--- a/models/download-ggml-model.sh
|
||||
+++ b/models/download-ggml-model.sh
|
||||
@@ -9,18 +9,6 @@
|
||||
@ -16,7 +16,7 @@ index cf54623..5e9c905 100755
|
||||
- fi
|
||||
-}
|
||||
-
|
||||
-models_path=$(get_script_path)
|
||||
-models_path="$(get_script_path)"
|
||||
-
|
||||
# Whisper models
|
||||
models=( "tiny.en" "tiny" "base.en" "base" "small.en" "small" "medium.en" "medium" "large-v1" "large" )
|
||||
|
@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-UVBA1vXOuLg4RT+BdF4rhbZ6I9ySeZX0N81gh3MH84I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <memory>' -i \
|
||||
include/geometry/poly_double.h include/noise/noise_generator.h # gcc12
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR"
|
||||
'';
|
||||
|
@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Tool to resize BDF fonts";
|
||||
homepage = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
maintainers = with maintainers; [ malte-v ];
|
||||
};
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ crystal.buildCrystalPackage rec {
|
||||
homepage = "https://github.com/alexherbo2/kakoune.cr";
|
||||
description = "A command-line tool for Kakoune";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
maintainers = with maintainers; [ malte-v ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "memtest86+";
|
||||
version = "6.01";
|
||||
version = "6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "memtest86plus";
|
||||
repo = "memtest86plus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BAY8hR8Sl9Hp9Zps0INL43cNqJwXX689m9rfa4dHrqs=";
|
||||
hash = "sha256-f40blxh/On/mC4m+eLNeWzdYzYoYpFOSBndVnREx68U=";
|
||||
};
|
||||
|
||||
# Binaries are booted directly by BIOS/UEFI or bootloader
|
||||
|
@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-3wLfQvbwx+OFrCl5vMV7Zps4e4iEYFhqPiVCo5hDqgw=";
|
||||
})];
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <ctime>' -i src/Log.cxx # gcc12
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
buildInputs = [
|
||||
libmpdclient
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "topgrade";
|
||||
version = "10.3.0";
|
||||
version = "10.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "topgrade-rs";
|
||||
repo = "topgrade";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BKrErM1d90o+yJ/R0vVgXDBwPgQSP3Qj26x4JmB7SXw=";
|
||||
hash = "sha256-sOXp/oo29oVdmn3qEb7HCSlYYOvbTpD21dX4JSYaqps=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jm97lfWHTtd3tE+Yql9CIss78B+bW9nUQAhs5anDb6c=";
|
||||
cargoHash = "sha256-fZjMTVn4gx1hvtiD5NRkXY2f9HNSv7Vx3HdHypne5U0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
prePatch = ''
|
||||
substituteInPlace ./config.h --replace \
|
||||
"#include \"ascii/gnu.h\"" "#include \"ascii/nixos.h\""
|
||||
|
||||
sed '1i#include <array>' -i config.h # gcc12
|
||||
'';
|
||||
|
||||
# Fixes installation path
|
||||
|
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1pl8ayadxb0zzh5s26yschkjhr1xffbzzv347m88f9y0jv34d24r";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <array>' -i src/dynports/dynports.cc # gcc12
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl
|
||||
libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout
|
||||
|
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Peer-to-peer VPN";
|
||||
homepage = "https://www.ntop.org/products/n2n/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ malvo ];
|
||||
maintainers = with maintainers; [ malte-v ];
|
||||
};
|
||||
}
|
||||
|
@ -18,8 +18,8 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ libubox json_c ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but breaks on darwin (with clang) or older gcc
|
||||
"-Wno-error=dangling-pointer"
|
||||
];
|
||||
|
||||
|
@ -5,13 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "certipy";
|
||||
version = "2.0.9";
|
||||
version = "4.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ly4k";
|
||||
repo = "Certipy";
|
||||
rev = version;
|
||||
hash = "sha256-84nGRKZ0UlMDAZ1Wo5Hgy9XSAyEh0Tio9+3OZVFZG5k=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vwlWAbA4ExYAPRInhEsjRCNuL2wqMhAmYKO78Vi4OGo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@ -22,6 +23,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
ldap3
|
||||
pyasn1
|
||||
pycryptodome
|
||||
requests_ntlm
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
@ -34,6 +36,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Tool to enumerate and abuse misconfigurations in Active Directory Certificate Services";
|
||||
homepage = "https://github.com/ly4k/Certipy";
|
||||
changelog = "https://github.com/ly4k/Certipy/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
|
||||
owner = "puppetlabs";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <array>' -i lib/src/facts/glib/load_average_resolver.cc # gcc12
|
||||
'';
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lblkid";
|
||||
|
||||
|
@ -17,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-nkidiDNNU6MGhne9EbYClkODJZw/zZu3LWzlniJKyJE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <cstring>' -i src/rocm_smi{,_gpu_metrics}.cc # since gcc12 probably
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake wrapPython ];
|
||||
|
||||
patches = [ ./cmake.patch ];
|
||||
|
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-406OhJt2Ila/LIhfqJXhbFqFxJJiRyMVI4/VK8Y43kc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <algorithm>' -i src/stringHelper.h # gcc12
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but breaks on darwin (with clang) or older gcc
|
||||
"-Wno-error=mismatched-new-delete"
|
||||
];
|
||||
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "guest-agent";
|
||||
version = "20230112.00";
|
||||
version = "20230202.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-uM71qepYnmE4pK+Bdx5l78upNyp2+Myo3ayOAAlRF9s=";
|
||||
sha256 = "sha256-kPPf6KVQmxF4vUQOIGprevn7RDIjKdbUsYhKGPEearA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ioejOtmsi0QnID3V5JxwAz399I5Jp5nHZqpzU9DjpQE=";
|
||||
|
@ -126,6 +126,7 @@ mapAliases ({
|
||||
bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09
|
||||
bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02
|
||||
bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22
|
||||
bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
|
||||
beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07
|
||||
beret = throw "beret has been removed"; # Added 2021-11-16
|
||||
bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07
|
||||
|
@ -2532,7 +2532,7 @@ with pkgs;
|
||||
|
||||
writefreely = callPackage ../applications/misc/writefreely { };
|
||||
|
||||
iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; };
|
||||
iqueue = callPackage ../development/libraries/iqueue { };
|
||||
|
||||
lifecycled = callPackage ../tools/misc/lifecycled { };
|
||||
|
||||
@ -10042,7 +10042,7 @@ with pkgs;
|
||||
grocy = callPackage ../servers/grocy { };
|
||||
|
||||
inherit (callPackage ../servers/nextcloud {})
|
||||
nextcloud23 nextcloud24 nextcloud25 nextcloud26;
|
||||
nextcloud23 nextcloud24 nextcloud25;
|
||||
|
||||
nextcloud23Packages = ( callPackage ../servers/nextcloud/packages {
|
||||
apps = lib.importJSON ../servers/nextcloud/packages/23.json;
|
||||
@ -10053,9 +10053,6 @@ with pkgs;
|
||||
nextcloud25Packages = ( callPackage ../servers/nextcloud/packages {
|
||||
apps = lib.importJSON ../servers/nextcloud/packages/25.json;
|
||||
});
|
||||
nextcloud26Packages = ( callPackage ../servers/nextcloud/packages {
|
||||
apps = lib.importJSON ../servers/nextcloud/packages/26.json;
|
||||
});
|
||||
|
||||
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
|
||||
|
||||
@ -12265,6 +12262,8 @@ with pkgs;
|
||||
|
||||
swapview = callPackage ../os-specific/linux/swapview { };
|
||||
|
||||
swc = callPackage ../development/tools/swc { };
|
||||
|
||||
swtpm = callPackage ../tools/security/swtpm { };
|
||||
|
||||
svnfs = callPackage ../tools/filesystems/svnfs { };
|
||||
@ -15239,7 +15238,7 @@ with pkgs;
|
||||
mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { };
|
||||
|
||||
mitscheme = callPackage ../development/compilers/mit-scheme
|
||||
{ stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; };
|
||||
{ texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; };
|
||||
|
||||
mitschemeX11 = mitscheme.override {
|
||||
enableX11 = true;
|
||||
@ -17499,6 +17498,7 @@ with pkgs;
|
||||
|
||||
libgcc = callPackage ../development/libraries/gcc/libgcc {
|
||||
stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems
|
||||
gcc = gcc11; # fails to build with gcc12
|
||||
};
|
||||
|
||||
# This is for e.g. LLVM libraries on linux.
|
||||
@ -20391,6 +20391,8 @@ with pkgs;
|
||||
|
||||
iniparser = callPackage ../development/libraries/iniparser { };
|
||||
|
||||
initool = callPackage ../development/tools/initool { };
|
||||
|
||||
intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { };
|
||||
|
||||
intel-media-driver = callPackage ../development/libraries/intel-media-driver { };
|
||||
@ -25529,8 +25531,6 @@ with pkgs;
|
||||
|
||||
bluez = bluez5;
|
||||
|
||||
inherit (python3Packages) bedup;
|
||||
|
||||
bolt = callPackage ../os-specific/linux/bolt { };
|
||||
|
||||
bpf-linker = callPackage ../development/tools/bpf-linker { };
|
||||
@ -26358,7 +26358,7 @@ with pkgs;
|
||||
|
||||
pipework = callPackage ../os-specific/linux/pipework { };
|
||||
|
||||
pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; };
|
||||
pktgen = callPackage ../os-specific/linux/pktgen { };
|
||||
|
||||
plymouth = callPackage ../os-specific/linux/plymouth { };
|
||||
|
||||
|
@ -41,6 +41,7 @@ mapAliases ({
|
||||
asyncio-nats-client = nats-py; # added 2022-02-08
|
||||
awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13
|
||||
Babel = babel; # added 2022-05-06
|
||||
bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
|
||||
bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
|
||||
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
|
||||
bsblan = python-bsblan; # added 2022-11-04
|
||||
|
@ -1216,8 +1216,6 @@ self: super: with self; {
|
||||
|
||||
bech32 = callPackage ../development/python-modules/bech32 { };
|
||||
|
||||
bedup = callPackage ../development/python-modules/bedup { };
|
||||
|
||||
behave = callPackage ../development/python-modules/behave { };
|
||||
|
||||
bellows = callPackage ../development/python-modules/bellows { };
|
||||
|
Loading…
Reference in New Issue
Block a user