mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 13:29:00 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e47b93b402
|
|
@ -129,7 +129,15 @@ rustPlatform.buildRustPackage rec {
|
|||
```
|
||||
|
||||
This will retrieve the dependencies using fixed-output derivations from
|
||||
the specified lockfile.
|
||||
the specified lockfile. Note that setting `cargoLock.lockFile` doesn't
|
||||
add a `Cargo.lock` to your `src`, and a `Cargo.lock` is still required
|
||||
to build a rust package. A simple fix is to use:
|
||||
|
||||
```nix
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
```
|
||||
|
||||
The output hash of each dependency that uses a git source must be
|
||||
specified in the `outputHashes` attribute. For example:
|
||||
|
|
|
|||
|
|
@ -339,6 +339,9 @@ in
|
|||
<literal>CI_SERVER_URL=<CI server URL></literal>
|
||||
|
||||
<literal>REGISTRATION_TOKEN=<registration secret></literal>
|
||||
|
||||
WARNING: make sure to use quoted absolute path,
|
||||
or it is going to be copied to Nix Store.
|
||||
'';
|
||||
};
|
||||
registrationFlags = mkOption {
|
||||
|
|
@ -523,7 +526,10 @@ in
|
|||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
warnings = optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`.";
|
||||
warnings = (mapAttrsToList
|
||||
(n: v: "services.gitlab-runner.services.${n}.`registrationConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.")
|
||||
(filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services))
|
||||
++ optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`.";
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
systemd.services.gitlab-runner = {
|
||||
description = "Gitlab Runner";
|
||||
|
|
|
|||
|
|
@ -51,10 +51,11 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
|
|||
host = "localhost";
|
||||
port = 143;
|
||||
};
|
||||
pages = {
|
||||
enabled = true;
|
||||
host = "localhost";
|
||||
};
|
||||
# https://github.com/NixOS/nixpkgs/issues/132295
|
||||
# pages = {
|
||||
# enabled = true;
|
||||
# host = "localhost";
|
||||
# };
|
||||
};
|
||||
secrets = {
|
||||
secretFile = pkgs.writeText "secret" "Aig5zaic";
|
||||
|
|
@ -90,7 +91,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
|
|||
waitForServices = ''
|
||||
gitlab.wait_for_unit("gitaly.service")
|
||||
gitlab.wait_for_unit("gitlab-workhorse.service")
|
||||
gitlab.wait_for_unit("gitlab-pages.service")
|
||||
# https://github.com/NixOS/nixpkgs/issues/132295
|
||||
# gitlab.wait_for_unit("gitlab-pages.service")
|
||||
gitlab.wait_for_unit("gitlab-mailroom.service")
|
||||
gitlab.wait_for_unit("gitlab.service")
|
||||
gitlab.wait_for_unit("gitlab-sidekiq.service")
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
|
||||
machine = {
|
||||
services.rabbitmq.enable = true;
|
||||
# Ensure there is sufficient extra disk space for rabbitmq to be happy
|
||||
virtualisation.diskSize = 1024;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
|
|||
152
pkgs/applications/graphics/djv/default.nix
Normal file
152
pkgs/applications/graphics/djv/default.nix
Normal file
|
|
@ -0,0 +1,152 @@
|
|||
{ stdenv
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, alsa-lib
|
||||
, libGL
|
||||
, libX11
|
||||
, libXinerama
|
||||
, libXi
|
||||
, zlib
|
||||
, rtaudio
|
||||
, rapidjson
|
||||
, ilmbase
|
||||
, glm
|
||||
, glfw3
|
||||
, libpng
|
||||
, opencolorio_1
|
||||
, freetype
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
# The way third-party dependencies are packaged has changed
|
||||
# significantly from the 2.0.8 release. This means any packaging
|
||||
# effort for the 2.0.8 release would have to be redone for the next
|
||||
# release. Hence we package the git version for now and can easily
|
||||
# jump onto the next release once it's available.
|
||||
djvVersion = "2.0.8-unstable-2021-07-31";
|
||||
|
||||
djvSrc = fetchFromGitHub {
|
||||
owner = "darbyjohnston";
|
||||
repo = "djv";
|
||||
rev = "ae31712c4f2802a874217ac194bde26287993934";
|
||||
sha256 = "1qgia6vqb6fhyfj8w925xl6k6zidrp2gj5f32bpi94lwwhi6p9pd";
|
||||
};
|
||||
|
||||
# DJV's build system tries to automatically pull in FSeq, another
|
||||
# library by the DJV author.
|
||||
#
|
||||
# When updating, check the following file in the DJV source:
|
||||
# etc/SuperBuild/cmake/Modules/BuildFSeq.cmake
|
||||
#
|
||||
# If there is revision or tag specified, DJV wants to use the most
|
||||
# recent master version
|
||||
fseqSrc = fetchFromGitHub {
|
||||
owner = "darbyjohnston";
|
||||
repo = "fseq";
|
||||
rev = "545fac6018100f7fca474b8ee4f1efa7cbf6bf45";
|
||||
sha256 = "0qfhbrzji05hh5kwgd1wvq2lbf81ylbi7v7aqk28aws27f8d2hk0";
|
||||
};
|
||||
|
||||
djv-deps = stdenv.mkDerivation rec {
|
||||
pname = "djv-dependencies";
|
||||
version = djvVersion;
|
||||
|
||||
src = djvSrc;
|
||||
|
||||
sourceRoot = "source/etc/SuperBuild";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
libGL
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod -R +w .
|
||||
|
||||
sed -i 's,GIT_REPOSITORY https://github.com/darbyjohnston/FSeq.git,SOURCE_DIR ${fseqSrc},' \
|
||||
cmake/Modules/BuildFSeq.cmake
|
||||
|
||||
# We pull these projects in as normal Nix dependencies. No need
|
||||
# to build them again here.
|
||||
|
||||
sed -i CMakeLists.txt \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS RapidJSON)/d' \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS RtAudio)/d' \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS IlmBase)/d' \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS GLM)/d' \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS GLFW)/d' \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS ZLIB)/d' \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS PNG)/d' \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS FreeType)/d' \
|
||||
-e '/list(APPEND DJV_THIRD_PARTY_DEPS OCIO)/d'
|
||||
|
||||
# The "SuperBuild" wants to build DJV right here. This is
|
||||
# inconvenient, because then the `make install` target is not generated
|
||||
# by CMake. We build DJV in its own derivation below. This also makes
|
||||
# the build a bit more modular.
|
||||
|
||||
sed -i '/include(BuildDJV)/d' \
|
||||
CMakeLists.txt
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDJV_THIRD_PARTY_OpenEXR:BOOL=False"
|
||||
"-DDJV_THIRD_PARTY_JPEG:BOOL=False"
|
||||
"-DDJV_THIRD_PARTY_TIFF:BOOL=False"
|
||||
];
|
||||
|
||||
dontInstall = true;
|
||||
doCheck = true;
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "djv";
|
||||
version = djvVersion;
|
||||
|
||||
src = djvSrc;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libGL
|
||||
libX11
|
||||
libXinerama
|
||||
libXi
|
||||
rapidjson
|
||||
rtaudio
|
||||
ilmbase
|
||||
glm
|
||||
glfw3
|
||||
zlib.dev
|
||||
libpng
|
||||
freetype
|
||||
opencolorio_1
|
||||
djv-deps
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod -R +w .
|
||||
|
||||
# When linking opencolorio statically this results in failing to
|
||||
# pull in opencolorio's dependencies (tixml and yaml libraries). Avoid
|
||||
# this by linking it statically instead.
|
||||
|
||||
sed -i cmake/Modules/FindOCIO.cmake \
|
||||
-e 's/PATH_SUFFIXES static//' \
|
||||
-e '/OpenColorIO_STATIC/d'
|
||||
'';
|
||||
|
||||
# GLFW requires a working X11 session.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A professional review software for VFX, animation, and film production";
|
||||
homepage = "https://darbyjohnston.github.io/DJV/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.blitz ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec {
|
|||
ImagePNGLibpng
|
||||
ImageSane
|
||||
SetIntSpan
|
||||
PerlMagick
|
||||
ImageMagick
|
||||
ConfigGeneral
|
||||
ListMoreUtils
|
||||
HTMLParser
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
|
||||
XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
|
||||
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
|
||||
PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
|
||||
ImageMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
|
||||
commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
|
||||
EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
|
||||
];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = with perlPackages; [
|
||||
makeWrapper perl
|
||||
PerlMagick TermProgressBar ImageExifTool
|
||||
ImageMagick TermProgressBar ImageExifTool
|
||||
FileType ClassMethodMaker
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
|
||||
{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight
|
||||
, gitSupport ? false, git ? null
|
||||
, docutilsSupport ? false, python ? null, docutils ? null
|
||||
, monotoneSupport ? false, monotone ? null
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
|||
buildInputs = [ which highlight ]
|
||||
++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
|
||||
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
|
||||
RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
|
||||
NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ])
|
||||
++ lib.optionals docutilsSupport [python docutils]
|
||||
++ lib.optionals gitSupport [git]
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
# When updating, change the commit underneath
|
||||
version = "1.6.0";
|
||||
commit = "5bd70fd8eef316d220317245e46dc6016c348dce";
|
||||
version = "1.6.2";
|
||||
commit = "8c9cdb9603446760452979dc77f93b17054ea1cc";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
sha256 = "sha256-2d4xsffh5DpxGahmzXpgUBRFAt5CsDnHCm8xU1ksqyQ=";
|
||||
sha256 = "sha256-JYa+5lP9uo/6/5wTxNz8xa2usHo6WfXSndbwrMpHhcg=";
|
||||
};
|
||||
|
||||
buildFlagsArray = ''
|
||||
|
|
@ -22,11 +22,15 @@ buildGoModule rec {
|
|||
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-aQjtebIyV69nRwc/zvK/9v0mX3pAPKfOunSL/FpFZJU=";
|
||||
vendorSha256 = "sha256-Rmj2qGY2w1gsnKAuRQ8cQyqfoM556t4/MookkuPmbDM=";
|
||||
|
||||
excludedPackages = [ "issue-template-gen" ];
|
||||
excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" ];
|
||||
|
||||
doCheck = false;
|
||||
doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/velero version --client-only | grep ${version} > /dev/null
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
|
|
@ -43,6 +47,5 @@ buildGoModule rec {
|
|||
"https://github.com/vmware-tanzu/velero/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.mbode maintainers.bryanasdev000 ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.7.33",
|
||||
"version": "1.7.34",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
@ -20,7 +20,8 @@
|
|||
"asar-webapp": "asar p webapp webapp.asar",
|
||||
"start": "yarn run build:ts && yarn run build:res && electron .",
|
||||
"lint": "yarn lint:types && yarn lint:js",
|
||||
"lint:js": "eslint src/ scripts/ hak/",
|
||||
"lint:js": "eslint --max-warnings 0 src scripts hak",
|
||||
"lint:js-fix": "eslint --fix src scripts hak",
|
||||
"lint:types": "tsc --noEmit",
|
||||
"build:native": "yarn run hak",
|
||||
"build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
|
||||
|
|
@ -55,7 +56,7 @@
|
|||
"@typescript-eslint/parser": "^4.17.0",
|
||||
"asar": "^2.0.1",
|
||||
"chokidar": "^3.5.2",
|
||||
"electron": "12.0.11",
|
||||
"electron": "^13.1.7",
|
||||
"electron-builder": "22.11.4",
|
||||
"electron-builder-squirrel-windows": "22.11.4",
|
||||
"electron-devtools-installer": "^3.1.1",
|
||||
|
|
@ -70,19 +71,18 @@
|
|||
"mkdirp": "^1.0.3",
|
||||
"needle": "^2.5.0",
|
||||
"node-pre-gyp": "^0.15.0",
|
||||
"npm": "^6.14.11",
|
||||
"pacote": "^11.3.5",
|
||||
"rimraf": "^3.0.2",
|
||||
"semver": "^7.3.4",
|
||||
"tar": "^6.1.0",
|
||||
"typescript": "^4.1.3"
|
||||
},
|
||||
"hakDependencies": {
|
||||
"matrix-seshat": "^2.2.3",
|
||||
"matrix-seshat": "^2.3.0",
|
||||
"keytar": "^5.6.0"
|
||||
},
|
||||
"build": {
|
||||
"appId": "im.riot.app",
|
||||
"electronVersion": "12.0.14",
|
||||
"electronVersion": "13.1.6",
|
||||
"files": [
|
||||
"package.json",
|
||||
{
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
let
|
||||
executableName = "element-desktop";
|
||||
version = "1.7.33";
|
||||
version = "1.7.34";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vector-im";
|
||||
repo = "element-desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1JmuKyJt6Q80lLXXrFw+h6/0JzWcr0qMIU9mTO+K56I=";
|
||||
sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY=";
|
||||
};
|
||||
in mkYarnPackage rec {
|
||||
name = "element-desktop-${version}";
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "element-web";
|
||||
version = "1.7.33";
|
||||
version = "1.7.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
|
||||
sha256 = "sha256-MhbXvl+FUCL6D6y2Oa5Kf5ie9fU85wEO/tQe881CD8I=";
|
||||
sha256 = "sha256-0M2LuVSHIGRwzq00wgzlzTVWh3WItNN+JDNf+u+9V30=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick ];
|
||||
propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.ImageMagick ];
|
||||
|
||||
nativeBuildInputs = [ zlib makeWrapper ];
|
||||
buildInputs = lib.optional stdenv.cc.isClang openmp;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "14.1.0",
|
||||
"repo_hash": "1a61jc8rsbdbyh891nwygl7qlsj0lm8v59s66hn22csg0dvn6qk6",
|
||||
"version": "14.1.1",
|
||||
"repo_hash": "1cygdllhqxah7d8lmx4hcx880wijwfvbbs6dfkdzcn0cd3czpcv8",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.1.0-ee",
|
||||
"rev": "v14.1.1-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.1.0",
|
||||
"GITALY_SERVER_VERSION": "14.1.1",
|
||||
"GITLAB_PAGES_VERSION": "1.41.0",
|
||||
"GITLAB_SHELL_VERSION": "13.19.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.1.0"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.1.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@ let
|
|||
};
|
||||
};
|
||||
in buildGoModule rec {
|
||||
version = "14.1.0";
|
||||
version = "14.1.1";
|
||||
pname = "gitaly";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k9Vz/b5ZKz93/7nzEA5mnQI8U++CB3E9b8gJBefl2b0=";
|
||||
sha256 = "sha256-UCWN9TXbfysNLMOU8bDcjrwYtz7+kTCDQmRAl84ysWU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.1.0";
|
||||
version = "14.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, asciidoc
|
||||
, cmake
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
|
|
@ -11,6 +10,7 @@
|
|||
, gdk-pixbuf
|
||||
, gdk-pixbuf-xlib
|
||||
, gettext
|
||||
, giflib
|
||||
, glib
|
||||
, imlib2
|
||||
, libICE
|
||||
|
|
@ -30,22 +30,22 @@
|
|||
, libpthreadstubs
|
||||
, libsndfile
|
||||
, libtiff
|
||||
, giflib
|
||||
, libxcb
|
||||
, mkfontdir
|
||||
, pcre
|
||||
, perl
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icewm";
|
||||
version = "2.3.4";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ice-wm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A=";
|
||||
hash = "sha256-R06tiWS9z6K5Nbi+vvk7DyozpcFdrHleMeh7Iq/FfHQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
|
|||
gdk-pixbuf
|
||||
gdk-pixbuf-xlib
|
||||
gettext
|
||||
giflib
|
||||
glib
|
||||
imlib2
|
||||
libICE
|
||||
|
|
@ -81,13 +82,15 @@ stdenv.mkDerivation rec {
|
|||
libpthreadstubs
|
||||
libsndfile
|
||||
libtiff
|
||||
giflib
|
||||
libxcb
|
||||
mkfontdir
|
||||
pcre
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ];
|
||||
cmakeFlags = [
|
||||
"-DPREFIX=$out"
|
||||
"-DCFGDIR=/etc/icewm"
|
||||
];
|
||||
|
||||
# install legacy themes
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, pkg-config
|
||||
, gtk3
|
||||
, glib
|
||||
, glib-networking
|
||||
, wrapGAppsHook
|
||||
, itstool
|
||||
, gnupg
|
||||
|
|
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
gtk3
|
||||
glib
|
||||
glib-networking
|
||||
gcr
|
||||
gsettings-desktop-schemas
|
||||
gnupg
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "datasets";
|
||||
version = "1.8.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE=";
|
||||
sha256 = "0pm14cp7xaagpf4j96v0ybi5gn3r9p0if3pc197ckwx6sw3lx29p";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -39,12 +39,6 @@ buildPythonPackage rec {
|
|||
xxhash
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"' \
|
||||
--replace "huggingface_hub==0.0.2" "huggingface_hub>=0.0.2"
|
||||
'';
|
||||
|
||||
# Tests require pervasive internet access.
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
44
pkgs/development/python-modules/geocachingapi/default.nix
Normal file
44
pkgs/development/python-modules/geocachingapi/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geocachingapi";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sholofly";
|
||||
repo = "geocachingapi-python";
|
||||
rev = version;
|
||||
sha256 = "1vdknsxd7rvw6g5lwxlxj97l9ic8cch8rdki3aczs6xzw5adxhcs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
backoff
|
||||
yarl
|
||||
];
|
||||
|
||||
# Tests require a token and network access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "geocachingapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API to control the Geocaching API";
|
||||
homepage = "https://github.com/Sholofly/geocachingapi-python";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
|
||||
, libserialport, librevisa, doxygen, glibmm, python3
|
||||
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
|
||||
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4", doInstallCheck ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
inherit version doInstallCheck;
|
||||
pname = "libsigrok";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
|
|||
tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
# assert that c++ bindings are included
|
||||
# note that this is only true for modern (>0.5) versions; the 0.3 series does not have these
|
||||
[[ -f $out/include/libsigrokcxx/libsigrokcxx.hpp ]] \
|
||||
|| { echo 'C++ bindings were not generated; check configure output'; false; }
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in stdenv.mkDerivation {
|
|||
dontUseSconsInstall = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pingus.seul.org/~grumbel/xboxdrv/";
|
||||
homepage = "https://xboxdrv.gitlab.io/";
|
||||
description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
|
|
|
|||
|
|
@ -758,7 +758,7 @@ let
|
|||
POSIX_MQUEUE = yes;
|
||||
FRONTSWAP = yes;
|
||||
FUSION = yes; # Fusion MPT device support
|
||||
IDE = no; # deprecated IDE support
|
||||
IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14
|
||||
IDLE_PAGE_TRACKING = yes;
|
||||
IRDA_ULTRA = whenOlder "4.17" yes; # Ultra (connectionless) protocol
|
||||
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "rabbitmq-server";
|
||||
|
||||
version = "3.8.9";
|
||||
version = "3.9.1";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
|
||||
sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
|
||||
buildInputs =
|
||||
[ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ]
|
||||
[ erlang elixir python libxml2 libxslt glibcLocales ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
|
@ -40,13 +40,6 @@ stdenv.mkDerivation rec {
|
|||
# rabbitmq-env calls to sed/coreutils, so provide everything early
|
||||
sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|'
|
||||
|
||||
# rabbitmq-server script uses `dirname` to get hold of a
|
||||
# rabbitmq-env, so let's provide this file directly. After that
|
||||
# point everything is OK - the PATH above will kick in
|
||||
substituteInPlace $out/sbin/rabbitmq-server \
|
||||
--replace '`dirname $0`/rabbitmq-env' \
|
||||
"$out/sbin/rabbitmq-env"
|
||||
|
||||
# We know exactly where rabbitmq is gonna be, so we patch that into the env-script.
|
||||
# By doing it early we make sure that auto-detection for this will
|
||||
# never be executed (somewhere below in the script).
|
||||
|
|
|
|||
|
|
@ -40,12 +40,11 @@ stdenv.mkDerivation rec {
|
|||
libiconv lmdb libintl
|
||||
nghttp2 # DoH support in kdig
|
||||
libmaxminddb # optional for geoip module (it's tiny)
|
||||
libmnl # required for knot >= 3.1
|
||||
# without sphinx &al. for developer documentation
|
||||
# TODO: add dnstap support?
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libcap_ng systemd
|
||||
libbpf # XDP support
|
||||
libbpf libmnl # XDP support (it's Linux kernel API)
|
||||
] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
set -e
|
||||
|
||||
unzip $src
|
||||
cd mysql-connector-java-*
|
||||
|
||||
mkdir -p $out/share/java
|
||||
cp mysql-connector-java-*-bin.jar $out/share/java/mysql-connector-java.jar
|
||||
|
|
@ -1,19 +1,28 @@
|
|||
{lib, stdenv, fetchurl, ant, unzip}:
|
||||
{ lib, stdenv, fetchurl, ant, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mysql-connector-java";
|
||||
version = "5.1.46";
|
||||
builder = ./builder.sh;
|
||||
version = "5.1.49";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dev.mysql.com/get/Downloads/Connector-J/${pname}-${version}.zip";
|
||||
sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
|
||||
url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-${version}.zip";
|
||||
sha256 = "1bm4mm4xka4pq2rwxx3k8xlcpa1vjcglr3pf4ls2i4hamww047yk";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/java
|
||||
cp mysql-connector-java-*-bin.jar $out/share/java/mysql-connector-java.jar
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
buildInputs = [ ant ];
|
||||
|
||||
meta = {
|
||||
platforms = lib.platforms.unix;
|
||||
meta = with lib; {
|
||||
description = "MySQL Connector/J";
|
||||
homepage = "https://dev.mysql.com/doc/connector-j/8.0/en/";
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
wrapProgram "$out/bin/docbook2odf" \
|
||||
--prefix PATH : "${lib.makeBinPath [ zip libxslt ]}" \
|
||||
--prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}"
|
||||
--prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.ImageMagick ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2548,6 +2548,8 @@ in
|
|||
|
||||
dino = callPackage ../applications/networking/instant-messengers/dino { };
|
||||
|
||||
djv = callPackage ../applications/graphics/djv { };
|
||||
|
||||
dlx = callPackage ../misc/emulators/dlx { };
|
||||
|
||||
dgen-sdl = callPackage ../misc/emulators/dgen-sdl { };
|
||||
|
|
@ -13522,6 +13524,7 @@ in
|
|||
libsigrok_0_3 = libsigrok.override {
|
||||
version = "0.3.0";
|
||||
sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
|
||||
doInstallCheck = false;
|
||||
};
|
||||
|
||||
libsigrokdecode = callPackage ../development/tools/libsigrokdecode {
|
||||
|
|
@ -20256,8 +20259,6 @@ in
|
|||
|
||||
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
|
||||
elixir = beam_nox.interpreters.elixir_1_8;
|
||||
erlang = beam_nox.interpreters.erlangR23;
|
||||
};
|
||||
|
||||
radicale1 = callPackage ../servers/radicale/1.x.nix { };
|
||||
|
|
@ -25025,7 +25026,7 @@ in
|
|||
|
||||
ikiwiki = callPackage ../applications/misc/ikiwiki {
|
||||
python = python3;
|
||||
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
|
||||
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick;
|
||||
};
|
||||
|
||||
iksemel = callPackage ../development/libraries/iksemel { };
|
||||
|
|
|
|||
|
|
@ -9246,7 +9246,7 @@ let
|
|||
};
|
||||
buildInputs = [ pkgs.gtk3 ];
|
||||
propagatedBuildInputs = [ Readonly Gtk3 ];
|
||||
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
|
||||
checkInputs = [ TestDifferences ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
|
||||
checkPhase = ''
|
||||
${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
|
||||
make test
|
||||
|
|
@ -11099,7 +11099,7 @@ let
|
|||
sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x";
|
||||
};
|
||||
outputs = [ "out" "tex" ];
|
||||
propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PerlMagick PodParser TextUnidecode XMLLibXSLT ];
|
||||
propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent ImageMagick PodParser TextUnidecode XMLLibXSLT ];
|
||||
preCheck = ''
|
||||
rm t/931_epub.t # epub test fails
|
||||
'';
|
||||
|
|
@ -16967,22 +16967,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
PerlMagick = buildPerlPackage rec {
|
||||
pname = "PerlMagick";
|
||||
version = "7.0.10";
|
||||
PerlMagick = ImageMagick; # added 2021-08-02
|
||||
ImageMagick = buildPerlPackage rec {
|
||||
pname = "Image-Magick";
|
||||
version = "7.0.11-1";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-${version}.tar.gz";
|
||||
sha256 = "1x05hdb3b6qs36x958b4w46qanvkqm6rpc44rlq4rd2w3gbp4lhx";
|
||||
url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz";
|
||||
sha256 = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI=";
|
||||
};
|
||||
buildInputs = [ pkgs.imagemagick ];
|
||||
preConfigure =
|
||||
''
|
||||
sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL
|
||||
|
||||
# Enable HDRI support to match the native ImageMagick 7 defaults
|
||||
# See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538
|
||||
substituteInPlace Makefile.PL \
|
||||
--replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1'
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2841,6 +2841,8 @@ in {
|
|||
|
||||
geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { };
|
||||
|
||||
geocachingapi = callPackage ../development/python-modules/geocachingapi { };
|
||||
|
||||
geographiclib = callPackage ../development/python-modules/geographiclib { };
|
||||
|
||||
geoip2 = callPackage ../development/python-modules/geoip2 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue