Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
b405702c7f
|
|
@ -480,15 +480,23 @@ Preferred source hash type is sha256. There are several ways to get it.
|
|||
|
||||
4. Extracting hash from local source tarball can be done with `sha256sum`. Use `nix-prefetch-url file:///path/to/tarball` if you want base32 hash.
|
||||
|
||||
5. Fake hash: set fake hash in package expression, perform build and extract correct hash from error Nix prints.
|
||||
5. Fake hash: set the hash to one of
|
||||
|
||||
For package updates it is enough to change one symbol to make hash fake. For new packages, you can use `lib.fakeSha256`, `lib.fakeSha512` or any other fake hash.
|
||||
- `""`
|
||||
- `lib.fakeHash`
|
||||
- `lib.fakeSha256`
|
||||
- `lib.fakeSha512`
|
||||
|
||||
in the package expression, attempt build and extract correct hash from error messages.
|
||||
|
||||
:::{.warning}
|
||||
You must use one of these four fake hashes and not some arbitrarily-chosen hash.
|
||||
|
||||
See [](#sec-source-hashes-security).
|
||||
:::
|
||||
|
||||
This is last resort method when reconstructing source URL is non-trivial and `nix-prefetch-url -A` isn’t applicable (for example, [one of `kodi` dependencies](https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73)). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash.
|
||||
|
||||
::: {.warning}
|
||||
This method has security problems. Check below for details.
|
||||
:::
|
||||
|
||||
### Obtaining hashes securely {#sec-source-hashes-security}
|
||||
|
||||
|
|
@ -500,7 +508,7 @@ Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead of f
|
|||
|
||||
- `https://` URLs are secure in methods 1, 2, 3;
|
||||
|
||||
- `https://` URLs are not secure in method 5. When obtaining hashes with fake hash method, TLS checks are disabled. So refetch source hash from several different networks to exclude MITM scenario. Alternatively, use fake hash method to make Nix error, but instead of extracting hash from error, extract `https://` URL and prefetch it with method 1.
|
||||
- `https://` URLs are secure in method 5 *only if* you use one of the listed fake hashes. If you use any other hash, `fetchurl` will pass `--insecure` to `curl` and may then degrade to HTTP in case of TLS certificate expiration.
|
||||
|
||||
## Patches {#sec-patches}
|
||||
|
||||
|
|
|
|||
|
|
@ -984,11 +984,6 @@ in mkLicense lset) ({
|
|||
fullName = "GNU Free Documentation License v1.3";
|
||||
deprecated = true;
|
||||
};
|
||||
gpl1 = {
|
||||
spdxId = "GPL-1.0";
|
||||
fullName = "GNU General Public License v1.0";
|
||||
deprecated = true;
|
||||
};
|
||||
gpl2 = {
|
||||
spdxId = "GPL-2.0";
|
||||
fullName = "GNU General Public License v2.0";
|
||||
|
|
|
|||
|
|
@ -1241,6 +1241,15 @@
|
|||
githubId = 12923;
|
||||
name = "Astro";
|
||||
};
|
||||
astrobeastie = {
|
||||
email = "fischervincent98@gmail.com";
|
||||
github = "astrobeastie";
|
||||
githubId = 26362368;
|
||||
name = "Vincent Fischer";
|
||||
keys = [{
|
||||
fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F";
|
||||
}];
|
||||
};
|
||||
astsmtl = {
|
||||
email = "astsmtl@yandex.ru";
|
||||
github = "astsmtl";
|
||||
|
|
|
|||
|
|
@ -749,6 +749,14 @@
|
|||
release notes</link> for more details.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>guake</literal> package has been updated from
|
||||
3.6.3 to 3.9.0, see the
|
||||
<link xlink:href="https://github.com/Guake/guake/releases">changelog</link>
|
||||
for more details.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>dockerTools.buildImage</literal> deprecates the
|
||||
|
|
|
|||
|
|
@ -245,6 +245,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- The `diamond` package has been update from 0.8.36 to 2.0.15. See the [upstream release notes](https://github.com/bbuchfink/diamond/releases) for more details.
|
||||
|
||||
- The `guake` package has been updated from 3.6.3 to 3.9.0, see the [changelog](https://github.com/Guake/guake/releases) for more details.
|
||||
|
||||
- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`.
|
||||
Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`.
|
||||
|
||||
|
|
|
|||
|
|
@ -196,6 +196,18 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
checkOpts = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = lib.mdDoc ''
|
||||
A list of options for 'restic check', which is run after
|
||||
pruning.
|
||||
'';
|
||||
example = [
|
||||
"--with-cache"
|
||||
];
|
||||
};
|
||||
|
||||
dynamicFilesFrom = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
|
|
@ -270,8 +282,8 @@ in
|
|||
then if (backup.paths != null) then concatStringsSep " " backup.paths else ""
|
||||
else "--files-from ${filesFromTmpFile}";
|
||||
pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [
|
||||
(resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts))
|
||||
(resticCmd + " check")
|
||||
(resticCmd + " forget --prune --cache-dir=%C/restic-backups-${name} " + (concatStringsSep " " backup.pruneOpts))
|
||||
(resticCmd + " check --cache-dir=%C/restic-backups-${name} " + (concatStringsSep " " backup.checkOpts))
|
||||
];
|
||||
# Helper functions for rclone remotes
|
||||
rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1;
|
||||
|
|
|
|||
|
|
@ -453,6 +453,43 @@ in
|
|||
};
|
||||
});
|
||||
};
|
||||
clear-docker-cache = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to periodically prune gitlab runner's Docker resources. If
|
||||
enabled, a systemd timer will run {command}`clear-docker-cache` as
|
||||
specified by the `dates` option.
|
||||
'';
|
||||
};
|
||||
|
||||
flags = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
example = [ "prune" ];
|
||||
description = lib.mdDoc ''
|
||||
Any additional flags passed to {command}`clear-docker-cache`.
|
||||
'';
|
||||
};
|
||||
|
||||
dates = mkOption {
|
||||
default = "weekly";
|
||||
type = types.str;
|
||||
description = lib.mdDoc ''
|
||||
Specification (in the format described by
|
||||
{manpage}`systemd.time(7)`) of the time at
|
||||
which the prune will occur.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
default = config.virtualisation.docker.package;
|
||||
defaultText = literalExpression "config.virtualisation.docker.package";
|
||||
example = literalExpression "pkgs.docker";
|
||||
description = lib.mdDoc "Docker package to use for clearing up docker cache.";
|
||||
};
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
warnings = (mapAttrsToList
|
||||
|
|
@ -497,6 +534,22 @@ in
|
|||
KillMode = "process";
|
||||
};
|
||||
};
|
||||
# Enable periodic clear-docker-cache script
|
||||
systemd.services.gitlab-runner-clear-docker-cache = {
|
||||
description = "Prune gitlab-runner docker resources";
|
||||
restartIfChanged = false;
|
||||
unitConfig.X-StopOnRemoval = false;
|
||||
|
||||
serviceConfig.Type = "oneshot";
|
||||
|
||||
path = [ cfg.clear-docker-cache.package pkgs.gawk ];
|
||||
|
||||
script = ''
|
||||
${pkgs.gitlab-runner}/bin/clear-docker-cache ${toString cfg.clear-docker-cache.flags}
|
||||
'';
|
||||
|
||||
startAt = optional cfg.clear-docker-cache.enable cfg.clear-docker-cache.dates;
|
||||
};
|
||||
# Enable docker if `docker` executor is used in any service
|
||||
virtualisation.docker.enable = mkIf (
|
||||
any (s: s.executor == "docker") (attrValues cfg.services)
|
||||
|
|
|
|||
|
|
@ -68,6 +68,9 @@ import ./make-test-python.nix (
|
|||
package = pkgs.writeShellScriptBin "restic" ''
|
||||
echo "$@" >> /tmp/fake-restic.log;
|
||||
'';
|
||||
|
||||
pruneOpts = [ "--keep-last 1" ];
|
||||
checkOpts = [ "--some-check-option" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -98,6 +101,7 @@ import ./make-test-python.nix (
|
|||
'${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
|
||||
"systemctl start restic-backups-custompackage.service",
|
||||
"grep 'backup .* /opt' /tmp/fake-restic.log",
|
||||
"grep 'check .* --some-check-option' /tmp/fake-restic.log",
|
||||
"timedatectl set-time '2017-12-13 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /opt/backupCleanupCommand",
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "http://bach.dynet.com/crip/";
|
||||
description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files";
|
||||
license = lib.licenses.gpl1;
|
||||
license = lib.licenses.gpl1Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ maintainers.endgame ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.59";
|
||||
version = "1.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TQJCkvPV6vbhURLcuH41i8obHnfHkrCTJG0+IuSVDos=";
|
||||
sha256 = "sha256-6/9NaQSRNGnuIivIeWi/dOBSOzxhZYghy7zvdB5i500=";
|
||||
};
|
||||
|
||||
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Gameboy sound player";
|
||||
license = licenses.gpl1;
|
||||
license = licenses.gpl1Plus;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
85
pkgs/applications/audio/parlatype/default.nix
Normal file
85
pkgs/applications/audio/parlatype/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, appstream-glib
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gsettings-desktop-schemas
|
||||
, gst_all_1
|
||||
, gtk3
|
||||
, hicolor-icon-theme
|
||||
, isocodes
|
||||
, itstool
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parlatype";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gkarsay";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
gettext
|
||||
gobject-introspection
|
||||
itstool
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gstreamer
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
isocodes
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs data/meson_post_install.py
|
||||
patchShebangs libparlatype/tests/data/generate_config_data
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNOME audio player for transcription";
|
||||
longDescription = ''
|
||||
Parlatype is a minimal audio player for manual speech transcription,
|
||||
written for the GNOME desktop environment. It plays audio sources to
|
||||
transcribe them in your favourite text application. It’s intended to be
|
||||
useful for journalists, students, scientists and whoever needs to
|
||||
transcribe audio files.
|
||||
'';
|
||||
homepage = "https://www.parlatype.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ alexshpilkin melchips ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system";
|
||||
homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en";
|
||||
license = lib.licenses.gpl1;
|
||||
license = lib.licenses.gpl1Only;
|
||||
maintainers = [ lib.maintainers.magnetophon ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
, sqlite
|
||||
, virtualpg
|
||||
, wxGTK
|
||||
, wxmac
|
||||
, xz
|
||||
, zstd
|
||||
, Carbon
|
||||
|
|
@ -57,10 +56,10 @@ stdenv.mkDerivation rec {
|
|||
proj
|
||||
sqlite
|
||||
virtualpg
|
||||
wxGTK
|
||||
xz
|
||||
zstd
|
||||
] ++ lib.optional stdenv.isLinux wxGTK
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
|
||||
|
||||
let
|
||||
humioCtlVersion = "0.30.1";
|
||||
sha256 = "sha256-w+mZi3KdBnBRII/Mi+1SN/u4dhz2vfqn3nzU6AKk4yM=";
|
||||
humioCtlVersion = "0.30.2";
|
||||
sha256 = "sha256-FqBS6PoEKMqK590f58re4ycYmrJScyij74Ngj+PLzLs=";
|
||||
vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0=";
|
||||
in buildGoModule {
|
||||
name = "humioctl-${humioCtlVersion}";
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bemenu";
|
||||
version = "0.6.12";
|
||||
version = "0.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-u8DQn1WIQjt1Be3WMAUNr/4qQm4vLGaj5RY49sQVpFI=";
|
||||
sha256 = "sha256-YGaAJOyVZBHEWQuZVfPIIbtuntv1klQk9GcWRN+oVF4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config pcre ];
|
||||
|
|
|
|||
|
|
@ -124,11 +124,11 @@ stdenv.mkDerivation rec {
|
|||
pycryptodome
|
||||
# the following are distributed with calibre, but we use upstream instead
|
||||
odfpy
|
||||
] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqtwebengine.meta.platforms) [
|
||||
] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [
|
||||
# much of calibre's functionality is usable without a web
|
||||
# browser, so we enable building on platforms which qtwebengine
|
||||
# does not support by simply omitting qtwebengine.
|
||||
pyqtwebengine
|
||||
pyqt6-webengine
|
||||
] ++ lib.optional (unrarSupport) unrardll
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "chrysalis";
|
||||
version = "0.11.5";
|
||||
version = "0.11.8";
|
||||
in appimageTools.wrapAppImage rec {
|
||||
name = "${pname}-${version}-binary";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec {
|
|||
inherit name;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-3GdObGW91nDqOAlHcaI/4wnbl2EG2RGGzpwY+XYQ0u4=";
|
||||
sha256 = "sha256-yyb6sRCPjHCK0tkuHTffw2NkZHcqw9tIdHbbBiKLGu8=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "devilspie2";
|
||||
version = "0.43";
|
||||
version = "0.44";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz";
|
||||
sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc";
|
||||
url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2-${version}.tar.xz";
|
||||
sha256 = "Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool pkg-config ];
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
positioned at a specific screen position, or position a window
|
||||
on a specific workspace.
|
||||
'';
|
||||
homepage = "https://www.gusnan.se/devilspie2/";
|
||||
homepage = "https://www.nongnu.org/devilspie2/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.ebzzry ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "free42";
|
||||
version = "3.0.14";
|
||||
version = "3.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasokken";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Jx+MLItr+rIGfzJdQku1pRXaIldfrpG3vfOhjebSIZA=";
|
||||
hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Synchronize folders, files and make backups";
|
||||
homepage = "http://www.opbyte.it/grsync/";
|
||||
license = licenses.gpl1;
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.kuznero ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gum";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-T8dIk99qUMyeZvfM+rLA13HAmITQ8SMsQ9uIXtMM+MM=";
|
||||
sha256 = "sha256-6x1t/PLs1dqlY5XQ1F0PDqZ/TofZ0h1hTc0C1sjn3fA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sht9e4pam4aJCylUZPeVGwk9TYttumJSniNVxI0LfNM=";
|
||||
vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thedesk";
|
||||
version = "22.3.1";
|
||||
version = "23.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY=";
|
||||
sha256 = "sha256-DyaJggucFOxkrpaJSmg5fTrK8O3HA0Byd5pHwcgPSIM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wofi";
|
||||
version = "1.2.4";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://hg.sr.ht/~scoopta/wofi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c";
|
||||
sha256 = "sha256-GxMjEXBPQniD+Yc9QZjd8TH4ILJAX5dNzrjxDawhy8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "106.0.5249.103",
|
||||
"sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2",
|
||||
"sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x",
|
||||
"version": "106.0.5249.119",
|
||||
"sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g",
|
||||
"sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-11",
|
||||
|
|
@ -45,9 +45,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "106.0.5249.103",
|
||||
"sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2",
|
||||
"sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x",
|
||||
"version": "106.0.5249.119",
|
||||
"sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g",
|
||||
"sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-11",
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
"sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "106.0.5249.103-1",
|
||||
"sha256": "00acfq9hsdjqqlxddr9lr45l4372mpqxj717qpf78z8iyrccjm23"
|
||||
"rev": "106.0.5249.119-1",
|
||||
"sha256": "0mgyakq0g3v24b1qn76zblhjf9zzbiv1fq95w7w42nv3fvxfrxr2"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,7 +75,8 @@ buildPythonApplication {
|
|||
nativeBuildInputs = [
|
||||
wrapQtAppsHook wrapGAppsHook asciidoc
|
||||
docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
|
||||
];
|
||||
]
|
||||
++ lib.optional isQt6 python3Packages.pygments;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; ([
|
||||
pyyaml backendPackage jinja2 pygments
|
||||
|
|
@ -97,6 +98,12 @@ buildPythonApplication {
|
|||
dontWrapGApps = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preConfigure = ''
|
||||
a2x -f manpage doc/qutebrowser.1.asciidoc
|
||||
'' + lib.optionalString isQt6 ''
|
||||
python scripts/asciidoc2html.py
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
|
||||
|
||||
|
|
@ -105,10 +112,6 @@ buildPythonApplication {
|
|||
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
a2x -f manpage doc/qutebrowser.1.asciidoc
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
|
||||
install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \
|
||||
|
|
@ -116,15 +119,15 @@ buildPythonApplication {
|
|||
|
||||
# Install icons
|
||||
for i in 16 24 32 48 64 128 256 512; do
|
||||
install -Dm644 "qutebrowser/icons/qutebrowser-''${i}x''${i}.png" \
|
||||
install -Dm644 "${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser-''${i}x''${i}.png" \
|
||||
"$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png"
|
||||
done
|
||||
install -Dm644 ${if isQt6 then "qutebrowser/" else ""}icons/qutebrowser.svg \
|
||||
install -Dm644 ${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser.svg \
|
||||
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
|
||||
|
||||
# Install scripts
|
||||
sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh
|
||||
${if isQt6 then "rm -rf scripts/{testbrowser,dev}" else ""}
|
||||
${lib.optionalString isQt6 "rm -rf scripts/{testbrowser,dev}"}
|
||||
install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f)
|
||||
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
|
||||
|
||||
|
|
|
|||
|
|
@ -506,13 +506,13 @@
|
|||
"version": "2.7.0"
|
||||
},
|
||||
"heroku": {
|
||||
"hash": "sha256-n6M7i7zompAGRoP9WxrcWdBHsK2RssfTgCKsvAE5XZM=",
|
||||
"hash": "sha256-V6jShbhVwsUTxj2tp2msIseZnckHgB7bBswqIRlrwjQ=",
|
||||
"owner": "heroku",
|
||||
"provider-source-address": "registry.terraform.io/heroku/heroku",
|
||||
"repo": "terraform-provider-heroku",
|
||||
"rev": "v5.1.4",
|
||||
"rev": "v5.1.5",
|
||||
"vendorHash": null,
|
||||
"version": "5.1.4"
|
||||
"version": "5.1.5"
|
||||
},
|
||||
"hetznerdns": {
|
||||
"hash": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=",
|
||||
|
|
@ -669,13 +669,13 @@
|
|||
"version": "0.7.0"
|
||||
},
|
||||
"linode": {
|
||||
"hash": "sha256-gysdJOGUmhwFoRpR0Yp2p/Vjb69k+fDzcWatOgA+/AQ=",
|
||||
"hash": "sha256-FtJYpHmXkXBIcxlrUN9hOid3x4wMSk5NI2CFzmwniu4=",
|
||||
"owner": "linode",
|
||||
"provider-source-address": "registry.terraform.io/linode/linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v1.29.2",
|
||||
"vendorHash": "sha256-Sp/e3QVdUeQGflDGYLSMPGqxcMWoIY8Q9nZUteFIryo=",
|
||||
"version": "1.29.2"
|
||||
"rev": "v1.29.3",
|
||||
"vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=",
|
||||
"version": "1.29.3"
|
||||
},
|
||||
"linuxbox": {
|
||||
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
|
||||
|
|
@ -904,13 +904,13 @@
|
|||
"version": "0.22.0"
|
||||
},
|
||||
"pagerduty": {
|
||||
"hash": "sha256-Kdm6WizssVdMwsTUyV4wUAW6QelUxDE9GZDGvnehFCw=",
|
||||
"hash": "sha256-S55TSm3aFe9ACo+ysNRnyQ/U55C2KoZroQEHVBXsSPI=",
|
||||
"owner": "PagerDuty",
|
||||
"provider-source-address": "registry.terraform.io/PagerDuty/pagerduty",
|
||||
"repo": "terraform-provider-pagerduty",
|
||||
"rev": "v2.6.2",
|
||||
"rev": "v2.6.3",
|
||||
"vendorHash": null,
|
||||
"version": "2.6.2"
|
||||
"version": "2.6.3"
|
||||
},
|
||||
"panos": {
|
||||
"hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=",
|
||||
|
|
@ -1138,13 +1138,13 @@
|
|||
"version": "1.0.0"
|
||||
},
|
||||
"time": {
|
||||
"hash": "sha256-r1AzzO1fxmDZkxWKg+LUiYU19oAg8TthIJA7c0tktZE=",
|
||||
"hash": "sha256-tDYrKU/kggrv/p8QZ0LbHjQSOaNrQ0qy9ekY7DAXqEA=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/time",
|
||||
"repo": "terraform-provider-time",
|
||||
"rev": "v0.8.0",
|
||||
"vendorHash": "sha256-67V+lG6mkLuzoJnd8OoH73/XBnkgqDmv6aqpSSsHSqg=",
|
||||
"version": "0.8.0"
|
||||
"rev": "v0.9.0",
|
||||
"vendorHash": "sha256-I4CnaSyn32S7FM56dYWZhzGUKByP2DXD0t/eBOL2ALs=",
|
||||
"version": "0.9.0"
|
||||
},
|
||||
"tls": {
|
||||
"hash": "sha256-q3zt+5zd/bJ42sWbFwuE+rDyHHcZoVBZF4c61aJJkMs=",
|
||||
|
|
@ -1175,22 +1175,22 @@
|
|||
"version": "1.9.1"
|
||||
},
|
||||
"ucloud": {
|
||||
"hash": "sha256-+qbDbss4HSy0hCWiqMBgshvP8WZujJGzy6omXIkypNo=",
|
||||
"hash": "sha256-O/M864JY7nW+PZ53z26QvOAar5DeqBGk+dfzarfUy+g=",
|
||||
"owner": "ucloud",
|
||||
"provider-source-address": "registry.terraform.io/ucloud/ucloud",
|
||||
"repo": "terraform-provider-ucloud",
|
||||
"rev": "v1.32.3",
|
||||
"rev": "v1.32.4",
|
||||
"vendorHash": null,
|
||||
"version": "1.32.3"
|
||||
"version": "1.32.4"
|
||||
},
|
||||
"utils": {
|
||||
"hash": "sha256-Mh1yj1VZ620xSs1a5j86K4uCUyjzdeCphKLANQvgTNA=",
|
||||
"hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=",
|
||||
"owner": "cloudposse",
|
||||
"provider-source-address": "registry.terraform.io/cloudposse/utils",
|
||||
"repo": "terraform-provider-utils",
|
||||
"rev": "1.4.1",
|
||||
"vendorHash": "sha256-00kcosPSk/Ll7UQhnrEGRo0USvFM2V5MLKnndfhQEQA=",
|
||||
"version": "1.4.1"
|
||||
"rev": "1.5.0",
|
||||
"vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=",
|
||||
"version": "1.5.0"
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-v+WhEJ9HsTdOqSVpbV/qVCEICsgY3nEqcIutYHi3aQ8=",
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.177";
|
||||
version = "1.2.178";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hvMDQlWlAy7gRiSJMt2qAtBpYEbfhGS/DZeQK5ueHYA=";
|
||||
hash = "sha256-gmUamDV7gH30grFkG6rqDEf73wxe+FqhPi1GkNOeKuk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4QVLxvprm27Bv/ZFgxTtqZcSAWak1e+G8s+heW1JZnA=";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
gcc12Stdenv.mkDerivation rec {
|
||||
pname = "freefilesync";
|
||||
version = "11.25";
|
||||
version = "11.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hkneptune";
|
||||
repo = "FreeFileSync";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JV9qwBiF9kl+wc9+7lUufQVu6uiMQ6vojntxduNJ8MI=";
|
||||
sha256 = "sha256-MKs9PfxKVxfDYYB8Dqop9dUd757ajjgvIdMtKJX5dNw=";
|
||||
};
|
||||
|
||||
# Patches from ROSA Linux
|
||||
|
|
@ -43,11 +43,6 @@ gcc12Stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace FreeFileSync/Source/ui/version_check.cpp \
|
||||
--replace "openBrowserForDownload();" "openBrowserForDownload(parent);"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
, libvpx
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
pname = "baresip";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "baresip";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qtdwFAJLsHqhYVmD1YRUw0NMqX+Vq5BHR5mMvZISnuY=";
|
||||
sha256 = "sha256-+hkV9s4ORm4Kqu9zBmxtFZJFG3gh70OOxpjix052bM0=";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "himalaya";
|
||||
version = "0.5.10";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soywod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CXchZbXX7NH2ZXeAoPph3qxxdcAdDVZLBmOMwxFu+Yo=";
|
||||
sha256 = "sha256-d+ERCUPUHx41HfBtjb6BjhGKzkUTGIb01BRWvAnLYwk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sSQX7DHDgh1eO1Dwn1f0m51Bl2ZG1daRtrnYvsvPOkg=";
|
||||
cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg=";
|
||||
|
||||
nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -15,6 +15,15 @@ nodePackages.n8n.override {
|
|||
pkgs.postgresql
|
||||
];
|
||||
|
||||
# Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64.
|
||||
# This can supposedly be fixed by building a custom copy of the module from source, but that's way
|
||||
# too much complexity for a setup no one would ever actually run.
|
||||
#
|
||||
# NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch.
|
||||
preRebuild = lib.optionalString stdenv.isAarch64 ''
|
||||
rm -rf node_modules/oracledb
|
||||
'';
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liferea";
|
||||
version = "1.13.9";
|
||||
version = "1.14-RC1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "IP3TSmnRekFebxeBh5JRegeSedx+y24e4X9muMAyhFk=";
|
||||
sha256 = "cBtS+Km2d1n5Yl0wrQkN3Pg6OxSzhG7oVu7ZJ5RQuRQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -43,13 +43,14 @@ stdenv.mkDerivation rec {
|
|||
postInstall = ''
|
||||
installShellCompletion --bash --name ${pname} contrib/completions/complete.bash
|
||||
installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh
|
||||
installShellCompletion --fish --name ${pname} contrib/completions/complete.fish
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A complete tool to interact with OneDrive on Linux";
|
||||
homepage = "https://github.com/abraunegg/onedrive";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ srgom peterhoeg ];
|
||||
maintainers = with maintainers; [ srgom peterhoeg bertof ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@
|
|||
|
||||
{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
|
||||
, customOCamlPackages ? null
|
||||
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses
|
||||
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12
|
||||
, ocamlPackages_4_14
|
||||
, ncurses
|
||||
, buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14
|
||||
, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
|
||||
, csdp ? null
|
||||
|
|
@ -68,11 +70,12 @@ let
|
|||
'' else "";
|
||||
ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages
|
||||
else with versions; switch coq-version [
|
||||
{ case = range "8.14" "8.14"; out = ocamlPackages_4_12; }
|
||||
{ case = range "8.16" "8.17"; out = ocamlPackages_4_14; }
|
||||
{ case = range "8.14" "8.15"; out = ocamlPackages_4_12; }
|
||||
{ case = range "8.11" "8.13"; out = ocamlPackages_4_10; }
|
||||
{ case = range "8.7" "8.10"; out = ocamlPackages_4_09; }
|
||||
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
|
||||
] ocamlPackages_4_12;
|
||||
] ocamlPackages_4_14;
|
||||
ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ]
|
||||
++ optional (coqAtLeast "8.14") dune_2;
|
||||
ocamlPropagatedBuildInputs = [ ]
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.cs.unm.edu/~mccune/mace4/";
|
||||
license = licenses.gpl1;
|
||||
license = licenses.gpl2Only;
|
||||
description = "Automated theorem prover for first-order and equational logic";
|
||||
longDescription = ''
|
||||
Prover9 is a resolution/paramodulation automated theorem prover
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "guake";
|
||||
version = "3.6.3";
|
||||
version = "3.9.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Guake";
|
||||
repo = "guake";
|
||||
rev = version;
|
||||
sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";
|
||||
};
|
||||
|
||||
# Strict deps breaks guake
|
||||
|
|
@ -51,16 +51,16 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dbus-python
|
||||
pbr
|
||||
pycairo
|
||||
pygobject3
|
||||
setuptools
|
||||
setuptools-scm
|
||||
pyyaml
|
||||
];
|
||||
|
||||
PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gerrit";
|
||||
version = "3.5.1";
|
||||
version = "3.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
|
||||
sha256 = "3fb5de878b6470dc8ef65ce22f2709cb8baecb5f16d89497dfaa33a0f33f7920";
|
||||
sha256 = "sha256-/OckQD6r9WSMx9Vt44eFpzsacH6VMa6NJX6sj2HBQSs=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-nomad";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rraval";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Synchronize work-in-progress git branches in a light weight fashion";
|
||||
homepage = "https://github.com/rraval/git-nomad";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rraval ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ let
|
|||
nameRepo = "lossless-cut";
|
||||
nameCamel = "LosslessCut";
|
||||
name = "${pname}-${version}";
|
||||
nameSource = "${nameCamel}-linux.AppImage";
|
||||
nameSource = "${nameCamel}-linux-x86_64.AppImage";
|
||||
nameExecutable = "losslesscut";
|
||||
owner = "mifi";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ callPackage, stdenvNoCC, lib }:
|
||||
let
|
||||
version = "3.43.0";
|
||||
appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; };
|
||||
dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; };
|
||||
windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; };
|
||||
version = "3.46.2";
|
||||
appimage = callPackage ./appimage.nix { inherit version; sha256 = "sha256-p+HscYsChR90JHdYjurY4OOHgveGXbJomz1klBCsF2Q="; };
|
||||
dmg = callPackage ./dmg.nix { inherit version; sha256 = "sha256-350MHWwyjCdvIv6W6lX6Hr6PLDiAwO/e+KW0yKi/Yoc="; };
|
||||
windows = callPackage ./windows.nix { inherit version; sha256 = "sha256-48ifhvIWSPmmnBnW8tP7NeWPIWJYWNqGP925O50CAwQ="; };
|
||||
in (
|
||||
if stdenvNoCC.isDarwin then dmg
|
||||
else if stdenvNoCC.isCygwin then windows
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ let
|
|||
pname = "losslesscut";
|
||||
nameRepo = "lossless-cut";
|
||||
nameCamel = "LosslessCut";
|
||||
nameSource = "${nameCamel}-mac.dmg";
|
||||
nameSource = "${nameCamel}-mac-x64.dmg";
|
||||
nameApp = nameCamel + ".app";
|
||||
owner = "mifi";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, p7zip
|
||||
, version
|
||||
, sha256
|
||||
, useMklink ? false
|
||||
|
|
@ -11,8 +11,8 @@ let
|
|||
pname = "losslesscut";
|
||||
nameRepo = "lossless-cut";
|
||||
nameCamel = "LosslessCut";
|
||||
nameSourceBase = "${nameCamel}-win";
|
||||
nameSource = "${nameSourceBase}.zip";
|
||||
nameSourceBase = "${nameCamel}-win-x64";
|
||||
nameSource = "${nameSourceBase}.7z";
|
||||
nameExecutable = "${nameCamel}.exe";
|
||||
owner = "mifi";
|
||||
getSymlinkCommand = if (customSymlinkCommand != null) then customSymlinkCommand
|
||||
|
|
@ -27,10 +27,10 @@ in stdenvNoCC.mkDerivation {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
nativeBuildInputs = [ p7zip ];
|
||||
|
||||
unpackPhase = ''
|
||||
unzip $src -d ${nameSourceBase}
|
||||
7z x $src -o${nameSourceBase}
|
||||
'';
|
||||
|
||||
sourceRoot = nameSourceBase;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import sys
|
|||
|
||||
# openjdk15 is only for bootstrapping openjdk
|
||||
releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17")
|
||||
oses = ("mac", "linux")
|
||||
oses = ("mac", "linux", "alpine_linux")
|
||||
types = ("jre", "jdk")
|
||||
impls = ("hotspot", "openj9")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib }:
|
||||
{ stdenv, lib }:
|
||||
|
||||
let
|
||||
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.openj9; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.openj9; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib }:
|
||||
{ stdenv, lib }:
|
||||
|
||||
let
|
||||
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib }:
|
||||
{ stdenv, lib }:
|
||||
|
||||
let
|
||||
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib }:
|
||||
{ stdenv, lib }:
|
||||
|
||||
let
|
||||
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.openj9; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib }:
|
||||
{ stdenv, lib }:
|
||||
|
||||
let
|
||||
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.openj9; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ lib }:
|
||||
{ stdenv, lib }:
|
||||
|
||||
let
|
||||
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jre.hotspot; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jre.hotspot; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib }:
|
||||
{ stdenv, lib }:
|
||||
|
||||
let
|
||||
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.openj9; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.openj9; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,31 @@
|
|||
{
|
||||
"openjdk11": {
|
||||
"alpine_linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz",
|
||||
"version": "11.0.16"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz",
|
||||
"version": "11.0.16"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
|
|
@ -628,6 +654,32 @@
|
|||
}
|
||||
},
|
||||
"openjdk16": {
|
||||
"alpine_linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "7",
|
||||
"sha256": "85788b1a1f470ca7ddc576028f29abbc3bc3b08f82dd811a3e24371689d7dc0f",
|
||||
"url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz",
|
||||
"version": "16.0.2"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "9",
|
||||
"sha256": "5f10ffc12056b735f5fe505ec6c481fff94de27e80c1d77ea9f9e2830669cc1d",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_alpine-linux_hotspot_16.0.1_9.tar.gz",
|
||||
"version": "16.0.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
|
|
@ -794,6 +846,32 @@
|
|||
}
|
||||
},
|
||||
"openjdk17": {
|
||||
"alpine_linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz",
|
||||
"version": "17.0.4"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz",
|
||||
"version": "17.0.4"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
|
|
@ -896,6 +974,32 @@
|
|||
}
|
||||
},
|
||||
"openjdk8": {
|
||||
"alpine_linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz",
|
||||
"version": "8.0.345"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz",
|
||||
"version": "8.0.345"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ let
|
|||
"binnt"
|
||||
(lib.optionalString is32bit "binw")
|
||||
] else if (isDarwin && is64bit) then [
|
||||
"osx64"
|
||||
"bino64"
|
||||
] else [
|
||||
(lib.optionalString is64bit "binl64")
|
||||
"binl"
|
||||
|
|
|
|||
|
|
@ -51,6 +51,13 @@ let
|
|||
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
|
||||
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
|
||||
})
|
||||
|
||||
# Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
|
||||
# This is applied anywhere to prevent patchrot.
|
||||
(fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=6f97cb0ae4dff6588dae5868c2522aea96c99d2c";
|
||||
sha256 = "sha256-giOmMInwLH0Ei9H7ETsrrzQU09I6+dn8KpPrKb7zn8I=";
|
||||
})
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
./swing-use-gtk-jdk13.patch
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import requests
|
|||
import sys
|
||||
|
||||
feature_versions = (8, 11, 16, 17)
|
||||
oses = ("mac", "linux")
|
||||
oses = ("mac", "linux", "alpine-linux")
|
||||
types = ("jre", "jdk")
|
||||
impls = ("hotspot")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, callPackage }:
|
||||
{ stdenv, lib, callPackage }:
|
||||
|
||||
let
|
||||
sources = (lib.importJSON ./sources.json).hotspot.linux;
|
||||
variant = if stdenv.hostPlatform.isMusl then "alpine-linux" else "linux";
|
||||
sources = (lib.importJSON ./sources.json).hotspot.${variant};
|
||||
common = opts: callPackage (import ./jdk-linux-base.nix opts) {};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,81 @@
|
|||
{
|
||||
"hotspot": {
|
||||
"alpine-linux": {
|
||||
"jdk": {
|
||||
"openjdk11": {
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz",
|
||||
"version": "11.0.16"
|
||||
}
|
||||
},
|
||||
"openjdk16": {
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "7",
|
||||
"sha256": "85788b1a1f470ca7ddc576028f29abbc3bc3b08f82dd811a3e24371689d7dc0f",
|
||||
"url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz",
|
||||
"version": "16.0.2"
|
||||
}
|
||||
},
|
||||
"openjdk17": {
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz",
|
||||
"version": "17.0.4"
|
||||
}
|
||||
},
|
||||
"openjdk8": {
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz",
|
||||
"version": "8.0.345"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"openjdk11": {
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz",
|
||||
"version": "11.0.16"
|
||||
}
|
||||
},
|
||||
"openjdk17": {
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz",
|
||||
"version": "17.0.4"
|
||||
}
|
||||
},
|
||||
"openjdk8": {
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz",
|
||||
"version": "8.0.345"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"linux": {
|
||||
"jdk": {
|
||||
"openjdk11": {
|
||||
|
|
|
|||
|
|
@ -53,6 +53,8 @@ in mkCoqDerivation {
|
|||
release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
buildFlags = [ "OCAMLWARN=" ];
|
||||
|
||||
mlPlugin = true;
|
||||
propagatedBuildInputs = [ elpi ];
|
||||
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ in
|
|||
rec {
|
||||
lua5_4 = callPackage ./interpreter.nix {
|
||||
self = lua5_4;
|
||||
sourceVersion = { major = "5"; minor = "4"; patch = "3"; };
|
||||
hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq";
|
||||
sourceVersion = { major = "5"; minor = "4"; patch = "4"; };
|
||||
hash = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E=";
|
||||
makeWrapper = makeBinaryWrapper;
|
||||
inherit passthruFun;
|
||||
|
||||
|
|
|
|||
|
|
@ -342,11 +342,7 @@ def _update_package(path, target):
|
|||
text = _replace_value('version', new_version, text)
|
||||
# hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts
|
||||
# sri hashes have been the default format since nix 2.4+
|
||||
try:
|
||||
sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
|
||||
except subprocess.CalledProcessError:
|
||||
# nix<2.4 compat
|
||||
sri_hash = subprocess.check_output(["nix", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
|
||||
sri_hash = subprocess.check_output(["nix", "--extra-experimental-features", "nix-command", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
|
||||
|
||||
|
||||
# fetchers can specify a sha256, or a sri hash
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities";
|
||||
homepage = "http://www.videolan.org/developers/libdvbcsa.html";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.gpl1;
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ melias122 ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgtkflow";
|
||||
version = "0.10.0";
|
||||
pname = "libgflow";
|
||||
version = "1.0.4";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "notabug.org";
|
||||
owner = "grindhold";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-iTOoga94yjGTowQOM/EvHEDOO9Z3UutPGRgEoI1UWkI=";
|
||||
repo = "libgtkflow";
|
||||
rev = "gflow_${version}";
|
||||
hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -25,8 +28,15 @@ stdenv.mkDerivation rec {
|
|||
glib
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable_valadoc=true"
|
||||
"-Denable_gtk3=false"
|
||||
"-Denable_gtk4=false"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
54
pkgs/development/libraries/libgtkflow3/default.nix
Normal file
54
pkgs/development/libraries/libgtkflow3/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3, libgflow}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgtkflow3";
|
||||
version = "1.0.6";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "notabug.org";
|
||||
owner = "grindhold";
|
||||
repo = "libgtkflow";
|
||||
rev = "gtkflow3_${version}";
|
||||
hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
glib
|
||||
libgflow
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable_valadoc=true"
|
||||
"-Denable_gtk4=false"
|
||||
"-Denable_gflow=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r libgflow
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flow graph widget for GTK 3";
|
||||
homepage = "https://notabug.org/grindhold/libgtkflow";
|
||||
maintainers = with maintainers; [ grindhold ];
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
54
pkgs/development/libraries/libgtkflow4/default.nix
Normal file
54
pkgs/development/libraries/libgtkflow4/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk4, libgflow}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgtkflow4";
|
||||
version = "0.2.6";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "notabug.org";
|
||||
owner = "grindhold";
|
||||
repo = "libgtkflow";
|
||||
rev = "gtkflow4_${version}";
|
||||
hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
glib
|
||||
libgflow
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable_valadoc=true"
|
||||
"-Denable_gtk3=false"
|
||||
"-Denable_gflow=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r libgflow
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flow graph widget for GTK 3";
|
||||
homepage = "https://notabug.org/grindhold/libgtkflow";
|
||||
maintainers = with maintainers; [ grindhold ];
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
|
||||
, enableUdev ? stdenv.isLinux && !stdenv.targetPlatform.isStatic
|
||||
, udev
|
||||
, libobjc
|
||||
, IOKit
|
||||
|
|
|
|||
|
|
@ -2,22 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvidia-texture-tools";
|
||||
version = "unstable-2019-10-27";
|
||||
version = "unstable-2020-12-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "castano";
|
||||
repo = "nvidia-texture-tools";
|
||||
rev = "a131e4c6b0b7c9c73ccc3c9e6f1c7e165be86bcc";
|
||||
sha256 = "1qzyr3ib5dpxyq1y33lq02qv4cww075sm9bm4f651d34q5x38sk3";
|
||||
rev = "aeddd65f81d36d8cb7b169b469ef25156666077e";
|
||||
sha256 = "sha256-BYNm8CxPQbfmnnzNmOQ2Dc8HSyO8mkqzYsBZ5T80398=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/castano/nvidia-texture-tools/commit/6474f2593428d89ec152da2502aa136ababe66ca.patch";
|
||||
sha256 = "0akbkvm55hiv58jx71h9hj173rbnqlb5a430y9azjiix7zga42vd";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
|
@ -26,6 +19,10 @@ stdenv.mkDerivation rec {
|
|||
# Make a recently added pure virtual function just virtual,
|
||||
# to keep compatibility.
|
||||
sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h
|
||||
'' + lib.optionalString stdenv.isAarch64 ''
|
||||
# remove x86_64-only libraries
|
||||
sed -i '/bc1enc/d' src/nvtt/tests/CMakeLists.txt
|
||||
sed -i '/libsquish/d;/CMP_Core/d' extern/CMakeLists.txt
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -42,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/castano/nvidia-texture-tools";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isAarch64;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,91 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gfortran
|
||||
, fftwSinglePrec
|
||||
, doxygen
|
||||
, swig
|
||||
, python3Packages, enablePython ? false
|
||||
, opencl-headers, ocl-icd, enableOpencl ? false
|
||||
, clang, enableClang ? true
|
||||
, cudatoolkit, enableCuda ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openmm";
|
||||
version = "7.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openmm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2PYUGTMVQ5qVDeeABrwR45U3JIgo2xMXKlD6da7y3Dw=";
|
||||
};
|
||||
|
||||
# "This test is stochastic and may occassionally fail". It does.
|
||||
postPatch = ''
|
||||
rm \
|
||||
platforms/*/tests/Test*BrownianIntegrator.* \
|
||||
platforms/*/tests/Test*LangevinIntegrator.* \
|
||||
serialization/tests/TestSerializeIntegrator.cpp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake gfortran swig doxygen python3Packages.python ];
|
||||
|
||||
buildInputs = [ fftwSinglePrec ]
|
||||
++ lib.optionals enableOpencl [ ocl-icd opencl-headers ]
|
||||
++ lib.optional enableCuda cudatoolkit;
|
||||
|
||||
propagatedBuildInputs = lib.optionals enablePython (with python3Packages; [
|
||||
python
|
||||
numpy
|
||||
cython
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTING=ON"
|
||||
"-DOPENMM_BUILD_AMOEBA_PLUGIN=ON"
|
||||
"-DOPENMM_BUILD_CPU_LIB=ON"
|
||||
"-DOPENMM_BUILD_C_AND_FORTRAN_WRAPPERS=ON"
|
||||
"-DOPENMM_BUILD_DRUDE_PLUGIN=ON"
|
||||
"-DOPENMM_BUILD_PME_PLUGIN=ON"
|
||||
"-DOPENMM_BUILD_RPMD_PLUGIN=ON"
|
||||
"-DOPENMM_BUILD_SHARED_LIB=ON"
|
||||
] ++ lib.optionals enablePython [
|
||||
"-DOPENMM_BUILD_PYTHON_WRAPPERS=ON"
|
||||
] ++ lib.optionals enableClang [
|
||||
"-DCMAKE_C_COMPILER=${clang}/bin/clang"
|
||||
"-DCMAKE_CXX_COMPILER=${clang}/bin/clang++"
|
||||
] ++ lib.optionals enableOpencl [
|
||||
"-DOPENMM_BUILD_OPENCL_LIB=ON"
|
||||
"-DOPENMM_BUILD_AMOEBA_OPENCL_LIB=ON"
|
||||
"-DOPENMM_BUILD_DRUDE_OPENCL_LIB=ON"
|
||||
"-DOPENMM_BUILD_RPMD_OPENCL_LIB=ON"
|
||||
] ++ lib.optionals enableCuda [
|
||||
"-DCUDA_SDK_ROOT_DIR=${cudatoolkit}"
|
||||
"-DOPENMM_BUILD_AMOEBA_CUDA_LIB=ON"
|
||||
"-DOPENMM_BUILD_CUDA_LIB=ON"
|
||||
"-DOPENMM_BUILD_DRUDE_CUDA_LIB=ON"
|
||||
"-DOPENMM_BUILD_RPMD_CUDA_LIB=ON"
|
||||
"-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib64/stubs"
|
||||
];
|
||||
|
||||
postInstall = lib.strings.optionalString enablePython ''
|
||||
export OPENMM_LIB_PATH=$out/lib
|
||||
export OPENMM_INCLUDE_PATH=$out/include
|
||||
cd python
|
||||
${python3Packages.python.interpreter} setup.py build
|
||||
${python3Packages.python.interpreter} setup.py install --prefix=$out
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Toolkit for molecular simulation using high performance GPU code";
|
||||
homepage = "https://openmm.org/";
|
||||
license = with licenses; [ gpl3Plus lgpl3Plus mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
50
pkgs/development/libraries/ucc/default.nix
Normal file
50
pkgs/development/libraries/ucc/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx
|
||||
, enableCuda ? false
|
||||
, cudatoolkit
|
||||
, enableAvx ? stdenv.hostPlatform.avxSupport
|
||||
, enableSse41 ? stdenv.hostPlatform.sse4_1Support
|
||||
, enableSse42 ? stdenv.hostPlatform.sse4_2Support
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ucc";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openucx";
|
||||
repo = "ucc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5rf08SXy+vCfnz4zLJ0cMnxwso4WpZOt0jRRAUviVFU=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
for comp in $(find src/components -name Makefile.am); do
|
||||
substituteInPlace $comp \
|
||||
--replace "/bin/bash" "${stdenv.shell}"
|
||||
done
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ libtool automake autoconf ];
|
||||
buildInputs = [ ucx ]
|
||||
++ lib.optional enableCuda cudatoolkit;
|
||||
|
||||
configureFlags = [ ]
|
||||
++ lib.optional enableSse41 "--with-sse41"
|
||||
++ lib.optional enableSse42 "--with-sse42"
|
||||
++ lib.optional enableAvx "--with-avx"
|
||||
++ lib.optional enableCuda "--with-cuda=${cudatoolkit}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collective communication operations API";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.markuskowa ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -17,6 +17,7 @@
|
|||
, compat28 ? false
|
||||
, compat30 ? true
|
||||
, unicode ? true
|
||||
, withEGL ? true
|
||||
, withGtk2 ? (!stdenv.isDarwin)
|
||||
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, withWebKit ? stdenv.isDarwin
|
||||
|
|
@ -95,6 +96,7 @@ stdenv.mkDerivation rec {
|
|||
(if compat28 then "--enable-compat28" else "--disable-compat28")
|
||||
(if compat30 then "--enable-compat30" else "--disable-compat30")
|
||||
]
|
||||
++ lib.optional (!withEGL) "--disable-glcanvasegl"
|
||||
++ lib.optional unicode "--enable-unicode"
|
||||
++ lib.optional withMesa "--with-opengl"
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
6
pkgs/development/node-packages/node-packages.nix
generated
6
pkgs/development/node-packages/node-packages.nix
generated
|
|
@ -126979,10 +126979,10 @@ in
|
|||
pnpm = nodeEnv.buildNodePackage {
|
||||
name = "pnpm";
|
||||
packageName = "pnpm";
|
||||
version = "7.13.2";
|
||||
version = "7.13.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/pnpm/-/pnpm-7.13.2.tgz";
|
||||
sha512 = "lOQRBcCWycLK1PB9KptqTd6iyiH7m4GRuS4G2j4b74yDx/XvRXtP/weYz8e0/ia7HX1pMF1vJCF48ssklq0TJQ==";
|
||||
url = "https://registry.npmjs.org/pnpm/-/pnpm-7.13.3.tgz";
|
||||
sha512 = "6avqSfzfAr/9w1ZleaMI276ZuZUu88eOIe6v2mTCuwtSjUEqheboH1G4m7jgF+4arMUfnBrz371UAU+DCeCiSA==";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,32 +1,22 @@
|
|||
{ lib, fetchFromGitLab, buildDunePackage, ocaml, zarith, alcotest }:
|
||||
{ lib, buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ff";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "dannywillems";
|
||||
repo = "ocaml-ff";
|
||||
rev = version;
|
||||
sha256 = "1ik29srzkd0pl48p1si9p1c4f8vmx5rgm02yv2arj3vg0a1nfhdv";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
inherit (ff-sig) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ff-sig
|
||||
zarith
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
ff-pbt
|
||||
];
|
||||
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/dannywillems/ocaml-ff";
|
||||
meta = ff-sig.meta // {
|
||||
description = "OCaml implementation of Finite Field operations";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, fetchFromGitLab, buildDunePackage, zarith, ff-sig, alcotest }:
|
||||
{ lib, buildDunePackage, zarith, ff-sig, alcotest }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "ff-pbt";
|
||||
inherit (ff-sig) version src doCheck useDune2;
|
||||
inherit (ff-sig) version src;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
|
|
@ -10,6 +10,8 @@ buildDunePackage {
|
|||
alcotest
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zarith
|
||||
ff-sig
|
||||
|
|
|
|||
|
|
@ -2,16 +2,14 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ff-sig";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
src = fetchFromGitLab {
|
||||
owner = "dannywillems";
|
||||
repo = "ocaml-ff";
|
||||
owner = "nomadic-labs";
|
||||
repo = "cryptography/ocaml-ff";
|
||||
rev = version;
|
||||
sha256 = "0p42ivyfbn1pwm18773y4ga9cm64ysha0rplzvrnhszg01anarc0";
|
||||
sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zarith
|
||||
];
|
||||
|
|
@ -19,7 +17,7 @@ buildDunePackage rec {
|
|||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/dannywillems/ocaml-ff";
|
||||
inherit (src.meta) homepage;
|
||||
description = "Minimal finite field signatures";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-core";
|
||||
version = "2.13.4";
|
||||
version = "2.13.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ePRcLEcq9gubS4y9q6WjkRB5CHiRqfbG7XJjJ7jyHGo=";
|
||||
sha256 = "sha256-JtzZIY1VRMwVFE9gu1tjTyJ25HbIn0gbP2GcT53vFYg=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, pytestCheckHook
|
||||
, pyvo
|
||||
, astropy-helpers
|
||||
, setuptools
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
|
|
@ -37,7 +38,7 @@ buildPythonPackage rec {
|
|||
pyvo
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ astropy-helpers ];
|
||||
nativeBuildInputs = [ astropy-helpers setuptools ];
|
||||
|
||||
# Disable automatic update of the astropy-helper module
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-authorization";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "0776edc4980be940a8602eefc0372b4d1a1fa26caa46e3c0234e0c7a0feda4ec";
|
||||
sha256 = "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-storage-file-share";
|
||||
version = "12.9.0";
|
||||
version = "12.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-faowRP4H1/dQTLmhX5mhessoyAjtgzQWeL8t+TFfXCI=";
|
||||
hash = "sha256-ANp31hkDL4TGoeP6Or9fI0LjYGyVMQJfuzd8RLrYZxI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
51
pkgs/development/python-modules/bcrypt/3.nix
Normal file
51
pkgs/development/python-modules/bcrypt/3.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, setuptools
|
||||
, isPyPy
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cffi
|
||||
, pytestCheckHook
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bcrypt";
|
||||
version = "3.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QzxBDCF3BXcF2iqfLNAd0VdJOyp6wUyFk6FrPatra/s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
cffi
|
||||
];
|
||||
|
||||
propagatedNativeBuildInputs = [
|
||||
cffi
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bcrypt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern password hashing for your software and your servers";
|
||||
homepage = "https://github.com/pyca/bcrypt/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,17 +7,21 @@
|
|||
, deepmerge
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blebox-uniapi";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blebox";
|
||||
repo = "blebox_uniapi";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-mJaUB4kEm+eRh3Kc+SiTCSSmCmBEJBVZ5uah95MJX64=";
|
||||
hash = "sha256-F0zvfqbcQCgpr9//TfhUHVT5KofFSyzRKWkLw4I4gxk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -37,7 +41,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "blebox_uniapi" ];
|
||||
pythonImportsCheck = [
|
||||
"blebox_uniapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for accessing BleBox smart home devices";
|
||||
|
|
|
|||
|
|
@ -8,15 +8,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "click-option-group";
|
||||
version = "0.5.3";
|
||||
version = "0.5.5";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "click-contrib";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1w0692s8fabncpggpwl2d4dfqjjlmcia271rrb8hcz0r6nvw98ak";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-ur7ycioZmgWMp4N+MURj1ggYMzs2eauteg1B5eLkSvc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gaphas";
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-szES3oLJayboCAMCGKtQqclOcbpYtEn3rg95OPtOZpU=";
|
||||
sha256 = "sha256-mT9o/qV+SkJHV1MDwu/bK5HAiHM5YEv354R0HiMgTb8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ buildPythonPackage {
|
|||
meta = with lib; {
|
||||
description = "Work with Evernote from command line";
|
||||
homepage = "http://www.geeknote.me";
|
||||
license = licenses.gpl1;
|
||||
license = licenses.gpl1Only;
|
||||
maintainers = with maintainers; [ hbunke ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2022.10.4";
|
||||
version = "2022.10.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-/cJL0DFBook1PjmLTW5H4/sUpwcfoRHvyH8mdAczS4o=";
|
||||
sha256 = "sha256-E4sKIfrdEqdUqbXciIBAfIOuT/jpkS509P3+lVE3p1M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Implementation of HopcroftKarp's algorithm";
|
||||
homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp";
|
||||
license = licenses.gpl1;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apache-libcloud";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-SjuRQQM3mOT7B4hv8mJU5jXgIqy91wg3XqxvVuMjUGw=";
|
||||
sha256 = "sha256-D6zzIGVoQwyZjaQOm7rG06DE/IDdUWdNnnlLOBRQEgw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "losant-rest";
|
||||
version = "1.16.5";
|
||||
version = "1.16.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Losant";
|
||||
repo = "losant-rest-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dwlLoRRY1Fx1VBOGIJr//zFPf0WpOabS3HuCxHsn4HI=";
|
||||
sha256 = "sha256-x8a2W64zLDi8r7d8B7GYCwWtSAB3BH+Sprbw+Xr7mH4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -63,10 +63,12 @@ buildPythonPackage rec {
|
|||
"mypy"
|
||||
"mypy.api"
|
||||
"mypy.fastparse"
|
||||
"mypy.report"
|
||||
"mypy.types"
|
||||
"mypyc"
|
||||
"mypyc.analysis"
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isi686) [
|
||||
# ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import)
|
||||
"mypy.report"
|
||||
];
|
||||
|
||||
# Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python interface to MySQL";
|
||||
homepage = "https://github.com/PyMySQL/mysqlclient-python";
|
||||
license = licenses.gpl1;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ y0no ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "neo4j";
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "neo4j";
|
||||
repo = "neo4j-python-driver";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-R4+cShkG1c3PRiU92OPPEVsXR4zt0G/7ZJcYACtPvHs=";
|
||||
hash = "sha256-v/IJdgn3C1JgT0KJ9O7wn+5nexDbakzM/u8bAeEPjz0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "6.0.3";
|
||||
version = "7.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GaN/3WbuXc5p/+VhFngSX6aKnxMj72pyeB9HaA+PbCo=";
|
||||
hash = "sha256-B6N9JLjbezYMO1119OR58cDhKY1ry7FKf+Q9wpHGiBE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.109";
|
||||
version = "2.1.110";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-G9HcDLVvRB+OXmcp2SYp2rSUsbOcKjrN8KdUMQP8DKo=";
|
||||
hash = "sha256-MYHUTxVc5lh1JnOw10trB6nBiIIExm9cxeHRyKwVzhU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
description = "Pulumi python amazon web services provider";
|
||||
homepage = "https://github.com/pulumi/pulumi-aws";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylitterbot";
|
||||
version = "2022.9.6";
|
||||
version = "2022.10.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "natekspencer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+8vsnSEEZ7uypASsJZ2MIK+riIF01Lxa1E3t0pC+e/I=";
|
||||
hash = "sha256-E7rBRPtXa/E6jf75zULuGaiu2DHvq4hZjcwPwj/w9ww=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,6 +28,13 @@ buildPythonPackage rec {
|
|||
substituteInPlace setup.py \
|
||||
--replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \
|
||||
'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]'
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
substituteInPlace src/cpp/skia-builder/skia/gn/skia/BUILD.gn \
|
||||
--replace "-march=armv7-a" "-march=armv8-a" \
|
||||
--replace "-mfpu=neon" "" \
|
||||
--replace "-mthumb" ""
|
||||
substituteInPlace src/cpp/skia-builder/skia/src/core/SkOpts.cpp \
|
||||
--replace "defined(SK_CPU_ARM64)" "0"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cython ninja setuptools-scm ]
|
||||
|
|
@ -46,6 +53,5 @@ buildPythonPackage rec {
|
|||
homepage = "https://skia.org/dev/present/pathops";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.BarinovMaxim ];
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64; # clang-11: error: the clang compiler does not support '-march=armv7-a'
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "2.4.5";
|
||||
version = "3.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-fsZBHJUX/DytSO680hiXhS6+jCKOKz1n+PxZa9kyWnc=";
|
||||
sha256 = "sha256-9S1ZhXHkLnDmYBAMwOIQt7AUj43+wtxXGpYx7oe4CGc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs";
|
||||
version = "1.2.4";
|
||||
version = "1.2.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jg2tsCkAAm7/NJ5wcwA/2E0GspM747WHwcXWnC0j1Q8=";
|
||||
sha256 = "sha256-E+Forcx6dRtDeagcjGGE8DFkAKUgsHyCEONW7WU0lpo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.2.35";
|
||||
version = "0.2.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bLeNCi9ghNuHcMjUV3JWmC7nQTUZA9lU3Rc0TO7AWto=";
|
||||
sha256 = "sha256-U+MdX/7RIrhnPjUjzYAQEVeHQUpgMtKanvjPLBjCNSY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ArdqEHECnGTMs3sJrPIAfmTT0D2V8SHyTYXmDODVtuo=";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitLab, fetchurl }:
|
||||
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
|
||||
|
||||
let
|
||||
version = "15.4.0";
|
||||
|
|
@ -14,6 +14,9 @@ buildGoModule rec {
|
|||
"-X ${commonPackagePath}.REVISION=v${version}"
|
||||
];
|
||||
|
||||
# For patchShebangs
|
||||
buildInputs = [ bash ];
|
||||
|
||||
vendorSha256 = "sha256-S0x1b2ITtqMoqdssoTgnolDC6Tyq3IdkJqxwZ29qCyU=";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
|
|
@ -45,6 +48,10 @@ buildGoModule rec {
|
|||
rm helpers/docker/auth/auth_test.go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install packaging/root/usr/share/gitlab-runner/clear-docker-cache $out/bin
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Make the tests pass outside of GitLab CI
|
||||
export CI=0
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.361.1";
|
||||
version = "2.361.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
sha256 = "1cvyj3arqzrvqd5m4plqvl6d4ra85n6kk2vzd9wqbxvhsm1jp9q8";
|
||||
hash = "sha256-QRp5x+DVCCdFBx4mEIE0aqTKJ/ZJ/rBBdW0dJ6mD2/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "faas-cli";
|
||||
version = "0.14.8";
|
||||
version = "0.14.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfaas";
|
||||
repo = "faas-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-sdvApbsVgs5+pd/gVdkWbBk4eWojbqYbXXIjdbJXwGs=";
|
||||
sha256 = "sha256-wXF9Ol92+JTfxXVuoXH3M8vaTrG+HeBTsvcIdqFfPG8=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue