Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-02-17 00:02:11 +00:00 committed by GitHub
commit e6eaa85312
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 1136 additions and 156 deletions

View file

@ -95,6 +95,27 @@ installPhase() {
genericBuild
```
### Building a `stdenv` package in `nix-shell` {#sec-building-stdenv-package-in-nix-shell}
To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), use
```bash
nix-shell '<nixpkgs>' -A some_package
eval ${unpackPhase:-unpackPhase}
cd $sourceRoot
eval ${patchPhase:-patchPhase}
eval ${configurePhase:-configurePhase}
eval ${buildPhase:-buildPhase}
```
To modify a [phase](#sec-stdenv-phases), first print it with
```bash
type buildPhase
```
then change it in a text editor, and paste it back to the terminal.
## Tools provided by `stdenv` {#sec-tools-of-stdenv}
The standard environment provides the following packages:

View file

@ -8573,6 +8573,12 @@
githubId = 22085373;
name = "Luis Hebendanz";
};
luizirber = {
email = "nixpkgs@luizirber.org";
github = "luizirber";
githubId = 6642;
name = "Luiz Irber";
};
luizribeiro = {
email = "nixpkgs@l9o.dev";
matrix = "@luizribeiro:matrix.org";
@ -11317,6 +11323,12 @@
githubId = 15645854;
name = "Brad Christensen";
};
paveloom = {
email = "paveloom@riseup.net";
github = "paveloom";
githubId = 49961859;
name = "Pavel Sobolev";
};
payas = {
email = "relekarpayas@gmail.com";
github = "bhankas";

View file

@ -62,6 +62,7 @@ python3.pkgs.buildPythonApplication rec {
# the file should be executable but it isn't so our wrapper doesn't run
preFixup = ''
chmod 555 $out/bin/puddletag
wrapQtApp $out/bin/puddletag
'';
doCheck = false; # there are no tests

View file

@ -0,0 +1,104 @@
{ stdenv
, lib
, fetchFromGitHub
, jdk11
, makeDesktopItem
, makeWrapper
, copyDesktopItems
}:
stdenv.mkDerivation rec {
pname = "structorizer";
version = "3.32-11";
desktopItems = [
(makeDesktopItem {
type = "Application";
name = "Structorizer";
desktopName = "Structorizer";
genericName = "Diagram creator";
comment = meta.description;
icon = pname;
exec = pname;
terminal = false;
mimeTypes = [ "application/nsd" ];
categories = [
"Development"
"Graphics"
"VectorGraphics"
"RasterGraphics"
"ComputerScience"
];
keywords = [ "nsd" "diagrams" ];
})
];
src = fetchFromGitHub {
owner = "fesch";
repo = "Structorizer.Desktop";
rev = version;
hash = "sha256-rGyeOcGm6uBplgTjMIOy/xRekfHacwDy9kkMigmRSdk=";
};
patches = [ ./makeStructorizer.patch ./makeBigJar.patch ];
strictDeps = true;
nativeBuildInputs = [ jdk11 makeWrapper copyDesktopItems ];
buildInputs = [ jdk11 ];
postPatch = ''
chmod +x makeStructorizer
chmod +x makeBigJar
patchShebangs --build makeStructorizer
patchShebangs --build makeBigJar
'';
buildPhase = ''
runHook preBuild
./makeStructorizer
./makeBigJar
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -d $out/bin $out/share/mime/packages
install -D ${pname}.jar -t $out/share/java/
makeWrapper ${jdk11}/bin/java $out/bin/${pname} \
--add-flags "-jar $out/share/java/${pname}.jar"
cat << EOF > $out/share/mime/packages/structorizer.xml
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/nsd">
<comment xml:lang="en">Nassi-Shneiderman diagram</comment>
<comment xml:lang="de">Nassi-Shneiderman-Diagramm</comment>
<glob pattern="*.nsd"/>
</mime-type>
</mime-info>
EOF
cd src/lu/fisch/${pname}/gui
install -vD icons/000_${pname}.png $out/share/icons/hicolor/16x16/apps/${pname}.png
for icon_width in 24 32 48 64 128 256; do
install -vD icons_"$icon_width"/000_${pname}.png $out/share/icons/hicolor/"$icon_width"x"$icon_width"/apps/${pname}.png
done
runHook postInstall
'';
meta = with lib; {
description = "Create Nassi-Shneiderman diagrams (NSD)";
homepage = "https://structorizer.fisch.lu";
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ annaaurora ];
};
}

View file

@ -0,0 +1,31 @@
Reason: Running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.class, only the jar.
diff --git a/makeBigJar b/makeBigJar
index 25547020..c34d0d9c 100644
--- a/makeBigJar
+++ b/makeBigJar
@@ -75,9 +75,8 @@ jars="bsh-2.1.0 \
freehep-xml-2.1.1 \
freehep"
-# Apple specific stuff is only used if it exists and the compiled class is available
-if test -f ../bin/lu/fisch/structorizer/application/AppleStructorizerApplication.class -a \
- -f AppleJavaExtensions.jar; then
+# Apple specific stuff is only used if the jar is available
+if test -f lib/AppleJavaExtensions.jar; then
jars="$jars AppleJavaExtensions"
fi
@@ -114,12 +113,3 @@ echo "Done"
# remove the jar-directory
rm -R jar/
-if test -n "$start_compiled"; then
- # execute the archive
- echo; echo "Running Structorizer from all-in-one jar"
- if test "$start_compiled" = "s"; then
- java -jar structorizer.jar
- else
- java -jar structorizer.jar &
- fi
-fi # start block end

View file

@ -0,0 +1,54 @@
Reason: There is no StructorizerApplet.java anywhere in the source, no .cgt files and running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.java, only the jar.
diff --git a/makeStructorizer b/makeStructorizer
index 99a5e8d3..e954be13 100644
--- a/makeStructorizer
+++ b/makeStructorizer
@@ -117,18 +117,6 @@ echo "Done"
echo; echo "Compiling Structorizer..."
javac $str_javac_opts -classpath "$str_classpath" Structorizer.java
echo "Done"
-echo; echo "Compiling Structorizer Applet..."
-javac $str_javac_opts -classpath "$str_classpath" StructorizerApplet.java
-echo "Done"
-
-# OS specific classes
-if test -n "$do_apple"; then
- echo; echo "Compiling Apple specific code..."
- javac $str_javac_opts -classpath "$str_classpath" lu/fisch/structorizer/application/AppleStructorizerApplication.java
- echo "Done"
-else
- echo; echo "Apple specific code skipped"
-fi
# copying some other files to binary tree
echo; echo "Copying resources..."
@@ -147,7 +135,6 @@ cp lu/fisch/structorizer/gui/*.txt ../bin/lu/fisch/structorizer/gui/
cp lu/fisch/structorizer/gui/*.xml ../bin/lu/fisch/structorizer/gui/
cp lu/fisch/structorizer/locales/*.txt ../bin/lu/fisch/structorizer/locales/
cp lu/fisch/structorizer/generators/*.txt ../bin/lu/fisch/structorizer/generators/
-cp lu/fisch/structorizer/parsers/*.cgt ../bin/lu/fisch/structorizer/parsers/
cp lu/fisch/structorizer/parsers/*.egt ../bin/lu/fisch/structorizer/parsers/
cp lu/fisch/structorizer/parsers/*.grm ../bin/lu/fisch/structorizer/parsers/
cp lu/fisch/structorizer/parsers/*.xsd ../bin/lu/fisch/structorizer/parsers/
@@ -155,20 +142,5 @@ cp lu/fisch/structorizer/parsers/*.nsd ../bin/lu/fisch/structorizer/parsers/
cp lu/fisch/structorizer/*.properties ../bin/lu/fisch/structorizer/
echo "Done"
-if test -n "$start_compiled"; then
-
- # changing into binary directory
- cd ../bin/
-
- # run the application
- echo; echo "Running Structorizer from compiled class files"
- if test "$start_compiled" = "s"; then
- java -cp $str_classpath Structorizer
- else
- java -cp $str_classpath Structorizer &
- fi
-
-fi # start block end
-
# move back into the folder where we started
popd >/dev/null

View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "110.0.5481.77",
"sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73",
"sha256bin64": "0jjdgfps6siy9hk2r553vvh0jmkn987ad77sv2zqs9gvx0vsrwgp",
"version": "110.0.5481.100",
"sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd",
"sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr",
"deps": {
"gn": {
"version": "2022-12-12",
@ -12,10 +12,10 @@
}
},
"chromedriver": {
"version": "110.0.5481.30",
"sha256_linux": "08j28ahyahlgmy67hcm8b1vd4kilvf2yvc25746a46gdf8zz0nmw",
"sha256_darwin": "0xlq0fi9g15yvd6ysqcfkxpbr37av32h0f3af9vxl8vbywjfsxn4",
"sha256_darwin_aarch64": "03j47ha9janbawbjxy9n84sx70iisk6qr0bvb218cq5j1d5x058b"
"version": "110.0.5481.77",
"sha256_linux": "1bdc4n9nz3m6vv0p4qr9v65zarbnkrbh21ivpvl7y7c25m7fxl20",
"sha256_darwin": "1scv9vvy5ybgbgycyz2wrymjhdqnvz0m6lxkax107437anxixs00",
"sha256_darwin_aarch64": "0gqayzhlif6hvsmpx04mxr1bld6kirv5q1n5dg42rc16gv954dkn"
}
},
"beta": {
@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
"version": "110.0.5481.78",
"sha256": "1m67xfdgggaan09xsbppna209b8sm882xq587i0hsnnnzb3fdxdj",
"sha256bin64": null,
"version": "110.0.5481.100",
"sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd",
"sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr",
"deps": {
"gn": {
"version": "2022-12-12",
@ -56,8 +56,8 @@
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
},
"ungoogled-patches": {
"rev": "110.0.5481.78-1",
"sha256": "1ffb2wf1bdmzlxk4ih8qq439jzqz17f8nchvx7na52y48am1qr3c"
"rev": "110.0.5481.100-1",
"sha256": "02bmlx2wk9jiqm4az7g8r5ycmpgm5pkb7nivpx2jbmrb0g3qcx9q"
}
}
}

View file

@ -1,14 +1,14 @@
{
"version": "15.8.1",
"repo_hash": "sha256-AdgebB7IY18u/J1F67oNnwVYmmeYJPNCI/yll2eZEiQ=",
"version": "15.8.3",
"repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=",
"yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.8.1-ee",
"rev": "v15.8.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.8.1",
"GITLAB_PAGES_VERSION": "15.8.1",
"GITALY_SERVER_VERSION": "15.8.3",
"GITLAB_PAGES_VERSION": "15.8.3",
"GITLAB_SHELL_VERSION": "14.15.0",
"GITLAB_WORKHORSE_VERSION": "15.8.1"
"GITLAB_WORKHORSE_VERSION": "15.8.3"
}
}

View file

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.8.1";
version = "15.8.3";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-TolduUm8OhpubHXMCyy0vQhj65lauh5eST5UDvdWNVE=";
sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8=";
};
vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA=";

View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.8.1";
version = "15.8.3";
src = fetchFromGitLab {
owner = data.owner;

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "mpc-qt";
version = "22.02";
version = "23.02";
src = fetchFromGitHub {
owner = "mpc-qt";
repo = "mpc-qt";
rev = "v${version}";
sha256 = "sha256-DRbNDrWnaTT4A0dRFAv9MX/MDwV/rXIw+R8fQJmVN+g=";
sha256 = "sha256-b8efsdWWpwoaiX+oQhHK15KxD6JpvPhESTxCR2kS7Mk=";
};
nativeBuildInputs = [ pkg-config qmake qttools ];

View file

@ -0,0 +1,96 @@
{ lib
, stdenv
, copyDesktopItems
, makeDesktopItem
, makeWrapper
, fetchzip
, ffmpeg
, gtk2
, hunspell
, icoutils
, mono
, mpv
, tesseract4
}:
stdenv.mkDerivation rec {
pname = "subtitleedit";
version = "3.6.11";
src = fetchzip {
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip";
sha256 = "00w9jx704in3hbnzp0i7bhqkhbl0h5mahc5izwa980b67w08dc26";
stripRoot = false;
};
preUnpack = ''
rm -rf source
'';
nativeBuildInputs = [
copyDesktopItems
icoutils
makeWrapper
];
runtimeLibs = lib.makeLibraryPath [
gtk2
hunspell
mpv
tesseract4
];
runtimeBins = lib.makeBinPath [
ffmpeg
hunspell
tesseract4
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps
cp -r * $out/bin/
ln -s ${hunspell.out}/lib/libhunspell*.so $out/bin/libhunspell.so
makeWrapper "${mono}/bin/mono" $out/bin/subtitleedit \
--add-flags "$out/bin/SubtitleEdit.exe" \
--prefix LD_LIBRARY_PATH : ${runtimeLibs} \
--prefix PATH : ${runtimeBins}
wrestool -x -t 14 SubtitleEdit.exe > subtitleedit.ico
icotool -x -i 3 -o $out/share/icons/hicolor/16x16/apps/subtitleedit.png subtitleedit.ico
icotool -x -i 6 -o $out/share/icons/hicolor/32x32/apps/subtitleedit.png subtitleedit.ico
icotool -x -i 9 -o $out/share/icons/hicolor/48x48/apps/subtitleedit.png subtitleedit.ico
icotool -x -i 10 -o $out/share/icons/hicolor/256x256/apps/subtitleedit.png subtitleedit.ico
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = pname;
desktopName = "Subtitle Edit";
exec = "subtitleedit";
icon = "subtitleedit";
comment = meta.description;
categories = [ "Video" ];
})
];
meta = with lib; {
description = "A subtitle editor";
homepage = "https://nikse.dk/subtitleedit/";
license = licenses.gpl3Plus;
longDescription = ''
With Subtitle Edit you can easily adjust a subtitle if it is out of sync with
the video in several different ways. You can also use it for making
new subtitles from scratch (using the time-line /waveform/spectrogram)
or for translating subtitles.
'';
maintainers = with maintainers; [ paveloom ];
platforms = platforms.all;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View file

@ -45,6 +45,7 @@ let
go-lib = callPackage ./go-package/go-lib { inherit replaceAll; };
go-gir-generator = callPackage ./go-package/go-gir-generator { };
go-dbus-factory = callPackage ./go-package/go-dbus-factory { };
dde-api = callPackage ./go-package/dde-api { inherit replaceAll; };
deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
#### TOOLS

View file

@ -0,0 +1,39 @@
From c8f597bd7286a76e7ce371e4f7982d9d2700868a Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Wed, 28 Dec 2022 23:06:53 +0800
Subject: [PATCH] fix PATH for NixOS
---
device/main.go | 2 +-
locale-helper/main.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/device/main.go b/device/main.go
index 6c5404c..f79bcfc 100644
--- a/device/main.go
+++ b/device/main.go
@@ -15,7 +15,7 @@ import (
var logger = log.NewLogger(dbusServiceName)
func main() {
- os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
+ os.Setenv("PATH", "/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
service, err := dbusutil.NewSystemService()
if err != nil {
logger.Fatal("failed to new system service:", err)
diff --git a/locale-helper/main.go b/locale-helper/main.go
index 0866e48..ef000b5 100644
--- a/locale-helper/main.go
+++ b/locale-helper/main.go
@@ -45,7 +45,7 @@ var (
)
func main() {
- os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
+ os.Setenv("PATH", "/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
logger.BeginTracing()
defer logger.EndTracing()
--
2.38.1

View file

@ -0,0 +1,109 @@
{ stdenv
, lib
, fetchFromGitHub
, buildGoPackage
, replaceAll
, wrapQtAppsHook
, wrapGAppsHook
, gtk3
, pkg-config
, deepin-gettext-tools
, alsa-lib
, go-dbus-factory
, go-gir-generator
, go-lib
, libcanberra
, libgudev
, librsvg
, poppler
, pulseaudio
, gdk-pixbuf-xlib
, dbus
, coreutils
, deepin-desktop-base
}:
buildGoPackage rec {
pname = "dde-api";
version = "5.5.32";
goPackagePath = "github.com/linuxdeepin/dde-api";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-F+vEOSpysqVtjs8de5mCmeANuCbYUQ860ZHl5rwNYac=";
};
patches = [ ./0001-fix-PATH-for-NixOS.patch ];
postPatch = replaceAll "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api"
+ replaceAll "/usr/share/i18n/language_info.json" "${deepin-desktop-base}/share/i18n/language_info.json"
+ replaceAll "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
+ replaceAll "/usr/bin/true" "${coreutils}/bin/true"
+ replaceAll "/usr/sbin/alsactl" "alsactl"
+ ''
substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \
--replace "/usr/share/dde-api" "$out/share/dde-api"
substituteInPlace themes/{theme.go,settings.go} \
--replace "/usr/share" "/run/current-system/sw/share"
'';
goDeps = ./deps.nix;
nativeBuildInputs = [
pkg-config
deepin-gettext-tools
wrapQtAppsHook
wrapGAppsHook
];
dontWrapGApps = true;
buildInputs = [
go-dbus-factory
go-gir-generator
go-lib
gtk3
alsa-lib
libcanberra
libgudev
librsvg
poppler
pulseaudio
gdk-pixbuf-xlib
];
buildPhase = ''
runHook preBuild
GOPATH="$GOPATH:${go-dbus-factory}/share/gocode"
GOPATH="$GOPATH:${go-gir-generator}/share/gocode"
GOPATH="$GOPATH:${go-lib}/share/gocode"
make -C go/src/${goPackagePath}
runHook postBuild
'';
installPhase = ''
runHook preInstall
make install DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath}
runHook postInstall
'';
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
postFixup = ''
for binary in $out/lib/deepin-api/*; do
wrapProgram $binary "''${qtWrapperArgs[@]}"
done
'';
meta = with lib; {
description = "Dbus interfaces used for screen zone detecting, thumbnail generating, sound playing, etc";
homepage = "https://github.com/linuxdeepin/dde-api";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
};
}

View file

@ -0,0 +1,210 @@
[
{
goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
fetch = {
type = "git";
url = "https://gopkg.in/alecthomas/kingpin.v2";
rev = "v2.2.6";
sha256 = "sha256-uViE2kPj7tMrGYVjjdLOl2jFDmmu+3P7GvnZBse2zVY=";
};
}
{
goPackagePath = "github.com/disintegration/imaging";
fetch = {
type = "git";
url = "https://github.com/disintegration/imaging";
rev = "v1.6.2";
sha256 = "sha256-pSeMTPvSkxlthh65LjNYYhPLvCZDkBgVgAGYWW0Aguo=";
};
}
{
goPackagePath = "github.com/linuxdeepin/go-x11-client";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
rev = "0.6.9";
sha256 = "sha256-xXNaXpFFHJN1fCFLoVrQFCXQ4ya+Kga55QWcJL/InkA=";
};
}
{
goPackagePath = "github.com/mattn/go-sqlites";
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
rev = "v1.14.12";
sha256 = "sha256-SLW1FyyfJGPUid1epgmJHZGJebI77Wg5WMAPiz1GcYs=";
};
}
{
goPackagePath = "github.com/godbus/dbus";
fetch = {
type = "git";
url = "https://github.com/godbus/dbus";
rev = "v5.1.0";
sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0=";
};
}
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "v1.5.1";
sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY=";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://github.com/golang/sys";
rev = "289d7a0edf712062d9f1484b07bdf2383f48802f";
sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs=";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.7.1";
sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w=";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI=";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc";
sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90=";
};
}
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.3.0";
sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw=";
};
}
{
goPackagePath = "gopkg.in/yaml.v3";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc";
sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk=";
};
}
{
goPackagePath = "golang.org/x/image";
fetch = {
type = "git";
url = "https://github.com/golang/image";
rev = "a8550c1d254a56cf1762a2993881d2b23c0c83dd";
sha256 = "sha256-gtRGCsCe8tKLsZWhKLL8c5whz9rCMoCHfH13rcSW/OM=";
};
}
{
goPackagePath = "github.com/alecthomas/units";
fetch = {
type = "git";
url = "https://github.com/alecthomas/units";
rev = "b94a6e3cc13755c0a75fffecbb089eb346fc4289";
sha256 = "sha256-uriYmwxT69xbmWKO/5OAyeMa2lFBOJDrU2KtQh/+ZjY=";
};
}
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
type = "git";
url = "https://github.com/alecthomas/template";
rev = "fb15b899a75114aa79cc930e33c46b577cc664b1";
sha256 = "sha256-RsS4qxdRQ3q+GejA8D9Iu31A/mZNms4LbJ7518jWiu4=";
};
}
{
goPackagePath = "github.com/cryptix/wav";
fetch = {
type = "git";
url = "https://github.com/cryptix/wav";
rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44";
sha256 = "sha256-psUCHRFGEOpN3obFbCvSfW0AGEFSI29d0q4MFsHG3qI=";
};
}
{
goPackagePath = "github.com/fogleman/gg";
fetch = {
type = "git";
url = "https://github.com/fogleman/gg";
rev = "v1.3.0";
sha256 = "sha256-Fs2JI0FmF4N5EzXJzGAPZMxZxo6wKyebkN/iBZ9sdNo=";
};
}
{
goPackagePath = "github.com/golang/freetype";
fetch = {
type = "git";
url = "https://github.com/golang/freetype";
rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4";
sha256 = "sha256-rOOsv1sNLbYEKnwXZtUlB2CXVkFANyzZy2E7w2QbnKQ=";
};
}
{
goPackagePath = "github.com/gosexy/gettext";
fetch = {
type = "git";
url = "https://github.com/gosexy/gettext";
rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";
sha256 = "sha256-8U2oSi446U13c3uqcbg/14okypxKmckRuvWfZlGHVys=";
};
}
{
goPackagePath = "github.com/nfnt/resize";
fetch = {
type = "git";
url = "https://github.com/nfnt/resize";
rev = "83c6a9932646f83e3267f353373d47347b6036b2";
sha256 = "sha256-yvPV+HlDOyJsiwAcVHQkmtw8DHSXyw+cXHkigXm8rAA=";
};
}
{
goPackagePath = "github.com/youpy/go-wav";
fetch = {
type = "git";
url = "https://github.com/youpy/go-wav";
rev = "v0.3.2";
sha256 = "sha256-jNqXW3F3fcgjT47+d2MVXauWkA7+1KfYVu3ZZpRCTkM=";
};
}
{
goPackagePath = "github.com/zaf/g711";
fetch = {
type = "git";
url = "https://github.com/zaf/g711";
rev = "v1.2";
sha256 = "sha256-G+0cgGw/fcOUFVn32AeqUE0YjyOS82Z5MTcn6IANhCY=";
};
}
{
goPackagePath = "github.com/youpy/go-riff";
fetch = {
type = "git";
url = "https://github.com/youpy/go-riff";
rev = "v0.1.0";
sha256 = "sha256-d/3rkxDeRTPveZblArKc61gB4LJVV08n7g0THieuhx8=";
};
}
]

View file

@ -64,11 +64,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "43.2";
version = "43.4.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-1/JWq6gKkscnsyn9AchgLaS3jw/drsk/zZEJaWRwBWM=";
sha256 = "sha256-AA+XBRroJHJJOSsB+/uiCv7lZiZxlscNVEChisBY2Z4=";
};
patches = [

View file

@ -28,14 +28,14 @@
stdenv.mkDerivation rec {
pname = "rygel";
version = "0.42.0";
version = "0.42.1";
# TODO: split out lib
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "AG2nhnffKMruKHxEwp/NntyxshYkI7x/LdLchWuOK7s=";
sha256 = "BfMrbray/j8dg8Vp3QKnRnfN5nyTpb3O6JXiPr+omD0=";
};
patches = [

View file

@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "vte";
version = "0.70.2";
version = "0.70.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-TRW0OA3j9WTVfqvQBjicQHxwXfWwxwAw/cwklxozTYA=";
sha256 = "sha256-lFcTSgLzFX/KBPfg05vbDzCZvgo86CtxOdDJioB0jyM=";
};
patches = [
@ -48,13 +48,6 @@ stdenv.mkDerivation rec {
url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
})
# Fix copying text with GTK 4.
# https://gitlab.gnome.org/GNOME/vte/-/issues/2584
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/vte/-/commit/ddb2c8ae0baf3b73d77d1f6ce6142e92faa632af.patch";
hash = "sha256-5Eu0EH0MBJqJUZ6d5bVe5+hl4Z/Gd3Yltz0VAQK7ogY=";
})
];
nativeBuildInputs = [

View file

@ -1,7 +1,6 @@
{ lib
, aiohttp
, aresponses
, asynctest
, buildPythonPackage
, fetchFromGitHub
, poetry-core
@ -19,19 +18,19 @@ buildPythonPackage rec {
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w=";
rev = "refs/tags/${version}";
hash = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w=";
};
postPatch = ''
# https://github.com/bachya/aioambient/pull/97
substituteInPlace pyproject.toml \
--replace 'websockets = ">=8.1,<10.0"' 'websockets = ">=8.1,<11.0"'
--replace 'websockets = ">=9.1,<11.0"' 'websockets = "*"'
'';
nativeBuildInputs = [
@ -47,7 +46,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
aresponses
asynctest
pytest-aiohttp
pytest-asyncio
pytestCheckHook
@ -65,6 +63,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for the Ambient Weather API";
homepage = "https://github.com/bachya/aioambient";
changelog = "https://github.com/bachya/aioambient/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View file

@ -2,7 +2,6 @@
, aiohttp
, async-timeout
, asyncio-dgram
, asynctest
, buildPythonPackage
, docutils
, fetchFromGitHub
@ -10,22 +9,24 @@
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, voluptuous
}:
buildPythonPackage rec {
pname = "aioguardian";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
};
format = "pyproject";
nativeBuildInputs = [
poetry-core
];
@ -40,17 +41,11 @@ buildPythonPackage rec {
nativeCheckInputs = [
asyncio-dgram
asynctest
pytest-aiohttp
pytest-asyncio
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'docutils = "<0.18"' 'docutils = "*"'
'';
disabledTestPaths = [
"examples/"
];
@ -62,10 +57,11 @@ buildPythonPackage rec {
meta = with lib; {
description = " Python library to interact with Elexa Guardian devices";
longDescription = ''
aioguardian is a Pytho3, asyncio-focused library for interacting with the
aioguardian is an asyncio-focused library for interacting with the
Guardian line of water valves and sensors from Elexa.
'';
homepage = "https://github.com/bachya/aioguardian";
changelog = "https://github.com/bachya/aioguardian/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View file

@ -17,20 +17,25 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "jsbronder";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
rev = "refs/tagsv${version}";
hash = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
};
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
checkInputs = [
pytest-asyncio
];
# OSError: AF_UNIX path too long
doCheck = !stdenv.isDarwin;
disabledTests = [
"test_protocol_pause_resume"
# TypeError: socket type must be 2
"test_from_socket_bad_socket"
];
pythonImportsCheck = [
@ -40,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python support for higher level Datagram";
homepage = "https://github.com/jsbronder/asyncio-dgram";
changelog = "https://github.com/jsbronder/asyncio-dgram/blob/v${version}/ChangeLog";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View file

@ -4,9 +4,11 @@
, fetchFromGitHub
, pytestCheckHook
, arviz
, blackjax
, formulae
, graphviz
, numpy
, numpyro
, pandas
, pymc
, scipy
@ -35,14 +37,16 @@ buildPythonPackage rec {
preCheck = ''export HOME=$(mktemp -d)'';
nativeCheckInputs = [ graphviz pytestCheckHook ];
nativeCheckInputs = [
blackjax
graphviz
numpyro
pytestCheckHook
];
disabledTests = [
# attempt to fetch data:
"test_data_is_copied"
"test_predict_offset"
# require blackjax (not in Nixpkgs), numpyro, and jax:
"test_logistic_regression_categoric_alternative_samplers"
"test_regression_alternative_samplers"
];
pythonImportsCheck = [ "bambi" ];

View file

@ -0,0 +1,62 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
, fastprogress
, jax
, jaxlib
, jaxopt
, optax
, typing-extensions
}:
buildPythonPackage rec {
pname = "blackjax";
version = "0.9.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "blackjax-devs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-EieDu9SJxi2cp1bHlxX4vvFZeDGMGIm24GoR8nSyjvE=";
};
patches = [
# remove in next release
(fetchpatch {
name = "fix-lbfgs-args";
url = "https://github.com/blackjax-devs/blackjax/commit/1aaa6f64bbcb0557b658604b2daba826e260cbc6.patch";
hash = "sha256-XyjorXPH5Ap35Tv1/lTeTWamjplJF29SsvOq59ypftE=";
})
];
propagatedBuildInputs = [
fastprogress
jax
jaxlib
jaxopt
optax
typing-extensions
];
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [ "tests/test_benchmarks.py" ];
disabledTests = [
# too slow
"test_adaptive_tempered_smc"
];
pythonImportsCheck = [
"blackjax"
];
meta = with lib; {
homepage = "https://blackjax-devs.github.io/blackjax";
description = "Sampling library designed for ease of use, speed and modularity";
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];
};
}

View file

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "datasets";
version = "2.6.1";
version = "2.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,17 +30,9 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-5j8HT/DzHH8xssv97g/9kpSgtpaY6daWOGwjasD1psg=";
hash = "sha256-A6rrChzHHd7vS1KWlF/EZEjp1CEE0mNn4AlMdSYLD/I=";
};
patches = [
(fetchpatch {
# Backport support for dill<3.7
url = "https://github.com/huggingface/datasets/pull/5166.patch";
hash = "sha256-QigpXKHi2B60M/iIWSqvBU9hW5vBu6IHGML22aCMevo=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace "responses<0.19" "responses"

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "fake-useragent";
version = "1.1.1";
version = "1.1.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "fake-useragent";
repo = "fake-useragent";
rev = "refs/tags/${version}";
hash = "sha256-MKVJM8bduvA03xzL954huoCge7enG2BJtxZEAvo6HIY=";
hash = "sha256-Rz+oEpgfvSRdly+H1bYxYjNCfo1STkLcogPgZs+b8DY=";
};
postPatch = ''

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "2.8.0";
version = "2.9.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
hash = "sha256-QOARAT1XSoW/PJli6BzNOZZJjiSubz8zqndEHZCCqag=";
hash = "sha256-7sX+XDhyMtijwcwKK1Bt7n26v24qinb4HDVQD8zUg2M=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,35 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pybind11
}:
buildPythonPackage rec {
pname = "fasttext-predict";
version = "0.9.2.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-iSCt54tqBmNfrcntDFRXb550607Zr1mMCO2PC1ZbVQw=";
};
nativeBuildInputs = [
pybind11
];
# tests are removed from fork
doCheck = false;
pythonImportsCheck = [ "fasttext" ];
meta = with lib; {
description = "fasttext with wheels and no external dependency, but only the predict method (<1MB)";
homepage = "https://github.com/searxng/fasttext-predict/";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
# ImportError: dynamic module does not define module export function (PyInit_fasttext_pybind)
broken = stdenv.isDarwin;
};
}

View file

@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, pytestCheckHook
, absl-py
, cvxpy
, jax
, jaxlib
, matplotlib
, numpy
, optax
, scipy
, scikitlearn
}:
buildPythonPackage rec {
pname = "jaxopt";
version = "0.5.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "refs/tags/${pname}-v${version}";
hash = "sha256-WOsr/Dvguu9/qX6+LMlAKM3EANtYPtDu8Uo2157+bs0=";
};
propagatedBuildInputs = [
absl-py
jax
jaxlib
matplotlib
numpy
scipy
];
nativeCheckInputs = [
pytestCheckHook
cvxpy
optax
scikitlearn
];
pythonImportsCheck = [
"jaxopt"
"jaxopt.implicit_diff"
"jaxopt.linear_solve"
"jaxopt.loss"
"jaxopt.tree_util"
];
meta = with lib; {
homepage = "https://jaxopt.github.io";
description = "Hardware accelerated, batchable and differentiable optimizers in JAX";
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];
};
}

View file

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "jupyter_console";
version = "6.5.0";
version = "6.5.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Z+aPHaFrw/b3jthG3VVD7AZ5Np+FBHNPEL/SBvquOeo=";
sha256 = "sha256-a5G3tuinFQU7U22yCaL0sCQp17KNsnNzpWomsL69Ygs=";
};
propagatedBuildInputs = [

View file

@ -14,11 +14,13 @@
buildPythonPackage rec {
pname = "locationsharinglib";
version = "4.1.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY=";
hash = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY=";
};
propagatedBuildInputs = [
@ -49,11 +51,14 @@ buildPythonPackage rec {
runHook postCheck
'';
pythonImportsCheck = [ "locationsharinglib" ];
pythonImportsCheck = [
"locationsharinglib"
];
meta = with lib; {
description = "Python package to retrieve coordinates from a Google account";
homepage = "https://locationsharinglib.readthedocs.io/";
changelog = "https://github.com/costastf/locationsharinglib/blob/${version}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

View file

@ -1,37 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, paramiko
, selectors2
, lxml
, paramiko
, pytestCheckHook
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "ncclient";
version = "0.6.13";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc=";
rev = "refs/tags/v${version}";
hash = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc=";
};
propagatedBuildInputs = [
paramiko
lxml
six
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "ncclient" ];
pythonImportsCheck = [
"ncclient"
];
meta = with lib; {
homepage = "https://github.com/ncclient/ncclient";
description = "Python library for NETCONF clients";
homepage = "https://github.com/ncclient/ncclient";
changelog = "https://github.com/ncclient/ncclient/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ xnaveira ];
};

View file

@ -4,25 +4,27 @@
, fetchFromGitHub
, jinja2
, matplotlib
, odfpy
, openpyxl
, pandas
, poetry-core
, scipy
, sqlalchemy
, tabulate
, pyarrow
, pyreadstat
, tables
, pytestCheckHook
, pythonOlder
, scipy
, sqlalchemy
, tables
, tabulate
, types-pytz
, typing-extensions
, xarray
, XlsxWriter
}:
buildPythonPackage rec {
pname = "pandas-stubs";
version = "1.5.0.221003";
version = "1.5.3.230214";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -30,8 +32,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pandas-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RV0pOTPtlwBmYs3nu8+lNwVpl/VC/VzcXKOQMg9C3qk=";
rev = "refs/tags/v${version}";
hash = "sha256-hLQXGnWtjYNzzyHO+p7CCFEHc2lrSwh35Om94K5Ozhk=";
};
nativeBuildInputs = [
@ -46,62 +48,65 @@ buildPythonPackage rec {
nativeCheckInputs = [
jinja2
matplotlib
odfpy
openpyxl
scipy
sqlalchemy
tabulate
pyarrow
tables
pyreadstat
pytestCheckHook
scipy
sqlalchemy
tables
tabulate
typing-extensions
xarray
XlsxWriter
];
disabledTests = [
# AttributeErrors, missing dependencies, error and warning checks
"test_data_error"
"test_specification_error"
"test_setting_with_copy_error"
"test_setting_with_copy_warning"
"test_numexpr_clobbering_error"
"test_undefined_variable_error"
"test_indexing_error"
"test_pyperclip_exception"
"test_css_warning"
"test_possible_data_loss_error"
"test_closed_file_error"
"test_incompatibility_warning"
"test_attribute_conflict_warning"
"test_database_error"
"test_possible_precision_loss"
"test_value_label_type_mismatch"
"test_invalid_column_name"
"test_categorical_conversion_warning"
"test_join"
"test_isetframe"
"test_reset_index_150_changes"
"test_compare_150_changes"
"test_quantile_150_changes"
"test_resample_150_changes"
"test_index_astype"
"test_orc"
"test_orc_path"
"test_orc_buffer"
"test_orc_columns"
"test_orc_bytes"
"test_clipboard"
"test_clipboard_iterator"
"test_arrow_dtype"
"test_aggregate_series_combinations"
"test_aggregate_frame_combinations"
"test_types_rank"
"test_reset_index"
"test_types_assert_series_equal"
"test_show_version"
"test_aggregate_series_combinations"
"test_arrow_dtype"
"test_attribute_conflict_warning"
"test_categorical_conversion_warning"
"test_clipboard_iterator"
"test_clipboard"
"test_closed_file_error"
"test_compare_150_changes"
"test_crosstab_args"
"test_css_warning"
"test_data_error"
"test_database_error"
"test_dummies"
"test_from_dummies_args"
"test_incompatibility_warning"
"test_index_astype"
"test_indexing_error"
"test_invalid_column_name"
"test_isetframe"
"test_join"
"test_numexpr_clobbering_error"
"test_orc_buffer"
"test_orc_bytes"
"test_orc_columns"
"test_orc_path"
"test_orc"
"test_possible_data_loss_error"
"test_possible_precision_loss"
"test_pyperclip_exception"
"test_quantile_150_changes"
"test_resample_150_changes"
"test_reset_index_150_changes"
"test_reset_index"
"test_rolling_step_method"
"test_setting_with_copy_error"
"test_setting_with_copy_warning"
"test_show_version"
"test_specification_error"
"test_types_assert_series_equal"
"test_types_rank"
"test_undefined_variable_error"
"test_value_label_type_mismatch"
] ++ lib.optionals stdenv.isDarwin [
"test_plotting" # Fatal Python error: Illegal instruction
];
@ -112,7 +117,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Type annotations for Pandas";
homepage = "https://github.com/VirtusLab/pandas-stubs";
homepage = "https://github.com/pandas-dev/pandas-stubs";
license = licenses.mit;
maintainers = with maintainers; [ malo ];
};

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyhocon";
version = "0.3.59";
version = "0.3.60";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "chimpler";
repo = pname;
rev = version;
sha256 = "sha256-0BuDYheURFhtnWIh7Qw4LzZbk5tSqiNejo+08eglIvs=";
rev = "refs/tags/${version}";
sha256 = "sha256-H460j/DjY1lltapva3l87oyOJVjzUE9Q/oKti3SsUyU=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,43 @@
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, bz2file
, setuptools
, setuptools-scm
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "screed";
version = "1.1.1";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EB4ZNImNLUoU+dnJd3S4wTyQpmuNK3NLtakPsO1iCbU=";
};
nativeBuildInputs = [ setuptools-scm ];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pythonImportsCheck = [ "screed" ];
checkInputs = [ pytestCheckHook ];
# These tests use the screed CLI and make assumptions on how screed is
# installed that break with nix. Can be enabled when upstream is fixed.
disabledTests = [
"Test_convert_shell"
"Test_fa_shell_command"
"Test_fq_shell_command"
];
propagatedBuildInputs = [ bz2file setuptools ];
meta = with lib; {
description = "A simple read-only sequence database, designed for short reads";
homepage = "https://pypi.org/project/screed/";
maintainers = with maintainers; [ luizirber ];
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,52 @@
{ lib
, stdenv
, fetchFromGitHub
, SDL2
, libdevil
, rtaudio
, rtmidi
, glew
, alsa-lib
, cmake
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "theforceengine";
version = "1.09.100";
src = fetchFromGitHub {
owner = "luciusDXL";
repo = "TheForceEngine";
rev = "v${version}";
sha256 = "sha256-nw9yp/StaSi5thafVT1V5YA2ZCYGWNoHUvQTpK90Foc=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
SDL2
libdevil
rtaudio
rtmidi
glew
alsa-lib
];
prePatch = ''
# use nix store path instead of hardcoded /usr/share for support data
substituteInPlace TheForceEngine/TFE_FileSystem/paths-posix.cpp \
--replace "/usr/share" "$out/share"
'';
meta = with lib; {
description = "Modern \"Jedi Engine\" replacement supporting Dark Forces, mods, and in the future Outlaws.";
homepage = "https://theforceengine.github.io";
license = licenses.gpl2Only;
maintainers = with maintainers; [ devusb ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,26 @@
{ buildGoModule, fetchFromGitLab, lib }:
buildGoModule rec {
pname = "gnss-share";
version = "0.6";
src = fetchFromGitLab {
owner = "postmarketOS";
repo = "gnss-share";
rev = version;
hash = "sha256-vVmQlhzRISMBcYZh/9GQmOGzDgTzu2jSyIiEWdXPqOQ=";
};
vendorHash = "sha256-hS/xSxZSMHP+qlvpJYV6EvXtWx9ESamJ8lOf926CqOw=";
meta = with lib; {
description = "share GNSS data between multiple clients";
longDescription = ''
gnss-share is an app that facilitates sharing GNSS location data with multiple
clients, while providing a way to perform device-specific setup beforehand. For
some devices, it can also manage loading and storing A-GPS data.
This is meant to replace things like gpsd, and gps-share, and work together
with geoclue* or other clients that support fetching NMEA location data over
sockets.
'';
license = licenses.gpl3;
maintainers = with maintainers; [ balsoft ];
};
}

View file

@ -4,9 +4,9 @@
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
},
"invidious": {
"rev": "d6dd341594cc837001ed57cbea3103d22c9988c1",
"sha256": "sha256-BHCbIX7Qi2adixIY+hcU8t5kBXBGAv8DTviJ7BPHKCg=",
"version": "unstable-2023-02-02"
"rev": "7993784701686c057b85c57704537135e6326de9",
"sha256": "sha256-LKoUm38gUXucOdXmiJGaKt7ckeb7JBd5I/AxDRDnq30=",
"version": "unstable-2023-02-13"
},
"lsquic": {
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "youtrack";
version = "2021.4.35970";
version = "2022.3.65371";
jar = fetchurl {
url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar";
sha256 = "sha256-HB515TS0XXEAiT463nVHP/naeoF7nmeB+6EK0NJ+5c0=";
sha256 = "sha256-NQKWmKEq5ljUXd64zY27Nj8TU+uLdA37chbFVdmwjNs=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "searxng";
version = "unstable-2022-09-01";
version = "unstable-2023-03-13";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "174e5242569812618af4ebd9a646ba2a6ded5459";
sha256 = "sha256-Q1+4HkgOoTRtW5XYWpC5dpukkrjG5fP0585soo/srmQ=";
rev = "295c87a926c3deb1e438234550a9d8fbbaad17fa";
sha256 = "sha256-ItPFUyyuctx/yyMVUn5Ez9f+taNiV6FR0q9wz1jwk8M=";
};
postPatch = ''
@ -26,11 +26,11 @@ python3.pkgs.buildPythonApplication rec {
babel
certifi
python-dateutil
fasttext-predict
flask
flask-babel
brotli
jinja2
langdetect
lxml
pygments
pyyaml
@ -56,6 +56,6 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/searxng/searxng";
description = "A fork of Searx, a privacy-respecting, hackable metasearch engine";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ kranzes ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -1,26 +1,25 @@
{ lib
, fetchFromGitHub
, ghostscript
, imagemagick
, poppler_utils
, python3
, tesseract
, xpdf
, tesseract5
}:
python3.pkgs.buildPythonApplication rec {
pname = "invoice2data";
version = "0.3.6";
version = "0.4.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "invoice-x";
repo = pname;
rev = "v${version}";
sha256 = "sha256-t1jgLyKtQsLINlnkCdSbVfTM6B/EiD1yGtx9UHjyZVE=";
sha256 = "sha256-ss2h8cg0sga+lzJyQHckrZB/Eb63Oj3FkqmGqWCzCQ8=";
};
nativeBuildInputs = with python3.pkgs; [
setuptools-git
];
buildInputs = with python3.pkgs; [ setuptools-git ];
propagatedBuildInputs = with python3.pkgs; [
chardet
@ -28,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
pdfminer-six
pillow
pyyaml
setuptools
unidecode
];
@ -37,9 +37,10 @@ python3.pkgs.buildPythonApplication rec {
'';
makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [
ghostscript
imagemagick
tesseract
xpdf
tesseract5
poppler_utils
])];
# Tests fails even when ran manually on my ubuntu machine !!

View file

@ -12202,6 +12202,8 @@ with pkgs;
strip-nondeterminism = perlPackages.strip-nondeterminism;
structorizer = callPackage ../applications/graphics/structorizer { };
structure-synth = callPackage ../tools/graphics/structure-synth { };
su-exec = callPackage ../tools/security/su-exec {};
@ -23397,6 +23399,8 @@ with pkgs;
subdl = callPackage ../applications/video/subdl { };
subtitleedit = callPackage ../applications/video/subtitleedit { };
subtitleeditor = callPackage ../applications/video/subtitleeditor { };
suil = darwin.apple_sdk_11_0.callPackage ../development/libraries/audio/suil { };
@ -35769,6 +35773,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
theforceengine = callPackage ../games/theforceengine { };
tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };
tbls = callPackage ../tools/misc/tbls { };
@ -39154,4 +39160,6 @@ with pkgs;
oversteer = callPackage ../applications/misc/oversteer { };
volantes-cursors = callPackage ../data/icons/volantes-cursors { };
gnss-share = callPackage ../servers/gnss-share { };
}

View file

@ -1300,6 +1300,8 @@ self: super: with self; {
black = callPackage ../development/python-modules/black { };
blackjax = callPackage ../development/python-modules/blackjax { };
black-macchiato = callPackage ../development/python-modules/black-macchiato { };
bleach = callPackage ../development/python-modules/bleach { };
@ -3297,6 +3299,8 @@ self: super: with self; {
fasttext = callPackage ../development/python-modules/fasttext { };
fasttext-predict = callPackage ../development/python-modules/fasttext-predict { };
favicon = callPackage ../development/python-modules/favicon { };
fb-re2 = callPackage ../development/python-modules/fb-re2 { };
@ -4866,6 +4870,8 @@ self: super: with self; {
cudaSupport = false;
};
jaxopt = callPackage ../development/python-modules/jaxopt { };
JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { };
jc = callPackage ../development/python-modules/jc { };
@ -10377,6 +10383,8 @@ self: super: with self; {
scrapy-splash = callPackage ../development/python-modules/scrapy-splash { };
screed = callPackage ../development/python-modules/screed { };
screeninfo = callPackage ../development/python-modules/screeninfo { };
screenlogicpy = callPackage ../development/python-modules/screenlogicpy { };