Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/aiocron/default.nix
This commit is contained in:
Jonathan Ringer
commit
9dd8bffe92
|
|
@ -581,10 +581,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.7.0",
|
||||
"sha256": "07rqk60k87dff2wgg72ar7sdg99hd210k8afvvz9xh1arj63ixxi",
|
||||
"rev": "v2.7.1",
|
||||
"sha256": "061zxphysj6spr1giwfnqgy3hh8s4j0lw10gs3cjkqxbpc4bbs7a",
|
||||
"vendorSha256": null,
|
||||
"version": "2.7.0"
|
||||
"version": "2.7.1"
|
||||
},
|
||||
"launchdarkly": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ buildGoModule, lib, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "tfswitch";
|
||||
version = "0.12.1168";
|
||||
version = "0.13.1201";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warrensbox";
|
||||
repo = "terraform-switcher";
|
||||
rev = version;
|
||||
sha256 = "sha256-BKqbxja19JxAr9/Cy7LpbZTJrt/pYfwtCbZMY0wwvZc=";
|
||||
sha256 = "sha256-gJa8oVdgerDi0GdTSNus5rHLsFuzg8ZqVeKTMuPXu0o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-y8T1MV2xHr9n7XWmB4LikIzyGx+0XKhsxmatnCZFN9I=";
|
||||
vendorSha256 = "sha256-tp2Bv/vcHCuB/HCZLfL/zOm/UfPt6XXGE7johrjL3cs=";
|
||||
|
||||
# Disable tests since it requires network access and relies on the
|
||||
# presence of release.hashicorp.com
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkg-config, glib
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, pkg-config, glib
|
||||
, perl, ncurses5, hamlib, xmlrpc_c }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -12,6 +12,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for ncurses-6.3:
|
||||
# https://github.com/Tlf/tlf/pull/282
|
||||
# We use Debian's patch as upstream fixes don't apply as is due to
|
||||
# related code changes. The change will be a part of 1.4.2 release.
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://salsa.debian.org/debian-hamradio-team/tlf/-/raw/5a2d79fc35bde97f653b1373fd970d41fe01a3ec/debian/patches/warnings-as-errors.patch?inline=false";
|
||||
sha256 = "1zi1dd4vqkgl2pg29lnhj91ralqg58gmkzq9fkcx0dyakbjm6070";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook autoconf automake pkg-config perl ];
|
||||
buildInputs = [ glib ncurses5 hamlib xmlrpc_c ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, unzip, makeWrapper, makeDesktopItem, icoutils, jre }:
|
||||
{ lib, stdenv, fetchurl, unzip, makeWrapper, makeDesktopItem, icoutils, jre8 }:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
@ -12,11 +12,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "groove";
|
||||
version = "5.7.4";
|
||||
version = "5.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/groove/groove/${version}/${pname}-${builtins.replaceStrings ["."] ["_"] version}-bin.zip";
|
||||
sha256 = "1cl3xzl3n8b9a7h5pvnv31bab9j9zaw07ppk8whk8h865dcq1d10";
|
||||
sha256 = "sha256-JwoUlO6F2+8NtCnLC+xm5q0Jm8RIyU1rnuKGmjgJhFU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper icoutils ];
|
||||
|
|
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
mkdir -p $out/bin
|
||||
for bin in Generator Imager ModelChecker PrologChecker Simulator Viewer; do
|
||||
makeWrapper ${jre}/bin/java $out/bin/groove-''${bin,,} \
|
||||
makeWrapper ${jre8}/bin/java $out/bin/groove-''${bin,,} \
|
||||
--add-flags "-jar $out/share/groove/bin/$bin.jar"
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-cliff";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "git-cliff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9F15XHyFxcE48/ePwjvB7lLkw9FxoQd49G758nupRuk=";
|
||||
sha256 = "sha256-FCBNm51QI1jDdq2BZFwZA1kpIfXIvh1ickmY3ZqwGPY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-gPf4sGDbZzfzVJy+9k3FSOdJ5b8Xci1LTjIrCmP9bW8=";
|
||||
cargoSha256 = "sha256-CBCyujJHWTatJO+Tk6MyOk12B0cY1JSwLQizjcXeQzQ=";
|
||||
|
||||
# attempts to run the program on .git in src which is not deterministic
|
||||
doCheck = false;
|
||||
|
|
|
|||
25
pkgs/build-support/dhall/directory-to-nix.nix
Normal file
25
pkgs/build-support/dhall/directory-to-nix.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ dhallPackages, dhallPackageToNix}:
|
||||
|
||||
# `dhallDirectoryToNix is a utility function to take a directory of Dhall files
|
||||
# and read them in as a Nix expression.
|
||||
#
|
||||
# This function is similar to `dhallToNix`, but takes a Nixpkgs Dhall package
|
||||
# as input instead of raw Dhall code.
|
||||
#
|
||||
# Note that this uses "import from derivation" (IFD), meaning that Nix will
|
||||
# perform a build during the evaluation phase if you use this
|
||||
# `dhallDirectoryToNix` utility. It is not possible to use
|
||||
# `dhallDirectoryToNix` in Nixpkgs, since the Nixpkgs Hydra doesn't allow IFD.
|
||||
|
||||
{ src
|
||||
, # The file to import, relative to the src root directory
|
||||
file ? "package.dhall"
|
||||
}@args:
|
||||
|
||||
let
|
||||
generatedPkg = dhallPackages.generateDhallDirectoryPackage args;
|
||||
|
||||
builtPkg = dhallPackages.callPackage generatedPkg { };
|
||||
|
||||
in
|
||||
dhallPackageToNix builtPkg
|
||||
36
pkgs/build-support/dhall/package-to-nix.nix
Normal file
36
pkgs/build-support/dhall/package-to-nix.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
|
||||
# `dhallPackageToNix` is a utility function to take a Nixpkgs Dhall package
|
||||
# (created with a function like `dhallPackages.buildDhallDirectoryPackage`)
|
||||
# and read it in as a Nix expression.
|
||||
#
|
||||
# This function is similar to `dhallToNix`, but takes a Nixpkgs Dhall package
|
||||
# as input instead of raw Dhall code.
|
||||
#
|
||||
# Note that this uses "import from derivation" (IFD), meaning that Nix will
|
||||
# perform a build during the evaluation phase if you use this
|
||||
# `dhallPackageToNix` utility. It is not possible to use `dhallPackageToNix`
|
||||
# in Nixpkgs, since the Nixpkgs Hydra doesn't allow IFD.
|
||||
|
||||
{ stdenv, dhall-nix }:
|
||||
|
||||
dhallPackage:
|
||||
let
|
||||
drv = stdenv.mkDerivation {
|
||||
name = "dhall-compiled-package.nix";
|
||||
|
||||
buildCommand = ''
|
||||
# Dhall requires that the cache is writable, even if it is never written to.
|
||||
# We copy the cache from the input package to the current directory and
|
||||
# set the cache as writable.
|
||||
cp -r "${dhallPackage}/.cache" ./
|
||||
export XDG_CACHE_HOME=$PWD/.cache
|
||||
chmod -R +w ./.cache
|
||||
|
||||
dhall-to-nix <<< "${dhallPackage}/binary.dhall" > $out
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dhall-nix ];
|
||||
};
|
||||
|
||||
in
|
||||
import drv
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ dhall-nixpkgs, lib, stdenv }:
|
||||
|
||||
# This function calls `dhall-to-nixpkgs directory --fixed-output-derivations`
|
||||
# within a Nix derivation.
|
||||
#
|
||||
# This is possible because
|
||||
# `dhall-to-nixpkgs directory --fixed-output-derivations` will turn remote
|
||||
# Dhall imports protected with Dhall integrity checksinto fixed-output
|
||||
# derivations (with the `buildDhallUrl` function), so no unrestricted network
|
||||
# access is necessary.
|
||||
lib.makePackageOverridable
|
||||
( { src
|
||||
, # The file to import, relative to the root directory
|
||||
file ? "package.dhall"
|
||||
, # Set to `true` to generate documentation for the package
|
||||
document ? false
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "dhall-directory-package.nix";
|
||||
|
||||
buildCommand = ''
|
||||
dhall-to-nixpkgs directory --fixed-output-derivations --file "${file}" "${src}" ${if document then "--document" else ""} > $out
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dhall-nixpkgs ];
|
||||
}
|
||||
)
|
||||
|
|
@ -1,34 +1,36 @@
|
|||
{lib, stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU, libGL, freeglut, camlp4 } :
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut } :
|
||||
|
||||
let
|
||||
pname = "lablgl";
|
||||
in
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
then throw "lablgl is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "1.05";
|
||||
pname = "ocaml${ocaml.version}-lablgl";
|
||||
version = "1.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz";
|
||||
sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
|
||||
src = fetchFromGitHub {
|
||||
owner = "garrigue";
|
||||
repo = "lablgl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k";
|
||||
};
|
||||
|
||||
buildInputs = [ocaml findlib lablgtk freeglut camlp4];
|
||||
buildInputs = [ ocaml findlib freeglut ];
|
||||
propagatedBuildInputs = [ libGLU libGL ];
|
||||
|
||||
patches = [ ./Makefile.config.patch ./META.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
|
||||
substituteInPlace Makefile.config \
|
||||
--subst-var-by BINDIR $out/bin \
|
||||
--subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl \
|
||||
--subst-var-by DLLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl \
|
||||
--subst-var-by BINDIR $out/bin/ \
|
||||
--subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl/ \
|
||||
--subst-var-by DLLDIR $out/lib/ocaml/${ocaml.version}/site-lib/stublibs/ \
|
||||
--subst-var-by TKINCLUDES "" \
|
||||
--subst-var-by XINCLUDES ""
|
||||
'';
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
buildFlags = [ "lib" "libopt" "glut" "glutopt" ];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
|
||||
{ stdenv, lib, fetchFromGitLab, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
|
||||
|
||||
assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
|| lib.versionAtLeast ocaml.version "4.13"
|
||||
then throw "lablgtk-extras is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6";
|
||||
name = "ocaml${ocaml.version}-lablgtk-extras-${version}";
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "zoggy";
|
||||
repo = "lablgtk-extras";
|
||||
rev = "release-${version}";
|
||||
|
|
@ -18,9 +22,9 @@ stdenv.mkDerivation rec {
|
|||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = with lib.maintainers; [ vbgl ];
|
||||
homepage = "http://gtk-extras.forge.ocamlcore.org/";
|
||||
homepage = "https://framagit.org/zoggy/lablgtk-extras/";
|
||||
description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,11 +13,12 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "48546513faf2eb7901e65a64eba7b653c80106ed00ed9ca3419c3d10b6555a01";
|
||||
sha256 = "sha256-SFRlE/ry63kB5lpk66e2U8gBBu0A7ZyjQZw9ELZVWgE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
croniter
|
||||
tzlocal
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
version = "2.6.3";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-zpwkDKPrE5TFZQO0A1ifTQ7n+TRFpXi3jai3h5plyGM=";
|
||||
sha256 = "8aaee7fef3fff4c9271728c645896226f3df1e00bfab8dcea2456edfb3395fd0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.8.4";
|
||||
version = "1.8.8";
|
||||
pname = "bids-validator";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "63e7a02c9ddb5505a345e178f4e436b82c35ec0a177d7047b67ea10ea3029a68";
|
||||
sha256 = "e9ebc4cf1004bd343bbb56105b1eb2be833200e466dbaff7dfd267fca044d55e";
|
||||
};
|
||||
|
||||
# needs packages which are not available in nixpkgs
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "emv";
|
||||
version = "1.0.11";
|
||||
version = "1.0.13";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "russss";
|
||||
repo = "python-emv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256:1715hcba3fdi0i5awnrjdjnk74p66sxm9349pd8bb717zrh4gpj7";
|
||||
hash = "sha256-Jobw8OyKMaLfVsvMadrUrg5BijFo9G6kjgjhGIV8H1M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-appbuilder";
|
||||
version = "3.3.3";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-AppBuilder";
|
||||
inherit version;
|
||||
sha256 = "sha256-yjb4dpcQt2se5GT+wodh4UC9LAF4JmYrdX89VIdkk0U=";
|
||||
sha256 = "a5dfb559a0e96dd06bf5ff023f72bb3cc855e6db68e573e70f30caa31840f50f";
|
||||
};
|
||||
|
||||
# See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-openid";
|
||||
version = "1.2.5";
|
||||
version = "1.3.0";
|
||||
disable = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-OpenID";
|
||||
inherit version;
|
||||
sha256 = "5a8ffe1c8c0ad1cc1f5030e1223ea27f8861ee0215a2a58a528cc61379e5ccab";
|
||||
sha256 = "539289ed2d19af61ae38d8fe46aec9e4de2b56f9f8b46da0b98c0d387f1d975a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "future-fstrings";
|
||||
version = "1.0.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "future_fstrings";
|
||||
sha256 = "1pra33in6rinrcs5wvdb1rbxmx223j93ahdwhzwgf7wyfsnjda98";
|
||||
sha256 = "6cf41cbe97c398ab5a81168ce0dbb8ad95862d3caf23c21e4430627b90844089";
|
||||
};
|
||||
|
||||
# No tests included in Pypi archive
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ghp-import";
|
||||
version = "1.1.0";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wiqc4Qw3dT4miNFk12WnANrkuNefptsKLDEyuniBiU8=";
|
||||
hash = "sha256-lHs3cfEb6FDIUsZLVhxgD93feUurNjBghUwe560F4HE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-dateutil ];
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "github-to-sqlite";
|
||||
version = "2.8.2";
|
||||
version = "2.8.3";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dogsheep";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16mw429ppnhgsa98qs3fhprqvdpqbr5q1biq3ql8rsf38difdbl8";
|
||||
sha256 = "sha256-4wkwtcChcR7XH421wa3dGdIPhwgeaTFk247zIRX98xo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hypothesmith";
|
||||
version = "0.1.9";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "039fd6aa0102f89df9df7ad4cff70aa8068678c13c3be2713c92568917317a04";
|
||||
sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ hypothesis lark-parser libcst ];
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "influxdb-client";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = "influxdb-client-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n8zflphcj9l17mkqa4acxb0sna0v05zq5y07ayizf84zm93hpbr";
|
||||
sha256 = "0w0pw87fnxms88f3dadyhxdgms4rzvcww18h6l87wnqc6wxa6paw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-sphinx";
|
||||
version = "0.2.4";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "jupyter_sphinx";
|
||||
sha256 = "b5ba1efdd1488b385de0068036a665932ed93998e40ce3a342c60f0926781fd9";
|
||||
sha256 = "37fc9408385c45326ac79ca0452fbd7ae2bf0e97842d626d2844d4830e30aaf2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ nbformat sphinx ipywidgets ];
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab-git";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jupyterlab_git";
|
||||
inherit version;
|
||||
sha256 = "0rbl472k66asfq9n9xqd2zpw8z7yrk6ka411vhvlvvszzb7g6w13";
|
||||
sha256 = "3b9ee3a577834c0f021d41069be7b03068297ce0c2a73c76b17e8018eb3eb62f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "labgrid";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labgrid-project";
|
||||
repo = "labgrid";
|
||||
rev = "v${version}";
|
||||
sha256 = "17j013dw66h4jm1hl92g892sx9r9c48pnl7d58p1y0l4jfca8gmn";
|
||||
sha256 = "0ih04lh1q3dysps4vfmk2rhqqrsimssadsxvbxdsnim2yihrrw47";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ldappool";
|
||||
version = "2.4.1";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ldappool";
|
||||
inherit version;
|
||||
sha256 = "23edef09cba4b1ae764f1ddada828d8e39d72cf32a457e599f5a70064310ea00";
|
||||
sha256 = "4bb59b7d6b11407f48ee01a781267e3c8ba98d91f426806ac7208612ae087b86";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "linkify-it-py";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "tsutsu3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gd51no6VqvIiW9fbCdp30zHG/us6by7FLHV2ul/XJAM=";
|
||||
hash = "sha256-i48B5qNufuhGp9a/46rWRgPawYkMA0ryRSyR+JhUmmw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ uc-micro-py ];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mne-python";
|
||||
version = "0.24.0";
|
||||
version = "0.24.1";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "mne-tools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1982y54n7q9pl28haca0vx6cjrk2a8cj24piaj8j31f09rynn8k0";
|
||||
sha256 = "0n91pj97xmpn0bmlv56q2117szlvvs4b52pjjlm3g8ny4xb3iwr0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy ];
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "monty";
|
||||
version = "2021.8.17";
|
||||
version = "2021.12.1";
|
||||
disabled = pythonOlder "3.5"; # uses type annotations
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "materialsvirtuallab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0lg6d0qk6iv476rcn45p5f50kips5g9s709cxddwnk5yrz57c4d0";
|
||||
sha256 = "0zcbdh7pqv4dq3fan0zh912w9bvmf2p0zj1fhp0ayhdsc50cwldh";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "PuLP";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "27c2a87a98ea0e9a08c7c46e6df47d6d4e753ad9991fea2901892425d89c99a6";
|
||||
sha256 = "4b4f7e1e954453e1b233720be23aea2f10ff068a835ac10c090a93d8e2eb2e8d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyparsing amply ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykrakenapi";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dominiktraxl";
|
||||
repo = "pykrakenapi";
|
||||
rev = "v${version}";
|
||||
sha256 = "047v0pkkwsd219lwc3hamdaz1nngxr2nbb7hh8n4xkyicm2axha6";
|
||||
sha256 = "0yvhgk5wyklwqd67hfajnd7ims79h4h89pp65xb3x5mcmdcfz4ss";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "QtAwesome";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3fc6eb9327f96ded8e0d291dad4f7a543394c53bff8f9f4badd7433181581a8b";
|
||||
sha256 = "ec02e200231fa68a146a93845890aa0432a7edcba14bf811ff6975cf9acdab5d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ qtpy six ];
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-material";
|
||||
version = "0.0.32";
|
||||
version = "0.0.35";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sphinx_material";
|
||||
inherit version;
|
||||
sha256 = "ec02825a1bbe8b662fe624c11b87f1cd8d40875439b5b18c38649cf3366201fa";
|
||||
sha256 = "27f0f1084aa0201b43879aef24a0521b78dc8df4942b003a4e7d79ab11515852";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-actdiag";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TtuFZOLkig4MULLndDQlrTTx8RiGw34MsjmXoPladMY=";
|
||||
hash = "sha256-PFXUVP/Due/nwg8q2vAiGZuCVhLTLyAL6KSXqofg+B8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx actdiag blockdiag ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "telethon";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Telethon";
|
||||
sha256 = "sha256-unVRzkR+lUqtZ/PuukurdXTMoHosb0HlvmmQTm4OwxM=";
|
||||
sha256 = "818cb61281ed3f75ba4da9b68cb69486bed9474d2db4e0aa16e482053117452c";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "twill";
|
||||
version = "3.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "01770eddb34f5fe6ee59992b84619968885d359ad3d6d9191e8ba8eec93482aa";
|
||||
sha256 = "57cde4c3a2265f1a14d80007aa4f66c2135d509555499e9b156d2b4cf5048c2c";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "virtualenv-clone";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edwardgeorge";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xb20fhl99dw5vnyb43sjpj9628nbdnwp5g7m8f2id7w8kpwzvfw";
|
||||
sha256 = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
pname = "xmlschema";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "sissaschool";
|
||||
repo = "xmlschema";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d7f19T17aAwdtNDjCrsXXY39u0aRgQo4vFPnxFNs2PQ=";
|
||||
sha256 = "0sfpylajab0xjpaqrlqmbwnby6w848y1y9fsv9xlqazxiyzwil46";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,20 +10,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fnm";
|
||||
version = "1.28.1";
|
||||
version = "1.28.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Schniz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EH3M5wg+BfTZLvch4jL7AGWwywoSxo+8marzdUgAitg=";
|
||||
sha256 = "sha256-8/J7LfSk2a0Bq9v6CH63BIyUkT56EY+4UcEUdwkbZ4U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ];
|
||||
|
||||
cargoSha256 = "sha256-Mq1SzAZa05tglcwW6fvT1khVwqA3hRzFjouWLNMWgOk=";
|
||||
cargoSha256 = "sha256-k3WZpN6DSbFFKLilFEN2lDMbJH5q1KgfE12OoGv+eGk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-java-format";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
|
||||
sha256 = "sha256-hdqCubcfBK/KzanQCMLSFUC/T6JZJp77XFYdotThElI=";
|
||||
sha256 = "sha256-oDask5L/by5mh5EyTCa9c5Y7CWgu1KDUy8EX/W6j/lU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, alsa-lib
|
||||
, boost
|
||||
, buildPackages
|
||||
, bzip2
|
||||
, cmake
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
|
|
@ -30,7 +31,6 @@
|
|||
, pcre
|
||||
, pkg-config
|
||||
, portaudio
|
||||
, python27
|
||||
, python3
|
||||
, retroarch
|
||||
, sfml
|
||||
|
|
@ -44,8 +44,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
d2u = lib.replaceChars [ "-" ] [ "_" ];
|
||||
|
||||
hashesFile = builtins.fromJSON (builtins.readFile ./hashes.json);
|
||||
|
||||
getCoreSrc = core:
|
||||
|
|
@ -58,12 +56,16 @@ let
|
|||
, license
|
||||
, src ? null
|
||||
, broken ? false
|
||||
, version ? "unstable-2021-11-22"
|
||||
, version ? "unstable-2021-12-06"
|
||||
, platforms ? retroarch.meta.platforms
|
||||
# The resulting core file is based on core name
|
||||
# Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename
|
||||
, normalizeCore ? true
|
||||
, ...
|
||||
}@args:
|
||||
lib.makeOverridable stdenv.mkDerivation (
|
||||
let
|
||||
d2u = if normalizeCore then (lib.replaceChars [ "-" ] [ "_" ]) else (x: x);
|
||||
finalSrc = if src == null then getCoreSrc core else src;
|
||||
in
|
||||
(rec {
|
||||
|
|
@ -403,11 +405,7 @@ in
|
|||
description = "Port of FBNeo to libretro";
|
||||
license = "Non-commercial";
|
||||
makefile = "Makefile";
|
||||
postPatch = ''
|
||||
sed -i -e 's:-Wall:-Wall -Wno-format-security:g' src/burner/libretro/Makefile
|
||||
'';
|
||||
preBuild = "cd src/burner/libretro";
|
||||
makeFlags = [ "USE_EXPERIMENTAL_FLAGS=1" ];
|
||||
};
|
||||
|
||||
fceumm = mkLibRetroCore {
|
||||
|
|
@ -490,11 +488,6 @@ in
|
|||
description = "Port of MAME to libretro";
|
||||
license = with lib.licenses; [ bsd3 gpl2Plus ];
|
||||
extraBuildInputs = [ alsa-lib libGLU libGL portaudio python3 xorg.libX11 ];
|
||||
postPatch = ''
|
||||
# Prevent the failure during the parallel building of:
|
||||
# make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
|
||||
mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src
|
||||
'';
|
||||
makefile = "Makefile.libretro";
|
||||
};
|
||||
|
||||
|
|
@ -536,7 +529,8 @@ in
|
|||
core = "mame2015";
|
||||
description = "Port of MAME ~2015 to libretro";
|
||||
license = "MAME";
|
||||
extraNativeBuildInputs = [ python27 ];
|
||||
makeFlags = [ "PYTHON=python3" ];
|
||||
extraNativeBuildInputs = [ python3 ];
|
||||
extraBuildInputs = [ alsa-lib ];
|
||||
makefile = "Makefile";
|
||||
enableParallelBuilding = false;
|
||||
|
|
@ -544,17 +538,11 @@ in
|
|||
|
||||
mame2016 = mkLibRetroCore {
|
||||
core = "mame2016";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix_mame_build_on_make-4.3.patch";
|
||||
url = "https://github.com/libretro/mame2016-libretro/commit/5874fae3d124f5e7c8a91634f5473a8eac902e47.patch";
|
||||
sha256 = "061f1lcm72glksf475ikl8w10pnbgqa7049ylw06nikis2qdjlfn";
|
||||
})
|
||||
];
|
||||
description = "Port of MAME ~2016 to libretro";
|
||||
license = with lib.licenses; [ bsd3 gpl2Plus ];
|
||||
extraNativeBuildInputs = [ python27 ];
|
||||
extraNativeBuildInputs = [ python3 ];
|
||||
extraBuildInputs = [ alsa-lib ];
|
||||
makeFlags = [ "PYTHON_EXECUTABLE=python3" ];
|
||||
postPatch = ''
|
||||
# Prevent the failure during the parallel building of:
|
||||
# make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
|
||||
|
|
@ -580,17 +568,12 @@ in
|
|||
};
|
||||
|
||||
mesen-s = mkLibRetroCore {
|
||||
core = "mesens";
|
||||
src = getCoreSrc "mesen-s";
|
||||
core = "mesen-s";
|
||||
description = "Port of Mesen-S to libretro";
|
||||
license = lib.licenses.gpl3Only;
|
||||
makefile = "Makefile";
|
||||
preBuild = "cd Libretro";
|
||||
postInstall = ''
|
||||
# fix library name to match libretro-core-info
|
||||
mv $coreDir/mesens_libretro${stdenv.hostPlatform.extensions.sharedLibrary} \
|
||||
$coreDir/mesen-s_libretro${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
'';
|
||||
normalizeCore = false;
|
||||
};
|
||||
|
||||
meteor = mkLibRetroCore {
|
||||
|
|
@ -674,7 +657,6 @@ in
|
|||
|
||||
pcsx2 = mkLibRetroCore {
|
||||
core = "pcsx2";
|
||||
version = "unstable-2021-11-27";
|
||||
description = "Port of PCSX2 to libretro";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
extraNativeBuildInputs = [
|
||||
|
|
@ -727,11 +709,11 @@ in
|
|||
core = "play";
|
||||
description = "Port of Play! to libretro";
|
||||
license = lib.licenses.bsd2;
|
||||
extraBuildInputs = [ boost ];
|
||||
extraNativeBuildInputs = [ cmake openssl curl icu libGL libGLU xorg.libX11 ];
|
||||
extraBuildInputs = [ boost bzip2 curl openssl icu libGL libGLU xorg.libX11 ];
|
||||
extraNativeBuildInputs = [ cmake ];
|
||||
makefile = "Makefile";
|
||||
cmakeFlags = [ "-DBUILD_PLAY=OFF -DBUILD_LIBRETRO_CORE=ON" ];
|
||||
postBuild = "mv Source/ui_libretro/play_libretro${stdenv.hostPlatform.extensions.sharedLibrary} play_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
cmakeFlags = [ "-DBUILD_PLAY=OFF" "-DBUILD_LIBRETRO_CORE=ON" ];
|
||||
postBuild = "cd Source/ui_libretro";
|
||||
};
|
||||
|
||||
ppsspp = mkLibRetroCore {
|
||||
|
|
@ -741,8 +723,14 @@ in
|
|||
extraNativeBuildInputs = [ cmake pkg-config python3 ];
|
||||
extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ];
|
||||
makefile = "Makefile";
|
||||
cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ];
|
||||
postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
cmakeFlags = [
|
||||
"-DLIBRETRO=ON"
|
||||
"-DUSE_SYSTEM_FFMPEG=ON"
|
||||
"-DUSE_SYSTEM_SNAPPY=ON"
|
||||
"-DUSE_SYSTEM_LIBZIP=ON"
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
];
|
||||
postBuild = "cd lib";
|
||||
};
|
||||
|
||||
prboom = mkLibRetroCore {
|
||||
|
|
@ -811,8 +799,15 @@ in
|
|||
description = "Optimized port/rewrite of SNES9x 1.43 to Libretro";
|
||||
license = "Non-commercial";
|
||||
makefile = "Makefile";
|
||||
};
|
||||
|
||||
snes9x2005-plus = mkLibRetroCore {
|
||||
core = "snes9x2005-plus";
|
||||
src = getCoreSrc "snes9x2005";
|
||||
description = "Optimized port/rewrite of SNES9x 1.43 to Libretro, with Blargg's APU";
|
||||
license = "Non-commercial";
|
||||
makefile = "Makefile";
|
||||
makeFlags = [ "USE_BLARGG_APU=1" ];
|
||||
postBuild = "mv snes9x2005_plus_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x2005_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
};
|
||||
|
||||
snes9x2010 = mkLibRetroCore {
|
||||
|
|
@ -847,7 +842,6 @@ in
|
|||
cmakeFlags = [
|
||||
"-DBUILD_LIBRETRO_CORE=ON"
|
||||
];
|
||||
postPatch = "mkdir -p src/duckstation-libretro";
|
||||
};
|
||||
|
||||
tgbdual = mkLibRetroCore {
|
||||
|
|
@ -863,7 +857,7 @@ in
|
|||
license = lib.licenses.gpl3Only;
|
||||
extraNativeBuildInputs = [ cmake ];
|
||||
makefile = "Makefile";
|
||||
postBuild = "cd src/";
|
||||
postBuild = "cd src";
|
||||
};
|
||||
|
||||
tic80 = mkLibRetroCore {
|
||||
|
|
@ -917,7 +911,7 @@ in
|
|||
description = "Port of Yabause to libretro";
|
||||
license = lib.licenses.gpl2Only;
|
||||
makefile = "Makefile";
|
||||
# Disable SSE for non-x86. DYNAREC doesn't build on either Aarch64 or x86_64.
|
||||
# Disable SSE for non-x86. DYNAREC doesn't build on aarch64.
|
||||
makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0";
|
||||
preBuild = "cd yabause/src/libretro";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -36,23 +36,22 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
mainVersion = "1.9.13";
|
||||
revision = "2";
|
||||
version = "1.9.14";
|
||||
libretroSuperSrc = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-core-info";
|
||||
sha256 = "sha256-jM+iXNSCpJy4wOk1S72G1UjNGBzejyhs5LFFWCFjs2c=";
|
||||
rev = "v${mainVersion}";
|
||||
sha256 = "sha256-C2PiBcN5r9NDxFWFE1pytSGR1zq9E5aVt6QUf5aJ7I0=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "retroarch-bare";
|
||||
version = "${lib.concatStringsSep "." [ mainVersion revision ]}";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "RetroArch";
|
||||
sha256 = "sha256-fehHchn+o9QM2wIK6zYamnbFvQda32Gw0rJk8Orx00U=";
|
||||
sha256 = "sha256-H2fCA1sM8FZfVnLxBjnKe7RjHJNAn/Antxlos5oFFSY=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
"beetle-lynx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-lynx-libretro",
|
||||
"rev": "b84c79b2f185482f9cec2b10f33cbe1bc5732dd9",
|
||||
"sha256": "pR3EsFN/Wf77gPoAnjf/nI0XlB2098qIrmbdjB4jmMQ=",
|
||||
"rev": "24ca629d50de752861684a83cc9bcee96313f9e1",
|
||||
"sha256": "LPt3JT0lyKK73yNIxvR1eUuzOkLKa8IkRA4cchhfljA=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"beetle-ngp": {
|
||||
|
|
@ -30,29 +30,29 @@
|
|||
"beetle-pce-fast": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-pce-fast-libretro",
|
||||
"rev": "a7608100d1cdd8eb65aea82fede7da61dcc3c5f1",
|
||||
"sha256": "3v/TGz4y52IodXRmt/peZlabNS+quQVN9t5xucC2plg=",
|
||||
"rev": "6f63eab86abab335c1e337d4e8c1582bceda5708",
|
||||
"sha256": "QRw7FDd7rOTsTW4qGr2isvFHmobz7GgXUt84q0x2S/c=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"beetle-pcfx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-pcfx-libretro",
|
||||
"rev": "19f2b7ce529e70655db04d3dd4faf32b4de14df2",
|
||||
"sha256": "K3ZjOd8IGtwlwxExNAmHsOC0N0fz06w/3uua7sAm8Jc=",
|
||||
"rev": "6d2b11e17ad5a95907c983e7c8a70e75508c2d41",
|
||||
"sha256": "WG2YpCYdL/MxW5EbiP2+1VtAjbX7yYDIcLXhb+YySI4=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"beetle-psx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-psx-libretro",
|
||||
"rev": "bc1b6af8d7b8dd0b4133040fef82725520bbd560",
|
||||
"sha256": "QgBB05o7941LsNKl2EIKy185xgcAf1vrAZgQiray/x0=",
|
||||
"rev": "39be47bc9958258cf3b6f3c68d9485ea99971cf8",
|
||||
"sha256": "q6aKSfG1A2AV2MppZFujDwqqZu26R7b0t9KyAETQTyU=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"beetle-saturn": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-saturn-libretro",
|
||||
"rev": "f97fda5447d883220ce2f53a15f2cbe4790a8392",
|
||||
"sha256": "r4kvrTIw1sOf5nEuPq2xF/QXw+0COQYWyERJ7HX1sFU=",
|
||||
"rev": "e6ba71f8bcc647b646d94dec812b24d00c41cf3f",
|
||||
"sha256": "tDbV+CsDr4bowBbJ/C8J9scfCryTAXxz58pGaUHU5yU=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"beetle-snes": {
|
||||
|
|
@ -65,8 +65,8 @@
|
|||
"beetle-supergrafx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-supergrafx-libretro",
|
||||
"rev": "083d102389a1ffaeddfa525a186adde0f35e42fc",
|
||||
"sha256": "4hTOYPnOWdhb7CfWKZFO53NBFGa3lg0745ncBU6ejiQ=",
|
||||
"rev": "cd800d701f0b8f4dcb1654a5cb5b24ee09dd9257",
|
||||
"sha256": "vnskn2+65cKQjaXO9GJnKNppi8TWHUO+uZdt2BYGN9Y=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"beetle-vb": {
|
||||
|
|
@ -79,8 +79,8 @@
|
|||
"beetle-wswan": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-wswan-libretro",
|
||||
"rev": "3fcb582755a509ae33fc52cd0ca4b3edffc734ef",
|
||||
"sha256": "XHTzXlTt8op0bDLNn833Unt57zclXowlLhG3qvWwjXQ=",
|
||||
"rev": "ea00c1d8eb9894538dd8758975cd9d6ae99ead1e",
|
||||
"sha256": "0ptDbq3X8EGNwPePr4H0VQkgmXXIP50dNpITX8DX6w8=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"blastem": {
|
||||
|
|
@ -142,8 +142,8 @@
|
|||
"dolphin": {
|
||||
"owner": "libretro",
|
||||
"repo": "dolphin",
|
||||
"rev": "d5193c4391addbd257b2aafe943a138ba89e20fb",
|
||||
"sha256": "uRhYMO+fmAfwEr/KTKAhx//dKq44YdvhXxp7v+Gol0w=",
|
||||
"rev": "48066c84560322219be4080bca125cc03d48f411",
|
||||
"sha256": "IPKcqges/BX6KFQSirLpmsI2+7/cjcrySK+YWaA1cuo=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"dosbox": {
|
||||
|
|
@ -156,8 +156,8 @@
|
|||
"eightyone": {
|
||||
"owner": "libretro",
|
||||
"repo": "81-libretro",
|
||||
"rev": "30344d3499fdb301ee33de136f7b390bebe0756a",
|
||||
"sha256": "kMwga9MkjV+dKxW3VLu+rxst6H20HhREoiNBsCLa1G0=",
|
||||
"rev": "7e8153cd5b88cd5cb23fb0c03c04e7c7d8a73159",
|
||||
"sha256": "Y+RU3T4qUmV44IZ5OBNhtC+f/DX6njOCF0tsl8MN4qM=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"fbalpha2012": {
|
||||
|
|
@ -170,29 +170,29 @@
|
|||
"fbneo": {
|
||||
"owner": "libretro",
|
||||
"repo": "fbneo",
|
||||
"rev": "2447dd5385cb193801dc46be7b50a807d13162aa",
|
||||
"sha256": "x70kPEC9LVm9ZyH5sviI8iW9dCkIi+lx2ns03OId2Oc=",
|
||||
"rev": "8e9f73ab28fc6176f0bde53eac0f0b561b065e16",
|
||||
"sha256": "gv1Yuo0wFB6MmCtnajM71EK2GEzd5X29VYY2yFcB6Uk=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"fceumm": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-fceumm",
|
||||
"rev": "8864f6e246e4ba511b95a48713456b0dd3b3045b",
|
||||
"sha256": "GrkD54ElseEYczPSb9WGTvI8SaNy/fWV4zve7sG9TTY=",
|
||||
"rev": "02b5bbf26981b5ae0da81a9f312cb51ed64112b8",
|
||||
"sha256": "zsY0RyWLJD2Zf1qDzuMbbNxV630TAIt3KqjLWXR4lgQ=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"flycast": {
|
||||
"owner": "libretro",
|
||||
"repo": "flycast",
|
||||
"rev": "254b66a017a087f0833777760b879abfe7f9d5cd",
|
||||
"sha256": "pkgVjZCGlgq95Cv+xWLl3sjq+jIpgnfuVaXGDYtuGAY=",
|
||||
"rev": "041297cc6c266b1185a4414271a10732c946239c",
|
||||
"sha256": "htuUfzwlSbhh8CxMEeE8HqNqaJupav4cBfXMwMEKim8=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"fmsx": {
|
||||
"owner": "libretro",
|
||||
"repo": "fmsx-libretro",
|
||||
"rev": "7b0c70c25fcc7f4bb876e729eacfcc01f494df60",
|
||||
"sha256": "H3ttVMw3cUxXJ64olbTSO6K7YBpmdgKnaLEpTS9QQEg=",
|
||||
"rev": "cd2d59a9b820a0abf038fa7e279965da34132960",
|
||||
"sha256": "8mOcTTETgDWGDV5q9n3UupMsbPXEqv0AbQGdgOSKfBk=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"freeintv": {
|
||||
|
|
@ -205,22 +205,22 @@
|
|||
"gambatte": {
|
||||
"owner": "libretro",
|
||||
"repo": "gambatte-libretro",
|
||||
"rev": "c842d49b1daab6e45f3a1802ee7516b100827599",
|
||||
"sha256": "DUj4vEh3x7MaE8bHDwOoDY7K2yEkTGz8Cf3fx4sgCvY=",
|
||||
"rev": "eb6f26a57ff6c35154950da20f83ddf1d44d4ca6",
|
||||
"sha256": "boPCbMX1o1i+rL0dnY0M3pzY1D6uzoYRN21C1zXXOJw=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"genesis-plus-gx": {
|
||||
"owner": "libretro",
|
||||
"repo": "Genesis-Plus-GX",
|
||||
"rev": "c1c605e862c4a277e880b510c68ebde630487948",
|
||||
"sha256": "wDEwG+VMs0hXjL1pBn+wmvtaaN4nax+Dm6Ocy7HCLbQ=",
|
||||
"rev": "8a7d4c87d2e6936d64c1251c6f968a93cc87cce5",
|
||||
"sha256": "SX0jA8VuN4LNVhR/aw3gF0uF7+c9McEiHnNmxbPtE5g=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"gpsp": {
|
||||
"owner": "libretro",
|
||||
"repo": "gpsp",
|
||||
"rev": "bc0a3cf2c182b7f60c80464309a791377bef5af3",
|
||||
"sha256": "27eOnAp6pzZAK5o1of5+2Fx/hHtUsjbBQlefdsCv0rk=",
|
||||
"rev": "be3fdfd0b4e0529d7e00c4e16eb26d92fe0559a6",
|
||||
"sha256": "GX3iAVNfznxa/3aIHuopFFNsdz2b22BiQyycioH1TGw=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"gw": {
|
||||
|
|
@ -233,8 +233,8 @@
|
|||
"handy": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-handy",
|
||||
"rev": "e7b4e32d5f32d6e96630072072844a7dd16a02d9",
|
||||
"sha256": "dQpEqxOcac7gdbmWu4HTvFx++us/spVMfroBlLTAgF0=",
|
||||
"rev": "ebcbb8be5d174306ffb091b7657637b910fc35d2",
|
||||
"sha256": "mkPgOFfYDICmFu0nZ+9kfbrmSmPpNdC9lvci0MsXIwo=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"hatari": {
|
||||
|
|
@ -261,15 +261,15 @@
|
|||
"mame2003": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-libretro",
|
||||
"rev": "e6595b3fa677158a7d834391517ae68e3c5f8f41",
|
||||
"sha256": "qxynDUQWtUKxJ7H7q9nGFhIjr1Pkrgtp8aJdTtG5/xU=",
|
||||
"rev": "80a4ca5c0db69be9fe9b65dcaa7ad45930c989b8",
|
||||
"sha256": "ZViVX+Z40ctxWGiQtfmRUDbUT7EYHqTNDhwWbKBjTEQ=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"mame2003-plus": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "680f4679c7a15fcec007eff8ba9578567b821daa",
|
||||
"sha256": "nxpmPE79C3hgeFLlwS4fHYteSmC4xuis1UySlqhqvzk=",
|
||||
"rev": "8dc4cfa741db8136e43c4a0eabdc1977fd88ccdb",
|
||||
"sha256": "gcsL2xfF+q5ECN9u4JaKR8rimCXLt/bVSzybLo2ln3Q=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"mame2010": {
|
||||
|
|
@ -289,8 +289,8 @@
|
|||
"mame2016": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2016-libretro",
|
||||
"rev": "d53c379892b0bd91b4a52fc2de491e1199f03e32",
|
||||
"sha256": "GQ4Sdg/1nZRT4Z1Aqq1zPo96duqIGyt6sjghf9ap2Jg=",
|
||||
"rev": "69711c25c14f990b05fdce87fb92f3b5c312ec1e",
|
||||
"sha256": "QdSgWcZIMDnmYAKAnvwNRPBYRaSMTcRpI7Vd04Xv3Is=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"melonds": {
|
||||
|
|
@ -324,8 +324,8 @@
|
|||
"mgba": {
|
||||
"owner": "libretro",
|
||||
"repo": "mgba",
|
||||
"rev": "033e067285745909722df930deaeead80ea2d54a",
|
||||
"sha256": "ZFmiVOf8H3PtSCWTtYc3XsIpiJI6XZ2v/HsusQsg7H8=",
|
||||
"rev": "c33adfa66b4b3f72c939c27ff0668ebeada75086",
|
||||
"sha256": "naZkfIghS4mIT5LT2x1E8W9/bju9pLZb8RfEHOlx7QI=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"mupen64plus": {
|
||||
|
|
@ -345,8 +345,8 @@
|
|||
"nestopia": {
|
||||
"owner": "libretro",
|
||||
"repo": "nestopia",
|
||||
"rev": "ea6f1c0631bb62bf15ab96493127dd9cfaf74d1c",
|
||||
"sha256": "v+5000V1SR1sXWHryoZEi5sTgaRlVMrHmWKJX2stdSk=",
|
||||
"rev": "21e2cec7a13f0a09f493637de289e59386e2fd36",
|
||||
"sha256": "XKEY43wtdE78XN2TnT8AW80irnsbIwPzQ1EkGXOrsG4=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"np2kai": {
|
||||
|
|
@ -359,8 +359,8 @@
|
|||
"o2em": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-o2em",
|
||||
"rev": "c039e83f2589cb9d21b9aa5dc211954234ab8c97",
|
||||
"sha256": "QQS4mS68C3aTZ4dw7ju6WyPlDjIBoDkIeQduCccAmDQ=",
|
||||
"rev": "f1050243e0d5285e7769e94a882b0cf39d2b7370",
|
||||
"sha256": "wD+iJ8cKC8jYFZ6OVvX71uO7sSh5b/LLoc5+g7f3Yyg=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"opera": {
|
||||
|
|
@ -380,8 +380,8 @@
|
|||
"pcsx2": {
|
||||
"owner": "libretro",
|
||||
"repo": "pcsx2",
|
||||
"rev": "18e0685ed4f191796c8e923caf4f5e96a930057e",
|
||||
"sha256": "V2eS741us2p+JC+ghmHjAtFeptB0UcBlwZuisZ8Co7M=",
|
||||
"rev": "26890da6f34176e70289c2f3004cd5660be0035b",
|
||||
"sha256": "PocOjidZyv30kIjOq++9DZdCNBXbCbyd0vepjMFXflQ=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"pcsx_rearmed": {
|
||||
|
|
@ -394,50 +394,50 @@
|
|||
"picodrive": {
|
||||
"owner": "libretro",
|
||||
"repo": "picodrive",
|
||||
"rev": "3edf1a00f64e0f22331233bb1638170115b2ac2e",
|
||||
"sha256": "4IWYOJ2wTDkdO4FxsAWCV724VNViHIb42nYc+j4pekU=",
|
||||
"rev": "d44605c269e645a6734089ac1f95116a5ce57e0b",
|
||||
"sha256": "Z4d+7Hf55raMAOIA2jrj6M99XhLTZqthHxi89ba+xEo=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"play": {
|
||||
"owner": "jpd002",
|
||||
"repo": "Play-",
|
||||
"rev": "6b9cc418004c01a195c78387752cc99245ba54d5",
|
||||
"sha256": "sha256-7nU5fQ8pQLmKy9Swmshkv2oj+HV0oTcqQ93LfNSq1us=",
|
||||
"rev": "65492042f0b2146d81decc8f63466362dd6122bc",
|
||||
"sha256": "fpiOT6fXvjGWmnKwncV2NyuYeT2ACE8LLyisKsWqydQ=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"ppsspp": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "712b87ae57d4e69ad5ba98d331912dead31b9c01",
|
||||
"sha256": "sygZYAOkFrrfpaF6nfKMBecJTNeXk48oqlCRncPb340=",
|
||||
"rev": "3e5511b6091b8af76d124d101f3d84ccc1021f30",
|
||||
"sha256": "FCaKEdu55c7zxh9Mdi+xAFj8v5/AoT2AzYYEErHd9sQ=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"prboom": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-prboom",
|
||||
"rev": "0f5927db4fb7e61f32bc9eccc5f809e54f71a371",
|
||||
"sha256": "DFpDxEUHjuCcHQGxT+impj98vYITeok1SHrRN5Hba4M=",
|
||||
"rev": "de19b1124559423244b4d677fd6006444d418c0e",
|
||||
"sha256": "vt43eYYGGUotxYeotUfp/9fvWnKJLJtrvo+GNavH3QY=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"prosystem": {
|
||||
"owner": "libretro",
|
||||
"repo": "prosystem-libretro",
|
||||
"rev": "f8652c7f2b0edc81685d03204d4963fc4ea9eccd",
|
||||
"sha256": "Ki4Dyb//X8isP0tScqunA/qt2vkX6d2HH7rHhqk3D5k=",
|
||||
"rev": "89e6df7b60d151310fedbe118fb472959a9dcd61",
|
||||
"sha256": "uxgKddS53X7ntPClE8MGezBAG+7OAFvMXTnyKpOOau0=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"quicknes": {
|
||||
"owner": "libretro",
|
||||
"repo": "QuickNES_Core",
|
||||
"rev": "71b8000b33daab8ed488f8707ccd8d5b623443f8",
|
||||
"sha256": "Wx8nFWy0DQaZlhEMiI2KRwBK0earSVSke7/qXbs0bQ0=",
|
||||
"rev": "6444b56659ed887c3492831da188fbc42e3e8ca2",
|
||||
"sha256": "FHV9oM4rmsCm7GsD5TKyVbBCN7uc9GRU5YGQE+2SiRM=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"sameboy": {
|
||||
"owner": "libretro",
|
||||
"repo": "sameboy",
|
||||
"rev": "fb3c7dd7d89df1f696e4cde33a868e141c927790",
|
||||
"sha256": "KFVNl43AJ11thHFFSJ6BO7wxfxhVdDVF+BAm1+GIzIs=",
|
||||
"rev": "685c6c8b497260f53a984d5c4398ef2b25253104",
|
||||
"sha256": "OosKYG38NvfwrLSEhAe2CrUx8PiSv4OhkmrVUO6l1qc=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"scummvm": {
|
||||
|
|
@ -485,8 +485,8 @@
|
|||
"stella": {
|
||||
"owner": "stella-emu",
|
||||
"repo": "stella",
|
||||
"rev": "f619b4e5cb01eefe0c01dedc01b452b3f74aab26",
|
||||
"sha256": "Oe++mDo1InvlvbRLlxcSjNQpioj4+ytt6ihTcvrD8g4=",
|
||||
"rev": "66e2c857c2bd85e778c51ae1cb99fb7669c7af17",
|
||||
"sha256": "RWNEq5qwShbBKIx5bif4NDs/uJES2wf1CVSxZbb6beI=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"stella2014": {
|
||||
|
|
@ -499,8 +499,8 @@
|
|||
"swanstation": {
|
||||
"owner": "libretro",
|
||||
"repo": "swanstation",
|
||||
"rev": "cc3946b2b3bd10282bc46078c245db09f6e68836",
|
||||
"sha256": "UzdmjUS6+6z4K6VJtMPxOwGXsCtxoh08RWTNHlvy/h8=",
|
||||
"rev": "8951ed1cea4ea65de5529a35e950f1b185e48b6e",
|
||||
"sha256": "27EH4oiYf154DJwm738qPOMCuWOCKD7wuSng3hz/xh0=",
|
||||
"fetchSubmodules": false
|
||||
},
|
||||
"tgbdual": {
|
||||
|
|
@ -555,8 +555,8 @@
|
|||
"yabause": {
|
||||
"owner": "libretro",
|
||||
"repo": "yabause",
|
||||
"rev": "811f9e81dbff4bed18644e19631fd4893e73e6ee",
|
||||
"sha256": "VstPh0oMEZ7/ts58NjZxBYZZx/7dRTYePhDIQMu0WOo=",
|
||||
"rev": "c940fe68461cb2bc6dd98cc162b46813ba12b081",
|
||||
"sha256": "a4nTgOZ2xEq45sWZ9AxmrjEdMOjnG3Whfm8mrvEMnuY=",
|
||||
"fetchSubmodules": false
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gobgpd";
|
||||
version = "2.32.0";
|
||||
version = "2.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osrg";
|
||||
repo = "gobgp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+FVd/I1folRswTPIq09xpTCai4+FVa6TYDsaPE8sYR4=";
|
||||
sha256 = "sha256-xyakq5DXwzONEP6EvDpAuzCrTDWcs+7asDlq9Vf4c1k=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw=";
|
||||
|
|
|
|||
|
|
@ -2,4 +2,5 @@
|
|||
|
||||
lib.recurseIntoAttrs {
|
||||
buildDhallUrl = callPackage ./buildDhallUrl { };
|
||||
generateDhallDirectoryPackage = callPackage ./generateDhallDirectoryPackage { };
|
||||
}
|
||||
|
|
|
|||
17
pkgs/test/dhall/generateDhallDirectoryPackage/default.nix
Normal file
17
pkgs/test/dhall/generateDhallDirectoryPackage/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ dhallPackages, fetchFromGitHub }:
|
||||
|
||||
# This file tests that dhallPackages.generateDhallDirectoryPackage works.
|
||||
#
|
||||
# TODO: It would be nice to extend this test to make sure that the resulting
|
||||
# Nix file has the expected contents, but it might be tough to do that easily
|
||||
# without IFD.
|
||||
|
||||
dhallPackages.generateDhallDirectoryPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdepillabout";
|
||||
repo = "example-dhall-nix";
|
||||
rev = "e6a675c72ecd4dd23d254a02aea8181fe875747f";
|
||||
sha256 = "sha256-c/EZq76s/+hmLkaeJWKqgh2KrHuJRYI6kWry0E0YQ6s=";
|
||||
};
|
||||
file = "mydhallfile.dhall";
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exfatprogs";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19pbybgbfnvjb3n944ihrn1r8ch4dm8dr0d44d6w7p63dcp372xy";
|
||||
sha256 = "sha256-idP3wEGGJcSH4DDFLj1XPRKcLkFEsvtv0ytK89bmj5I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook file ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fselect";
|
||||
version = "0.7.7";
|
||||
version = "0.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jhspetersson";
|
||||
repo = "fselect";
|
||||
rev = version;
|
||||
sha256 = "sha256-1UpY32itljkpkOjcVEcpZ0iN+PciEnG9tOpbInHwNus=";
|
||||
sha256 = "sha256-L5Ka4nbzLAdiHigb9ByTonCmACtyWgduWOmp9tCqrz8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-M8hnXHVfKK/aQGXlMpuhoTLalpnHjxSkX+LHwpatu90=";
|
||||
cargoSha256 = "sha256-kyA/d9h/FCiX/AliIaMvkNNPqzl19v2WPEYcRWuivNU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jdupes";
|
||||
version = "1.20.1";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbruchon";
|
||||
repo = "jdupes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qGYMLLksbC6bKbK+iRkZ2eSNU5J/wEvTfzT0IkKukvA=";
|
||||
sha256 = "sha256-3hKO+hNwYiJZ9Wn53vM7DHZmtvDhtgtSbW7bCMCT7s0=";
|
||||
# Unicode file names lead to different checksums on HFS+ vs. other
|
||||
# filesystems because of unicode normalisation. The testdir
|
||||
# directories have such files and will be removed.
|
||||
|
|
|
|||
0
pkgs/tools/misc/jsonwatch/default.nix
Normal file
0
pkgs/tools/misc/jsonwatch/default.nix
Normal file
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kepubify";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgaskin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZQY5U9uMCwsMl3Ds3bscPYmTt8JdWehOoowb+AmJSbQ=";
|
||||
sha256 = "sha256-w48ln6xlxdUVMdLuprtnAx36liC8QuXAaJpOfnpv9AM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-DcE2MCbH5FIU1UoIF8OF17TfsWS5eQhHnWDEAxy8X6c=";
|
||||
vendorSha256 = "sha256-gCdCAlJ5h40zi3w1S6NZZVB2iEx4F7cVLDn4pOr9JWA=";
|
||||
|
||||
# remove when built with >= go 1.17
|
||||
tags = [ "zip117" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gobgp";
|
||||
version = "2.32.0";
|
||||
version = "2.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osrg";
|
||||
repo = "gobgp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+FVd/I1folRswTPIq09xpTCai4+FVa6TYDsaPE8sYR4=";
|
||||
sha256 = "sha256-xyakq5DXwzONEP6EvDpAuzCrTDWcs+7asDlq9Vf4c1k=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cosign";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K9ZORbccEH7KV0XHkio/fl/5kvUInRCvzFY4QOqrgfg=";
|
||||
sha256 = "sha256-KavhcBxn0099ZSd7wdIfMYnYhbmuRpc7+FTfdm1T71c=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
vendorSha256 = "sha256-958HDdd9o+paEHVvwWSFJGSIHuY63jf89rTw3QKJzxc=";
|
||||
vendorSha256 = "sha256-7fWSGj8Ex8nPpMr3Foryiu25gBvzeZfVeMwZ3QKsm8E=";
|
||||
|
||||
excludedPackages = "\\(sample\\|webhook\\|help\\)";
|
||||
|
||||
|
|
@ -29,6 +29,10 @@ buildGoModule rec {
|
|||
--bash <($out/bin/cosign completion bash) \
|
||||
--fish <($out/bin/cosign completion fish) \
|
||||
--zsh <($out/bin/cosign completion zsh)
|
||||
installShellCompletion --cmd sget \
|
||||
--bash <($out/bin/sget completion bash) \
|
||||
--fish <($out/bin/sget completion fish) \
|
||||
--zsh <($out/bin/sget completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
}:
|
||||
|
||||
let
|
||||
sha256 = "1kvlf9qcl0i7g24s9f2pj25msmlj0cjicjwrnnc65q8qkmk2br9q";
|
||||
sha256 = "10mlkkprky7qqjrkv43v1lzmlgdjpkzy3729k9xxdm5mpq5bjdwj";
|
||||
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
|
||||
specVersion = "4.108.0";
|
||||
specSha256 = "17n9wjd0hpkzc2bvsawdvl8hc5285r0n19xq59h4amqb2fhp676w";
|
||||
specVersion = "4.111.0";
|
||||
specSha256 = "0j1i4ig1gwvwg2vfydpkh5skdirmbbfqbrznaq6v7sz35bk7carl";
|
||||
spec = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
|
||||
sha256 = specSha256;
|
||||
|
|
@ -24,7 +24,7 @@ in
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "linode-cli";
|
||||
version = "5.12.0";
|
||||
version = "5.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linode";
|
||||
|
|
|
|||
|
|
@ -301,9 +301,11 @@ with pkgs;
|
|||
|
||||
crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { };
|
||||
|
||||
dhallToNix = callPackage ../build-support/dhall-to-nix.nix {
|
||||
inherit dhall-nix;
|
||||
};
|
||||
dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };
|
||||
|
||||
dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { };
|
||||
|
||||
dhallToNix = callPackage ../build-support/dhall/to-nix.nix { };
|
||||
|
||||
deadcode = callPackage ../development/tools/deadcode { };
|
||||
|
||||
|
|
@ -13286,6 +13288,8 @@ with pkgs;
|
|||
|
||||
dhall-nix = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-nix;
|
||||
|
||||
dhall-nixpkgs = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-nixpkgs;
|
||||
|
||||
dhall-text = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-text;
|
||||
|
||||
dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { });
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@ let
|
|||
buildDhallUrl =
|
||||
callPackage ../development/interpreters/dhall/build-dhall-url.nix { };
|
||||
|
||||
generateDhallDirectoryPackage =
|
||||
callPackage ../development/interpreters/dhall/generate-dhall-directory-package.nix { };
|
||||
|
||||
in
|
||||
{ inherit
|
||||
callPackage
|
||||
|
|
@ -27,6 +30,7 @@ let
|
|||
buildDhallGitHubPackage
|
||||
buildDhallDirectoryPackage
|
||||
buildDhallUrl
|
||||
generateDhallDirectoryPackage
|
||||
;
|
||||
|
||||
lib = import ../development/dhall-modules/lib.nix { inherit lib; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue