Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
686eebd97e
@ -12955,6 +12955,12 @@
|
||||
fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5";
|
||||
}];
|
||||
};
|
||||
zbioe = {
|
||||
name = "Iury Fukuda";
|
||||
email = "zbioe@protonmail.com";
|
||||
github = "zbioe";
|
||||
githubId = 7332055;
|
||||
};
|
||||
zenithal = {
|
||||
name = "zenithal";
|
||||
email = "i@zenithal.me";
|
||||
|
||||
@ -1170,6 +1170,12 @@ Superuser created successfully.
|
||||
will no longer work and must be updated.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Nextcloud 20 (<literal>pkgs.nextcloud20</literal>) has been
|
||||
dropped because it was EOLed by upstream in 2021-10.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-notable-changes">
|
||||
|
||||
@ -360,6 +360,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- The `services.mosquitto` module has been rewritten to support multiple listeners and per-listener configuration.
|
||||
Module configurations from previous releases will no longer work and must be updated.
|
||||
|
||||
- Nextcloud 20 (`pkgs.nextcloud20`) has been dropped because it was EOLed by upstream in 2021-10.
|
||||
|
||||
## Other Notable Changes {#sec-release-21.11-notable-changes}
|
||||
|
||||
|
||||
|
||||
@ -428,7 +428,7 @@ let
|
||||
${optionalString config.security.pam.enableEcryptfs
|
||||
"auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
|
||||
${optionalString cfg.pamMount
|
||||
"auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
|
||||
"auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive"}
|
||||
${optionalString cfg.enableKwallet
|
||||
("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +
|
||||
" kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}
|
||||
@ -489,7 +489,7 @@ let
|
||||
${optionalString config.security.pam.enableEcryptfs
|
||||
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
|
||||
${optionalString cfg.pamMount
|
||||
"session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
|
||||
"session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive"}
|
||||
${optionalString use_ldap
|
||||
"session optional ${pam_ldap}/lib/security/pam_ldap.so"}
|
||||
${optionalString config.services.sssd.enable
|
||||
|
||||
@ -344,7 +344,7 @@ in {
|
||||
authenticate = lib.mkOption {
|
||||
description = "Authenticate with the SMTP server using username and password.";
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
};
|
||||
|
||||
host = lib.mkOption {
|
||||
@ -596,6 +596,7 @@ in {
|
||||
|
||||
services.postfix = lib.mkIf (cfg.smtp.createLocally && cfg.smtp.host == "127.0.0.1") {
|
||||
enable = true;
|
||||
hostname = lib.mkDefault "${cfg.localDomain}";
|
||||
};
|
||||
services.redis = lib.mkIf (cfg.redis.createLocally && cfg.redis.host == "127.0.0.1") {
|
||||
enable = true;
|
||||
|
||||
@ -153,7 +153,7 @@ in {
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
description = "Which package to use for the Nextcloud instance.";
|
||||
relatedPackages = [ "nextcloud20" "nextcloud21" "nextcloud22" ];
|
||||
relatedPackages = [ "nextcloud21" "nextcloud22" ];
|
||||
};
|
||||
phpPackage = mkOption {
|
||||
type = types.package;
|
||||
@ -507,13 +507,7 @@ in {
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
{ assertions = let acfg = cfg.config; in [
|
||||
{ assertion = versionOlder cfg.package.version "21" -> cfg.config.defaultPhoneRegion == null;
|
||||
message = "The `defaultPhoneRegion'-setting is only supported for Nextcloud >=21!";
|
||||
}
|
||||
];
|
||||
|
||||
warnings = let
|
||||
{ warnings = let
|
||||
latest = 22;
|
||||
upgradeWarning = major: nixos:
|
||||
''
|
||||
@ -547,7 +541,6 @@ in {
|
||||
Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
|
||||
Please migrate your configuration to config.services.nextcloud.poolSettings.
|
||||
'')
|
||||
++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05"))
|
||||
++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05"))
|
||||
++ (optional (versionOlder cfg.package.version "22") (upgradeWarning 21 "21.11"))
|
||||
++ (optional isUnsupportedMariadb ''
|
||||
@ -574,7 +567,11 @@ in {
|
||||
# This versionOlder statement remains set to 21.03 for backwards compatibility.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/108899 and
|
||||
# https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.
|
||||
else if versionOlder stateVersion "21.03" then nextcloud19
|
||||
# FIXME(@Ma27) remove this else-if as soon as 21.05 is EOL! This is only here
|
||||
# to ensure that users who are on Nextcloud 19 with a stateVersion <21.05 with
|
||||
# no explicit services.nextcloud.package don't upgrade to v21 by accident (
|
||||
# nextcloud20 throws an eval-error because it's dropped).
|
||||
else if versionOlder stateVersion "21.03" then nextcloud20
|
||||
else if versionOlder stateVersion "21.11" then nextcloud21
|
||||
else nextcloud22
|
||||
);
|
||||
|
||||
@ -157,6 +157,7 @@ in
|
||||
gobgpd = handleTest ./gobgpd.nix {};
|
||||
gocd-agent = handleTest ./gocd-agent.nix {};
|
||||
gocd-server = handleTest ./gocd-server.nix {};
|
||||
google-cloud-sdk = handleTest ./google-cloud-sdk.nix {};
|
||||
google-oslogin = handleTest ./google-oslogin {};
|
||||
gotify-server = handleTest ./gotify-server.nix {};
|
||||
grafana = handleTest ./grafana.nix {};
|
||||
|
||||
13
nixos/tests/google-cloud-sdk.nix
Normal file
13
nixos/tests/google-cloud-sdk.nix
Normal file
@ -0,0 +1,13 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "google-cloud-sdk";
|
||||
meta = with pkgs.lib.maintainers; { maintainers = [ iammrinal0 ]; };
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.google-cloud-sdk ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import json
|
||||
assert "${pkgs.google-cloud-sdk.version}" in json.loads(machine.succeed("gcloud version --format json"))["Google Cloud SDK"]
|
||||
'';
|
||||
})
|
||||
@ -68,7 +68,7 @@ in makeTest {
|
||||
testScript =
|
||||
''
|
||||
def create_named_machine(name):
|
||||
return create_machine(
|
||||
machine = create_machine(
|
||||
{
|
||||
"qemuFlags": "-cpu max ${
|
||||
if system == "x86_64-linux" then "-m 1024"
|
||||
@ -78,6 +78,8 @@ in makeTest {
|
||||
"name": name,
|
||||
}
|
||||
)
|
||||
driver.machines.append(machine)
|
||||
return machine
|
||||
|
||||
|
||||
# Install NixOS
|
||||
|
||||
@ -18,4 +18,4 @@ foldl
|
||||
};
|
||||
})
|
||||
{}
|
||||
[ 20 21 22 ]
|
||||
[ 21 22 ]
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mpdevil";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoongNoonien";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1wa5wkkv8kvzlxrhqmmhjmrzcm5v2dij516dk4vlpv9sazc6gzkm";
|
||||
sha256 = "1zx129zl6bjb0j3f81yx2641nsj6ck04q5f0v0g8f08xgdwsyv3b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,60 +1,56 @@
|
||||
{ stdenv
|
||||
, dpkg
|
||||
, lib
|
||||
, autoPatchelfHook
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, gtk3
|
||||
, glib
|
||||
, desktop-file-utils
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, alsa-lib
|
||||
, libjack2
|
||||
, harfbuzz
|
||||
, fribidi
|
||||
, pango
|
||||
, freetype
|
||||
, libglvnd
|
||||
, curl
|
||||
, libXcursor
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libjack2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tonelib-jam";
|
||||
version = "4.6.6";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.tonelib.net/download/0509/ToneLib-Jam-amd64.deb";
|
||||
sha256 = "sha256-cizIQgO35CQSLme/LKQqP+WzB/jCTk+fS5Z+EtF7wnQ=";
|
||||
url = "https://www.tonelib.net/download/0930/ToneLib-Jam-amd64.deb";
|
||||
sha256 = "sha256-xyBDp3DQVC+nK2WGnvrfUfD+9GvwtbldXgExTMmCGw0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
dpkg
|
||||
gtk3
|
||||
glib
|
||||
desktop-file-utils
|
||||
alsa-lib
|
||||
libjack2
|
||||
harfbuzz
|
||||
fribidi
|
||||
pango
|
||||
freetype
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir -p $TMP/ $out/
|
||||
dpkg -x $src $TMP
|
||||
'';
|
||||
buildInputs = [
|
||||
stdenv.cc.cc.lib
|
||||
alsa-lib
|
||||
freetype
|
||||
libglvnd
|
||||
] ++ runtimeDependencies;
|
||||
|
||||
runtimeDependencies = map lib.getLib [
|
||||
curl
|
||||
libXcursor
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libjack2
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg -x $curSrc source";
|
||||
|
||||
installPhase = ''
|
||||
cp -R $TMP/usr/* $out/
|
||||
mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam
|
||||
mv usr $out
|
||||
substituteInPlace $out/share/applications/ToneLib-Jam.desktop --replace /usr/ $out/
|
||||
'';
|
||||
|
||||
runtimeDependencies = [
|
||||
(lib.getLib curl)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ToneLib Jam – the learning and practice software for guitar players";
|
||||
homepage = "https://tonelib.net/";
|
||||
|
||||
@ -47,6 +47,8 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.areca-backup.org/";
|
||||
description = "An Open Source personal backup solution";
|
||||
# Builds fine but fails to launch.
|
||||
broken = true;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = with platforms; linux;
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eclair";
|
||||
version = "0.6.1";
|
||||
revision = "d3ae323";
|
||||
version = "0.6.2";
|
||||
revision = "6817d6f";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip";
|
||||
sha256 = "0hmdssj6pxhvadrgr1svb2lh7hfbd2axr5wsl7glizv1a21g0l2c";
|
||||
sha256 = "038r9mblm2r8mkxnv65k29r7xj22dff5gmvzv9xiy5zf9i45mmk8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jq openjdk11 ];
|
||||
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/ACINQ/eclair";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,8 +17,8 @@ let
|
||||
sha256Hash = "1j1fxl4vzq3bln2z9ycxn9imjgy55yd1nbl7ycmsi90bdp96pzj0";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "2021.2.1.1"; # "Android Studio Chipmunk (2021.2.1) Canary 1"
|
||||
sha256Hash = "1fn0jv6ybgdhgpwhamw16fjqbg2961ir9jhbjzanysi7y3935nbv";
|
||||
version = "2021.2.1.2"; # "Android Studio Chipmunk (2021.2.1) Canary 2"
|
||||
sha256Hash = "0xvn9zgn4cc9lhjynhiavmvx8bdzg4kcllmhg7xv18kp6wz4lh6z";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.146.0";
|
||||
version = "1.148.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-YK4nLQvRdgS7hq5a9uVfVjUAgkM/sYXiKjbt0QNzcok=";
|
||||
sha256 = "sha256-/wvtIPF/1HneW0zuT7+VCixemkw91MdU0S66bz2y48U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.09.14",
|
||||
"sha256": "sha256-j69UkRNdVdzMITBHMT1QwAsYX9S0fts5/0PCroCGtL8="
|
||||
"rev": "2021.10.19",
|
||||
"sha256": "sha256-NO1q4qDXZ0x0G6AtcRP9xnFDWuBzOvxq8G7I76LgaBw="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.10.03",
|
||||
"sha256": "sha256-JGw/GbQNLAgHhDm/EgCGvzPpd8rqQo2FhmAL51XIekw="
|
||||
"rev": "2021.10.27",
|
||||
"sha256": "sha256-7DlnO7IeCFLU1A+HJt4CFXoHWfhAr52tBvfPNHieXMM="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
@ -26,8 +26,8 @@
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.10.03",
|
||||
"sha256": "sha256-Kbjzn4Rp+/oTNgFMlzlkQEeob0Z4VidqJ/+wuNHS580="
|
||||
"rev": "2021.10.21",
|
||||
"sha256": "sha256-RyRpHihmmr/EeVWk9CR0S3pvKy0FzqLZNGti33+4fkI="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
@ -36,8 +36,8 @@
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.07.27",
|
||||
"sha256": "sha256-izCyBNRLRCizSjR7v9RhcLrQ6+aQA4eejCHFUzJ0IpE="
|
||||
"rev": "2021.10.27",
|
||||
"sha256": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA="
|
||||
},
|
||||
"Emmet-Pascal": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, dxflib
|
||||
, eigen
|
||||
@ -20,9 +19,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "cloudcompare";
|
||||
# Released version doesn't work with packaged PCL
|
||||
# because it's too new. Considering that a release
|
||||
# is a year ago it's unreasonable to wait for it.
|
||||
# Released version(v2.11.3) doesn't work with packaged PCL.
|
||||
version = "unstable-2021-10-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper, fetchpatch
|
||||
, pkg-config, which, perl, libXrandr
|
||||
, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
|
||||
, wayland, wayland-protocols
|
||||
@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-BWbvGetXXCXbfPRY+u6gEfzBmX8PLSnI6a5vfCByiC0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# fixes double free (https://github.com/dunst-project/dunst/issues/957)
|
||||
url = "https://github.com/dunst-project/dunst/commit/dc8efbbaff0e9ba881fa187a01bfe5c033fbdcf9.patch";
|
||||
sha256 = "sha256-xuODOFDP9Eqr3g8OtNnaMmTihhurfj2NLeZPr0TF4vY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.19.0";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ceffaa5022d76132165ca9004c1e57d7400b56c9ab3866e3bd139e2ffe38cb72";
|
||||
sha256 = "ea1a7bf908507a87edffde6d6be93b8859ab0832ca788b61690a13aa5dd52216";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -14,11 +14,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkgmap";
|
||||
version = "4808";
|
||||
version = "4810";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
|
||||
sha256 = "ooiXotpxdy99ViUQ0kFp0NoTowGEZjEoD31x+3XrW28=";
|
||||
sha256 = "j21WTEu+MTmnFrRH5B8Eb1tS2elFR715R8jhgKZ5Gmw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
, ffmpeg
|
||||
, runtimeShell
|
||||
, mesa # firefox wants gbm for drm+dmabuf
|
||||
, systemLocale ? config.i18n.defaultLocale or "en-US"
|
||||
, systemLocale ? config.i18n.defaultLocale or "en_US"
|
||||
}:
|
||||
|
||||
let
|
||||
@ -78,7 +78,12 @@ let
|
||||
|
||||
defaultSource = lib.findFirst (sourceMatches "en-US") {} sources;
|
||||
|
||||
source = lib.findFirst (sourceMatches systemLocale) defaultSource sources;
|
||||
mozLocale =
|
||||
if systemLocale == "ca_ES@valencia"
|
||||
then "ca-valencia"
|
||||
else lib.replaceStrings ["_"] ["-"] systemLocale;
|
||||
|
||||
source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
|
||||
|
||||
pname = "firefox-${channel}-bin-unwrapped";
|
||||
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iJ6+tc5nls8E/9/Jp5OS9gfJo8SJ5bN+Im/JzEYEAfI=";
|
||||
sha256 = "sha256-peBdmz/aucrKO5Vsj8WkHkpGpLm4inQHee133Zph3MM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
34
pkgs/applications/networking/cluster/kumactl/default.nix
Normal file
34
pkgs/applications/networking/cluster/kumactl/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kumactl";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
rev = version;
|
||||
sha256 = "0b554cngg2j3wnadpqwhq3dv3la8vvvzyww2diw4il4gl4j6xj0j";
|
||||
};
|
||||
|
||||
vendorSha256 = "0r26h4vp11wbl7nk3y7c22p60q7lspy8nr58khxyczdqjk6wrdjp";
|
||||
|
||||
subPackages = [ "app/kumactl" ];
|
||||
|
||||
ldflags = let
|
||||
prefix = "github.com/kumahq/kuma/pkg/version";
|
||||
in [
|
||||
"-s" "-w"
|
||||
"-X ${prefix}.version=${version}"
|
||||
"-X ${prefix}.gitTag=${version}"
|
||||
"-X ${prefix}.gitCommit=${version}"
|
||||
"-X ${prefix}.buildDate=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kuma service mesh controller";
|
||||
homepage = "https://kuma.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zbioe ];
|
||||
};
|
||||
}
|
||||
@ -1,15 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "terranix";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrVanDalo";
|
||||
repo = "terranix";
|
||||
rev = version;
|
||||
sha256 = "030067h3gjc02llaa7rx5iml0ikvw6szadm0nrss2sqzshsfimm4";
|
||||
sha256 = "sha256-3N4a5VhZqIgJW11w8oJKJ9T8mhfwEM33kEwV/zZkCs8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -23,7 +23,7 @@ let
|
||||
--set LC_MESSAGES "${spellcheckerLanguage}"'');
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.20.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.21.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "0a57gajxjqkp7zcmjc3iiys06b7v53nd81gkwrsfn2gmshihlzkd";
|
||||
sha256 = "19bp5gjf13n87cyicqaikmz3bdx6szazq1kbp4gkyhq0mw7nah7c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.8.0.16";
|
||||
version = "5.8.3.145";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
sha256 = "1axnh81bf3ab5gzxxqm172wpqlpfbj9a2h3cry3kyxzmrihzbwdm";
|
||||
sha256 = "1p4agpbcpk95r04m775dr17fmlm18vxq9mb65pyfbhvsd1ypw6kr";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -5,6 +5,6 @@ set -eu -o pipefail
|
||||
|
||||
version="$(curl -Ls https://zoom.us/download\?os\=linux | \
|
||||
pup '.linux-ver-text text{}' | \
|
||||
awk -F'[ ().]' '{printf $2"."$3"."$6"."$7"\n"}')"
|
||||
awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
|
||||
|
||||
update-source-version zoom-us "$version"
|
||||
|
||||
@ -7,25 +7,15 @@ python3Packages.buildPythonApplication rec {
|
||||
pname = "stig";
|
||||
# This project has a different concept for pre release / alpha,
|
||||
# Read the project's README for details: https://github.com/rndusr/stig#stig
|
||||
version = "0.11.2a0";
|
||||
version = "0.12.2a0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rndusr";
|
||||
repo = "stig";
|
||||
rev = "v${version}";
|
||||
sha256 = "05dn6mr86ly65gdqarl16a2jk1bwiw5xa6r4kyag3s6lqsv66iw8";
|
||||
sha256 = "0sk4vgj3cn75nyrng2d6q0pj1h968kcmbpr9sv1lj1g8fc7g0n4f";
|
||||
};
|
||||
|
||||
# urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged
|
||||
# in nixpkgs) is not uploaded to pypi and 1.0.1 has a problematic `setup.py`.
|
||||
# As long as we don't have any problems installing it, no special features / specific bugs
|
||||
# were fixed in 1.0.3 that aren't available in 1.0.2 are used by stig.
|
||||
# See https://github.com/rndusr/stig/issues/120
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "urwidtrees>=1.0.3dev0" "urwidtrees"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
urwid
|
||||
urwidtrees
|
||||
@ -62,7 +52,7 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "TUI and CLI for the BitTorrent client Transmission";
|
||||
homepage = "https://github.com/rndusr/stig";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "zim";
|
||||
version = "0.73.5";
|
||||
version = "0.74.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
|
||||
sha256 = "sha256-o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo=";
|
||||
sha256 = "sha256-tZxBlpps2nLThSOq3WJ42iUQ4NG1Lb463bvDQ+djZJA=";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ];
|
||||
|
||||
32
pkgs/applications/office/zk/default.nix
Normal file
32
pkgs/applications/office/zk/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule, icu }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zk";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mickael-menu";
|
||||
repo = "zk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C3/V4v8lH4F3S51egEw5d51AI0n5xzBQjwhrI64FEGA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-m7QGv8Vx776TsN7QHXtO+yl3U1D573UMZVyg1B4UeIk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ icu ];
|
||||
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Build=${version}" ];
|
||||
|
||||
tags = [ "fts5" "icu" ];
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ pinpox ];
|
||||
license = licenses.gpl3;
|
||||
description = "A zettelkasten plain text note-taking assistant";
|
||||
homepage = "https://github.com/mickael-menu/zk";
|
||||
};
|
||||
}
|
||||
@ -8,6 +8,7 @@
|
||||
, openssl
|
||||
, gflags
|
||||
, gnuradio3_8
|
||||
, thrift
|
||||
, libpcap
|
||||
, orc
|
||||
, pkg-config
|
||||
@ -21,6 +22,8 @@
|
||||
|
||||
gnuradio3_8.pkgs.mkDerivation rec {
|
||||
pname = "gnss-sdr";
|
||||
# There's an issue with cpufeatures on 0.0.15, see:
|
||||
# https://github.com/NixOS/nixpkgs/pull/142557#issuecomment-950217925
|
||||
version = "0.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -56,6 +59,9 @@ gnuradio3_8.pkgs.mkDerivation rec {
|
||||
protobuf
|
||||
gnuradio3_8.pkgs.osmosdr
|
||||
libpcap
|
||||
] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
gnuradio3_8.unwrapped.python.pkgs.thrift
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -44,8 +44,6 @@
|
||||
minor = "14";
|
||||
patch = "0";
|
||||
}
|
||||
# We use our build of volk and not the one bundled with the release
|
||||
, fetchSubmodules ? false
|
||||
}:
|
||||
|
||||
let
|
||||
@ -213,7 +211,6 @@ let
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
fetchSubmodules
|
||||
;
|
||||
qt = qt4;
|
||||
gtk = gtk2;
|
||||
@ -238,34 +235,34 @@ stdenv.mkDerivation rec {
|
||||
passthru = shared.passthru // {
|
||||
# Deps that are potentially overriden and are used inside GR plugins - the same version must
|
||||
inherit boost volk;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd" features) {
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
};
|
||||
cmakeFlags = shared.cmakeFlags
|
||||
# From some reason, if these are not set, libcodec2 and gsm are
|
||||
# not detected properly (slightly different then what's in
|
||||
# ./default.nix).
|
||||
++ lib.optionals (hasFeature "gr-vocoder" features) [
|
||||
++ lib.optionals (hasFeature "gr-vocoder") [
|
||||
"-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"
|
||||
"-DLIBCODEC2_INCLUDE_DIR=${codec2}/include"
|
||||
"-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"
|
||||
"-DLIBGSM_INCLUDE_DIR=${gsm}/include/gsm"
|
||||
]
|
||||
++ lib.optionals (hasFeature "volk" features && volk != null) [
|
||||
++ lib.optionals (hasFeature "volk" && volk != null) [
|
||||
"-DENABLE_INTERNAL_VOLK=OFF"
|
||||
]
|
||||
;
|
||||
stripDebugList = shared.stripDebugList
|
||||
# gr-fcd feature was dropped in 3.8
|
||||
++ lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ]
|
||||
++ lib.optionals (hasFeature "gr-fcd") [ "share/gnuradio/examples/fcd" ]
|
||||
;
|
||||
preConfigure = ""
|
||||
# wxgui and pygtk are not looked up properly, so we force them to be
|
||||
# detected as found, if they are requested by the `features` attrset.
|
||||
+ lib.optionalString (hasFeature "gr-wxgui" features) ''
|
||||
+ lib.optionalString (hasFeature "gr-wxgui") ''
|
||||
sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt
|
||||
''
|
||||
+ lib.optionalString (hasFeature "gnuradio-companion" features) ''
|
||||
+ lib.optionalString (hasFeature "gnuradio-companion") ''
|
||||
sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt
|
||||
''
|
||||
;
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
# Remove gcc and python references
|
||||
, removeReferencesTo
|
||||
@ -15,6 +16,7 @@
|
||||
, python
|
||||
, codec2
|
||||
, gsm
|
||||
, thrift
|
||||
, fftwFloat
|
||||
, alsa-lib
|
||||
, libjack2
|
||||
@ -41,15 +43,13 @@
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.8";
|
||||
minor = "3";
|
||||
patch = "1";
|
||||
minor = "4";
|
||||
patch = "0";
|
||||
}
|
||||
# We use our build of volk and not the one bundled with the release
|
||||
, fetchSubmodules ? false
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "0vd39azp8n576dbqsanax7bgsnxwc80riaxid2ihxs4xzyjmbw9r";
|
||||
sourceSha256 = "sha256-C8S3iF7vj9A8SpxriW9y7idrhXzonvenoQtVAMex+Iw=";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
@ -65,7 +65,7 @@ let
|
||||
]
|
||||
# when gr-qtgui is disabled, icu needs to be included, otherwise
|
||||
# building with boost 1.7x fails
|
||||
++ lib.optionals (!(hasFeature "gr-qtgui" features)) [ icu ];
|
||||
++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
|
||||
pythonNative = with python.pkgs; [
|
||||
Mako
|
||||
six
|
||||
@ -101,13 +101,19 @@ let
|
||||
cmakeEnableFlag = "GNURADIO_RUNTIME";
|
||||
};
|
||||
gr-ctrlport = {
|
||||
# Thrift support is not really working well, and even the patch they
|
||||
# recommend applying on 0.9.2 won't apply. See:
|
||||
# https://github.com/gnuradio/gnuradio/blob/v3.8.2.0/gnuradio-runtime/lib/controlport/thrift/README
|
||||
cmakeEnableFlag = "GR_CTRLPORT";
|
||||
native = [
|
||||
swig
|
||||
];
|
||||
runtime = [
|
||||
thrift
|
||||
];
|
||||
pythonRuntime = with python.pkgs; [
|
||||
python.pkgs.thrift
|
||||
# For gr-perf-monitorx
|
||||
matplotlib
|
||||
networkx
|
||||
];
|
||||
};
|
||||
gnuradio-companion = {
|
||||
pythonRuntime = with python.pkgs; [
|
||||
@ -171,9 +177,14 @@ let
|
||||
};
|
||||
gr-utils = {
|
||||
cmakeEnableFlag = "GR_UTILS";
|
||||
pythonRuntime = with python.pkgs; [
|
||||
# For gr_plot
|
||||
matplotlib
|
||||
];
|
||||
};
|
||||
gr-modtool = {
|
||||
pythonRuntime = with python.pkgs; [
|
||||
setuptools
|
||||
click
|
||||
click-plugins
|
||||
];
|
||||
@ -208,7 +219,6 @@ let
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
fetchSubmodules
|
||||
;
|
||||
qt = qt5;
|
||||
gtk = gtk3;
|
||||
@ -230,12 +240,21 @@ stdenv.mkDerivation rec {
|
||||
dontWrapQtApps
|
||||
meta
|
||||
;
|
||||
patches = [
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.3_8.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/gnuradio/gnuradio/pull/5226
|
||||
url = "https://github.com/gnuradio/gnuradio/commit/9d7343526dd793120b6425cd9a6969416ed32503.patch";
|
||||
sha256 = "sha256-usSoRDDuClUfdX4yFbQNu8wDzve6UEhZYTFj1oZbFic=";
|
||||
})
|
||||
];
|
||||
passthru = shared.passthru // {
|
||||
# Deps that are potentially overriden and are used inside GR plugins - the same version must
|
||||
inherit boost volk;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd" features) {
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui" features) {
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
inherit (libsForQt5) qwt;
|
||||
};
|
||||
cmakeFlags = shared.cmakeFlags
|
||||
@ -246,7 +265,7 @@ stdenv.mkDerivation rec {
|
||||
#
|
||||
# NOTE: qradiolink needs libcodec2 to be detected in
|
||||
# order to build, see https://github.com/qradiolink/qradiolink/issues/67
|
||||
++ lib.optionals (hasFeature "gr-vocoder" features) [
|
||||
++ lib.optionals (hasFeature "gr-vocoder") [
|
||||
"-DLIBCODEC2_FOUND=TRUE"
|
||||
"-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"
|
||||
"-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
|
||||
@ -255,7 +274,7 @@ stdenv.mkDerivation rec {
|
||||
"-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"
|
||||
"-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
|
||||
]
|
||||
++ lib.optionals (hasFeature "volk" features && volk != null) [
|
||||
++ lib.optionals (hasFeature "volk" && volk != null) [
|
||||
"-DENABLE_INTERNAL_VOLK=OFF"
|
||||
]
|
||||
;
|
||||
@ -263,7 +282,7 @@ stdenv.mkDerivation rec {
|
||||
postInstall = shared.postInstall
|
||||
# This is the only python reference worth removing, if needed (3.7 doesn't
|
||||
# set that reference).
|
||||
+ lib.optionalString (!hasFeature "python-support" features) ''
|
||||
+ lib.optionalString (!hasFeature "python-support") ''
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
|
||||
''
|
||||
;
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
, libsodium
|
||||
, libsndfile
|
||||
, libunwind
|
||||
, thrift
|
||||
, cppzmq
|
||||
, zeromq
|
||||
# Needed only if qt-gui is disabled, from some reason
|
||||
@ -45,14 +46,13 @@
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.9";
|
||||
minor = "2";
|
||||
minor = "3";
|
||||
patch = "0";
|
||||
}
|
||||
, fetchSubmodules ? false
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "01wyqazrpphmb0fl69j93k0w4vm4d1l4177m1fyg7qx8hzia0aaq";
|
||||
sourceSha256 = "sha256-jVfExv1CcnlOaaj/XtnfhWAHnQsshZJ1l/zXo0uovdo=";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
@ -69,7 +69,7 @@ let
|
||||
]
|
||||
# when gr-qtgui is disabled, icu needs to be included, otherwise
|
||||
# building with boost 1.7x fails
|
||||
++ lib.optionals (!(hasFeature "gr-qtgui" features)) [ icu ];
|
||||
++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
|
||||
pythonNative = with python.pkgs; [
|
||||
Mako
|
||||
six
|
||||
@ -100,11 +100,15 @@ let
|
||||
];
|
||||
};
|
||||
gr-ctrlport = {
|
||||
# Thrift support is not really working well, and even the patch they
|
||||
# recommend applying on 0.9.2 won't apply. See:
|
||||
# https://github.com/gnuradio/gnuradio/blob/v3.9.0.0/gnuradio-runtime/lib/controlport/thrift/README
|
||||
runtime = [
|
||||
libunwind
|
||||
thrift
|
||||
];
|
||||
pythonRuntime = with python.pkgs; [
|
||||
python.pkgs.thrift
|
||||
# For gr-perf-monitorx
|
||||
matplotlib
|
||||
networkx
|
||||
];
|
||||
cmakeEnableFlag = "GR_CTRLPORT";
|
||||
};
|
||||
@ -140,6 +144,10 @@ let
|
||||
gr-filter = {
|
||||
runtime = [ fftwFloat ];
|
||||
cmakeEnableFlag = "GR_FILTER";
|
||||
pythonRuntime = with python.pkgs; [
|
||||
scipy
|
||||
pyqtgraph
|
||||
];
|
||||
};
|
||||
gr-analog = {
|
||||
cmakeEnableFlag = "GR_ANALOG";
|
||||
@ -174,11 +182,22 @@ let
|
||||
];
|
||||
cmakeEnableFlag = "GR_UHD";
|
||||
};
|
||||
gr-uhd-rfnoc = {
|
||||
runtime = [
|
||||
uhd
|
||||
];
|
||||
cmakeEnableFlag = "UHD_RFNOC";
|
||||
};
|
||||
gr-utils = {
|
||||
cmakeEnableFlag = "GR_UTILS";
|
||||
pythonRuntime = with python.pkgs; [
|
||||
# For gr_plot
|
||||
matplotlib
|
||||
];
|
||||
};
|
||||
gr-modtool = {
|
||||
pythonRuntime = with python.pkgs; [
|
||||
setuptools
|
||||
click
|
||||
click-plugins
|
||||
];
|
||||
@ -225,7 +244,6 @@ let
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
fetchSubmodules
|
||||
;
|
||||
qt = qt5;
|
||||
gtk = gtk3;
|
||||
@ -248,18 +266,27 @@ stdenv.mkDerivation rec {
|
||||
dontWrapQtApps
|
||||
meta
|
||||
;
|
||||
patches = [
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/gnuradio/gnuradio/pull/5225
|
||||
url = "https://github.com/gnuradio/gnuradio/commit/4cef46e3ea0faf04e05ca1a5846cd1568fa51bb2.patch";
|
||||
sha256 = "sha256-6AlGbtD1S0c3I9JSoLTMP4YqwDU17i2j+XRkuR+QTuc=";
|
||||
})
|
||||
];
|
||||
passthru = shared.passthru // {
|
||||
# Deps that are potentially overriden and are used inside GR plugins - the same version must
|
||||
inherit boost volk;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd" features) {
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui" features) {
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
inherit (libsForQt5) qwt;
|
||||
};
|
||||
|
||||
postInstall = shared.postInstall
|
||||
# This is the only python reference worth removing, if needed.
|
||||
+ lib.optionalString (!hasFeature "python-support" features) ''
|
||||
+ lib.optionalString (!hasFeature "python-support") ''
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so)
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
commit bf870157e0a9c3d19e968afb276b4e7d96b4df30
|
||||
Author: Doron Behar <doron.behar@gmail.com>
|
||||
Date: Thu Oct 21 13:10:42 2021 +0300
|
||||
|
||||
gr-modtool: Don't copy source permissions
|
||||
|
||||
This is needed for systems such as NixOS, where the build tree isn't
|
||||
writable and the files copied should be.
|
||||
|
||||
Signed-off-by: Doron Behar <doron.behar@gmail.com>
|
||||
|
||||
diff --git a/gr-utils/python/modtool/core/newmod.py b/gr-utils/python/modtool/core/newmod.py
|
||||
index 123059907..0c734e7ae 100644
|
||||
--- a/gr-utils/python/modtool/core/newmod.py
|
||||
+++ b/gr-utils/python/modtool/core/newmod.py
|
||||
@@ -78,7 +78,9 @@ class ModToolNewModule(ModTool):
|
||||
self._setup_scm(mode='new')
|
||||
logger.info("Creating out-of-tree module in {}...".format(self.dir))
|
||||
try:
|
||||
- shutil.copytree(self.srcdir, self.dir)
|
||||
+ # https://stackoverflow.com/a/17022146/4935114
|
||||
+ shutil.copystat = lambda x, y: x
|
||||
+ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile)
|
||||
os.chdir(self.dir)
|
||||
except OSError:
|
||||
raise ModToolException('Could not create directory {}.'.format(self.dir))
|
||||
@ -0,0 +1,15 @@
|
||||
diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py
|
||||
index babebfcde..9a02f663e 100644
|
||||
--- c/gr-utils/modtool/core/newmod.py
|
||||
+++ w/gr-utils/modtool/core/newmod.py
|
||||
@@ -62,7 +62,9 @@ class ModToolNewModule(ModTool):
|
||||
self._setup_scm(mode='new')
|
||||
logger.info(f"Creating out-of-tree module in {self.dir}...")
|
||||
try:
|
||||
- shutil.copytree(self.srcdir, self.dir)
|
||||
+ # https://stackoverflow.com/a/17022146/4935114
|
||||
+ shutil.copystat = lambda x, y: x
|
||||
+ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile)
|
||||
try:
|
||||
shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'),
|
||||
os.path.join(self.dir, '.clang-format'))
|
||||
@ -11,7 +11,6 @@
|
||||
# the main expressions
|
||||
, overrideSrc
|
||||
, fetchFromGitHub
|
||||
, fetchSubmodules
|
||||
}:
|
||||
|
||||
rec {
|
||||
@ -26,12 +25,11 @@ rec {
|
||||
owner = "gnuradio";
|
||||
rev = "v${version}";
|
||||
sha256 = sourceSha256;
|
||||
inherit fetchSubmodules;
|
||||
}
|
||||
;
|
||||
# Check if a feature is enabled, while defaulting to true if feat is not
|
||||
# specified.
|
||||
hasFeature = feat: features: (
|
||||
hasFeature = feat: (
|
||||
if builtins.hasAttr feat features then
|
||||
features.${feat}
|
||||
else
|
||||
@ -39,7 +37,7 @@ rec {
|
||||
);
|
||||
nativeBuildInputs = lib.flatten (lib.mapAttrsToList (
|
||||
feat: info: (
|
||||
if hasFeature feat features then
|
||||
if hasFeature feat then
|
||||
(if builtins.hasAttr "native" info then info.native else []) ++
|
||||
(if builtins.hasAttr "pythonNative" info then info.pythonNative else [])
|
||||
else
|
||||
@ -48,7 +46,7 @@ rec {
|
||||
) featuresInfo);
|
||||
buildInputs = lib.flatten (lib.mapAttrsToList (
|
||||
feat: info: (
|
||||
if hasFeature feat features then
|
||||
if hasFeature feat then
|
||||
(if builtins.hasAttr "runtime" info then info.runtime else []) ++
|
||||
(if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else [])
|
||||
else
|
||||
@ -63,7 +61,7 @@ rec {
|
||||
# satisfied, let only our cmakeFlags decide.
|
||||
"-DENABLE_DEFAULT=OFF"
|
||||
else
|
||||
if hasFeature feat features then
|
||||
if hasFeature feat then
|
||||
"-DENABLE_${info.cmakeEnableFlag}=ON"
|
||||
else
|
||||
"-DENABLE_${info.cmakeEnableFlag}=OFF"
|
||||
@ -75,17 +73,17 @@ rec {
|
||||
stdenv.cc.cc
|
||||
]
|
||||
# If python-support is disabled, we probably don't want it referenced
|
||||
++ lib.optionals (!hasFeature "python-support" features) [ python ]
|
||||
++ lib.optionals (!hasFeature "python-support") [ python ]
|
||||
;
|
||||
# Gcc references from examples
|
||||
stripDebugList = [ "lib" "bin" ]
|
||||
++ lib.optionals (hasFeature "gr-audio" features) [ "share/gnuradio/examples/audio" ]
|
||||
++ lib.optionals (hasFeature "gr-uhd" features) [ "share/gnuradio/examples/uhd" ]
|
||||
++ lib.optionals (hasFeature "gr-qtgui" features) [ "share/gnuradio/examples/qt-gui" ]
|
||||
++ lib.optionals (hasFeature "gr-audio") [ "share/gnuradio/examples/audio" ]
|
||||
++ lib.optionals (hasFeature "gr-uhd") [ "share/gnuradio/examples/uhd" ]
|
||||
++ lib.optionals (hasFeature "gr-qtgui") [ "share/gnuradio/examples/qt-gui" ]
|
||||
;
|
||||
postInstall = ""
|
||||
# Gcc references
|
||||
+ lib.optionalString (hasFeature "gnuradio-runtime" features) ''
|
||||
+ lib.optionalString (hasFeature "gnuradio-runtime") ''
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime.so)
|
||||
''
|
||||
;
|
||||
@ -101,9 +99,9 @@ rec {
|
||||
featuresInfo
|
||||
python
|
||||
;
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui" features) {
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
inherit qt;
|
||||
} // lib.optionalAttrs (hasFeature "gnuradio-companion" features) {
|
||||
} // lib.optionalAttrs (hasFeature "gnuradio-companion") {
|
||||
inherit gtk;
|
||||
};
|
||||
# Wrapping is done with an external wrapper
|
||||
|
||||
@ -33,25 +33,20 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# We don't check if `python-support` feature is on, as it's unlikely someone
|
||||
# may wish to wrap GR without python support.
|
||||
pythonPkgs = extraPythonPackages
|
||||
++ [ (unwrapped.python.pkgs.toPythonModule unwrapped) ]
|
||||
# Add the extraPackages as python modules as well
|
||||
++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages)
|
||||
++ lib.flatten (lib.mapAttrsToList (
|
||||
feat: info: (
|
||||
if unwrapped.hasFeature feat unwrapped.features then
|
||||
if unwrapped.hasFeature feat then
|
||||
(if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else [])
|
||||
else
|
||||
[]
|
||||
)
|
||||
) unwrapped.featuresInfo)
|
||||
++ lib.optionals
|
||||
(unwrapped.hasFeature "python-support" unwrapped.features)
|
||||
(
|
||||
# Add unwrapped itself as a python module
|
||||
[ (unwrapped.python.pkgs.toPythonModule unwrapped) ]
|
||||
# Add all extraPackages as python modules
|
||||
++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages)
|
||||
)
|
||||
;
|
||||
pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs);
|
||||
|
||||
@ -60,8 +55,8 @@ let
|
||||
]
|
||||
# Emulating wrapGAppsHook & wrapQtAppsHook working together
|
||||
++ lib.optionals (
|
||||
(unwrapped.hasFeature "gnuradio-companion" unwrapped.features)
|
||||
|| (unwrapped.hasFeature "gr-qtgui" unwrapped.features)
|
||||
(unwrapped.hasFeature "gnuradio-companion")
|
||||
|| (unwrapped.hasFeature "gr-qtgui")
|
||||
) [
|
||||
"--prefix" "XDG_DATA_DIRS" ":" "$out/share"
|
||||
"--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${name}"
|
||||
@ -71,7 +66,7 @@ let
|
||||
# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1764890.html
|
||||
"--prefix" "PATH" ":" "${lib.getBin glib}/bin"
|
||||
]
|
||||
++ lib.optionals (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) [
|
||||
++ lib.optionals (unwrapped.hasFeature "gnuradio-companion") [
|
||||
"--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache"
|
||||
"--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules"
|
||||
"--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share"
|
||||
@ -94,7 +89,7 @@ let
|
||||
++ lib.optionals (extraPackages != []) [
|
||||
"--prefix" "GRC_BLOCKS_PATH" ":" "${lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}"
|
||||
]
|
||||
++ lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features)
|
||||
++ lib.optionals (unwrapped.hasFeature "gr-qtgui")
|
||||
# 3.7 builds with qt4
|
||||
(if lib.versionAtLeast unwrapped.versionAttr.major "3.8" then
|
||||
[
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, pkg-config
|
||||
, qt5
|
||||
, gnuradio3_8Minimal
|
||||
, thrift
|
||||
, log4cpp
|
||||
, mpir
|
||||
, fftwFloat
|
||||
@ -45,6 +46,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
gnuradio3_8Minimal.pkgs.osmosdr
|
||||
rtl-sdr
|
||||
hackrf
|
||||
] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
gnuradio3_8Minimal.unwrapped.python.pkgs.thrift
|
||||
] ++ lib.optionals pulseaudioSupport [ libpulseaudio ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, gnuradio3_8Minimal
|
||||
, thrift
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
@ -28,6 +29,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
fftwFloat
|
||||
liquid-dsp
|
||||
qt5.qtbase
|
||||
] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
gnuradio3_8Minimal.unwrapped.python.pkgs.thrift
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, libconfig
|
||||
# Needs a gnuradio built with qt gui support
|
||||
, gnuradio3_8
|
||||
, thrift
|
||||
# Not gnuradioPackages'
|
||||
, codec2
|
||||
, log4cpp
|
||||
@ -61,6 +62,9 @@ gnuradio3_8.pkgs.mkDerivation rec {
|
||||
libftdi
|
||||
libsndfile
|
||||
gnuradio3_8.qwt
|
||||
] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
gnuradio3_8.unwrapped.python.pkgs.thrift
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
|
||||
@ -26,6 +26,6 @@ in stdenv.mkDerivation {
|
||||
description = "SoapySDR plugin for RTL-SDR devices";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ragge ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,20 +1,19 @@
|
||||
{ lib, stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }:
|
||||
{ lib, stdenv, fetchurl, autoconf, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sherpa";
|
||||
version = "2.2.10";
|
||||
version = "2.2.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
|
||||
sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4";
|
||||
sha256 = "sha256-DrA/h/f/MjGylKxAtVMq6OLvEdb6yB7pRt8UJXNmwi0=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
|
||||
sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C
|
||||
'';
|
||||
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
nativeBuildInputs = [ autoconf gfortran ];
|
||||
|
||||
buildInputs = [ sqlite lhapdf rivet ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-70FmFN76azRqnAZ9SLgr/V8moqkWoBbDB6IdSXM7Vmg=";
|
||||
sha256 = "sha256-/czexUqpdsFQAteZ75ur2SFibrtZWffHpPBEPlLQXSY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-004TspNwjCWnrD86HEf5wGpt8OCP5qIrTwlGWSRNUmg=";
|
||||
vendorSha256 = "sha256-slMl5dCyyVNBgDbpYECfYUbpJJ7sWuSGSutYR3rTzj0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
, yajl
|
||||
, nixosTests
|
||||
, criu
|
||||
, system
|
||||
}:
|
||||
|
||||
let
|
||||
@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ libcap libseccomp systemd yajl ]
|
||||
# Criu currently only builds on x86_64-linux
|
||||
++ lib.optional (lib.elem system criu.meta.platforms) criu;
|
||||
++ lib.optional (lib.elem stdenv.hostPlatform.system criu.meta.platforms) criu;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
43
pkgs/applications/window-managers/eww/default.nix
Normal file
43
pkgs/applications/window-managers/eww/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, withWayland ? false
|
||||
, gtk-layer-shell
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eww";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elkowar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "050zc3w1z9f2vg6sz86mdxf345gd3s3jf09gf4y8y1mqkzs86b8x";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-LejnTVv9rhL9CVW1fgj2gFv4amHQeziu5uaH2ae8AAw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ gtk3 ] ++ lib.optional withWayland gtk-layer-shell;
|
||||
|
||||
cargoBuildFlags = [ "--bin" "eww" ] ++ lib.optionals withWayland [
|
||||
"--no-default-features"
|
||||
"--features=wayland"
|
||||
];
|
||||
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
# requires unstable rust features
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
meta = with lib; {
|
||||
description = "ElKowars wacky widgets";
|
||||
homepage = "https://github.com/elkowar/eww";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda legendofmiracles ];
|
||||
};
|
||||
}
|
||||
@ -31,8 +31,6 @@
|
||||
, writeText
|
||||
, writeTextDir
|
||||
, writePython3
|
||||
, system
|
||||
, # Note: This is the cross system we're compiling for
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
9
pkgs/build-support/java/canonicalize-jar.nix
Normal file
9
pkgs/build-support/java/canonicalize-jar.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ substituteAll, unzip, zip }:
|
||||
|
||||
substituteAll {
|
||||
name = "canonicalize-jar";
|
||||
src = ./canonicalize-jar.sh;
|
||||
|
||||
unzip = "${unzip}/bin/unzip";
|
||||
zip = "${zip}/bin/zip";
|
||||
}
|
||||
29
pkgs/build-support/java/canonicalize-jar.sh
Normal file
29
pkgs/build-support/java/canonicalize-jar.sh
Normal file
@ -0,0 +1,29 @@
|
||||
# Canonicalize the manifest & repack with deterministic timestamps.
|
||||
canonicalizeJar() {
|
||||
local input='' outer=''
|
||||
input="$(realpath -sm -- "$1")"
|
||||
outer="$(pwd)"
|
||||
# -qq: even quieter
|
||||
@unzip@ -qq "$input" -d "$input-tmp"
|
||||
canonicalizeJarManifest "$input-tmp/META-INF/MANIFEST.MF"
|
||||
# Sets all timestamps to Jan 1 1980, the earliest mtime zips support.
|
||||
find -- "$input-tmp" -exec touch -t 198001010000.00 {} +
|
||||
rm "$input"
|
||||
pushd "$input-tmp" 2>/dev/null
|
||||
# -q|--quiet, -r|--recurse-paths
|
||||
# -o|--latest-time: canonicalizes overall archive mtime
|
||||
# -X|--no-extra: don't store platform-specific extra file attribute fields
|
||||
@zip@ -qroX "$outer/tmp-out.jar" . 2> /dev/null
|
||||
popd 2>/dev/null
|
||||
rm -rf "$input-tmp"
|
||||
mv "$outer/tmp-out.jar" "$input"
|
||||
}
|
||||
|
||||
# See also the Java specification's JAR requirements:
|
||||
# https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html#Notes_on_Manifest_and_Signature_Files
|
||||
canonicalizeJarManifest() {
|
||||
local input=''
|
||||
input="$(realpath -sm -- "$1")"
|
||||
(head -n 1 "$input" && tail -n +2 "$input" | sort | grep -v '^\s*$') > "$input-tmp"
|
||||
mv "$input-tmp" "$input"
|
||||
}
|
||||
@ -1,123 +0,0 @@
|
||||
{ src
|
||||
, pkgs
|
||||
, lib
|
||||
, stdenv ? pkgs.stdenv
|
||||
, name
|
||||
, antTargets ? []
|
||||
, jars ? []
|
||||
, jarWrappers ? []
|
||||
, antProperties ? []
|
||||
, antBuildInputs ? []
|
||||
, buildfile ? "build.xml"
|
||||
, ant ? pkgs.ant
|
||||
, jre ? pkgs.jdk
|
||||
, hydraAntLogger ? pkgs.hydraAntLogger
|
||||
, zip ? pkgs.zip
|
||||
, unzip ? pkgs.unzip
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
antFlags = "-f ${buildfile} " + lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;
|
||||
in
|
||||
stdenv.mkDerivation (
|
||||
|
||||
{
|
||||
inherit jre ant;
|
||||
showBuildStats = true;
|
||||
|
||||
postPhases =
|
||||
["generateWrappersPhase" "finalPhase"];
|
||||
|
||||
prePhases =
|
||||
["antSetupPhase"];
|
||||
|
||||
antSetupPhase = with lib; ''
|
||||
if test "$hydraAntLogger" != "" ; then
|
||||
export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`"
|
||||
fi
|
||||
for abi in ${concatStringsSep " " (map (f: "`find ${f} -name '*.jar'`") antBuildInputs)}; do
|
||||
export ANT_ARGS="$ANT_ARGS -lib $abi"
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/java
|
||||
${ if jars == [] then ''
|
||||
find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java
|
||||
'' else lib.concatMapStrings (j: ''
|
||||
cp -v ${j} $out/share/java
|
||||
'') jars }
|
||||
|
||||
. ${./functions.sh}
|
||||
for j in $out/share/java/*.jar ; do
|
||||
canonicalizeJar $j
|
||||
echo file jar $j >> $out/nix-support/hydra-build-products
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
generateWrappersPhase =
|
||||
let
|
||||
cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/share/java/*"}'";
|
||||
in
|
||||
''
|
||||
header "Generating jar wrappers"
|
||||
'' + (lib.concatMapStrings (w: ''
|
||||
|
||||
mkdir -p $out/bin
|
||||
cat >> $out/bin/${w.name} <<EOF
|
||||
#!${pkgs.runtimeShell}
|
||||
export JAVA_HOME=$jre
|
||||
$jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@
|
||||
EOF
|
||||
|
||||
chmod a+x $out/bin/${w.name} || exit 1
|
||||
'') jarWrappers) + ''
|
||||
closeNest
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
'' + (if antTargets == [] then ''
|
||||
header "Building default ant target"
|
||||
ant ${antFlags}
|
||||
closeNest
|
||||
'' else lib.concatMapStrings (t: ''
|
||||
header "Building '${t}' target"
|
||||
ant ${antFlags} ${t}
|
||||
closeNest
|
||||
'') antTargets) + ''
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
finalPhase =
|
||||
''
|
||||
# Propagate the release name of the source tarball. This is
|
||||
# to get nice package names in channels.
|
||||
if test -e $origSrc/nix-support/hydra-release-name; then
|
||||
cp $origSrc/nix-support/hydra-release-name $out/nix-support/hydra-release-name
|
||||
fi
|
||||
'';
|
||||
}
|
||||
|
||||
// removeAttrs args ["antProperties" "buildInputs" "pkgs" "lib" "jarWrappers"] //
|
||||
|
||||
{
|
||||
name = name + (if src ? version then "-" + src.version else "");
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ant jre zip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
|
||||
|
||||
postHook = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo "$system" > $out/nix-support/system
|
||||
. ${./functions.sh}
|
||||
|
||||
origSrc=$src
|
||||
src=$(findTarball $src)
|
||||
'';
|
||||
}
|
||||
)
|
||||
@ -14,10 +14,6 @@ rec {
|
||||
{ inherit stdenv;
|
||||
} // args);
|
||||
|
||||
antBuild = args: import ./ant-build.nix (
|
||||
{ inherit lib pkgs;
|
||||
} // args);
|
||||
|
||||
mvnBuild = args: import ./maven-build.nix (
|
||||
{ inherit stdenv;
|
||||
} // args);
|
||||
|
||||
@ -11,29 +11,6 @@ findTarball() {
|
||||
fi
|
||||
}
|
||||
|
||||
canonicalizeJarManifest() {
|
||||
local input=$1
|
||||
# http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#Notes_on_Manifest_and_Signature_Files
|
||||
(head -n 1 $input && tail -n +2 $input | sort | grep -v '^\s*$') > $input-tmp
|
||||
mv $input-tmp $input
|
||||
}
|
||||
|
||||
# Post-process a jar file to contain canonical timestamps and metadata ordering
|
||||
canonicalizeJar() {
|
||||
local input=$1
|
||||
local outer=$(pwd)
|
||||
unzip -qq $input -d $input-tmp
|
||||
canonicalizeJarManifest $input-tmp/META-INF/MANIFEST.MF
|
||||
# Set all timestamps to Jan 1 1980, which is the earliest date the zip format supports...
|
||||
find $input-tmp -exec touch -t 198001010000.00 {} +
|
||||
rm $input
|
||||
pushd $input-tmp
|
||||
zip -q -r -o -X $outer/tmp-out.jar . 2> /dev/null
|
||||
popd
|
||||
rm -rf $input-tmp
|
||||
mv $outer/tmp-out.jar $input
|
||||
}
|
||||
|
||||
propagateImageName() {
|
||||
mkdir -p $out/nix-support
|
||||
cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
|
||||
|
||||
@ -22,7 +22,11 @@
|
||||
, clang
|
||||
, llvmPackages
|
||||
, linux-pam
|
||||
, cmake
|
||||
, glib
|
||||
, freetype
|
||||
, rdkafka
|
||||
, udev
|
||||
, ...
|
||||
}:
|
||||
|
||||
@ -61,6 +65,10 @@ in
|
||||
buildInputs = [ dbus ];
|
||||
};
|
||||
|
||||
expat-sys = attrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
};
|
||||
|
||||
foundationdb-sys = attrs: {
|
||||
buildInputs = [ foundationdb ];
|
||||
# needed for 0.4+ release, when the FFI bindings are auto-generated
|
||||
@ -75,6 +83,16 @@ in
|
||||
buildInputs = [ foundationdb ];
|
||||
};
|
||||
|
||||
freetype-sys = attrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ freetype ];
|
||||
};
|
||||
|
||||
glib-sys = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib ];
|
||||
};
|
||||
|
||||
gobject-sys = attrs: {
|
||||
buildInputs = [ dbus-glib ];
|
||||
};
|
||||
@ -112,6 +130,11 @@ in
|
||||
buildInputs = [ dbus ];
|
||||
};
|
||||
|
||||
libudev-sys = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
};
|
||||
|
||||
nettle-sys = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ nettle clang ];
|
||||
@ -184,6 +207,11 @@ in
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
};
|
||||
|
||||
servo-fontconfig-sys = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ freetype ];
|
||||
};
|
||||
|
||||
thrussh-libsodium = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libsodium ];
|
||||
|
||||
17
pkgs/build-support/setup-hooks/canonicalize-jars.sh
Normal file
17
pkgs/build-support/setup-hooks/canonicalize-jars.sh
Normal file
@ -0,0 +1,17 @@
|
||||
# This setup hook causes the fixup phase to repack all JAR files in a
|
||||
# canonical & deterministic fashion, e.g. resetting mtimes (like with normal
|
||||
# store files) and avoiding impure metadata.
|
||||
|
||||
fixupOutputHooks+=('if [ -z "$dontCanonicalizeJars" -a -e "$prefix" ]; then canonicalizeJarsIn "$prefix"; fi')
|
||||
|
||||
canonicalizeJarsIn() {
|
||||
local dir="$1"
|
||||
header "canonicalizing jars in $dir"
|
||||
dir="$(realpath -sm -- "$dir")"
|
||||
while IFS= read -rd '' f; do
|
||||
canonicalizeJar "$f"
|
||||
done < <(find -- "$dir" -type f -name '*.jar' -print0)
|
||||
stopNest
|
||||
}
|
||||
|
||||
source @canonicalize_jar@
|
||||
@ -25,7 +25,8 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "corefonts-1";
|
||||
pname = "corefonts";
|
||||
version = "1";
|
||||
|
||||
exes = map ({name, sha256}: fetchurl {
|
||||
url = "mirror://sourceforge/corefonts/${name}32.exe";
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
, xcbutil
|
||||
, xcbutilwm
|
||||
, xz
|
||||
, buildManPages ? true, ruby
|
||||
, buildManpages ? true, ruby
|
||||
}:
|
||||
|
||||
let
|
||||
@ -52,21 +52,21 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arcan";
|
||||
version = "0.6.1pre1+unstable=2021-09-05";
|
||||
version = "0.6.1pre1+unstable=2021-10-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "arcan";
|
||||
rev = "525521177e4458199d7a57f8e6d37d41c04a988d";
|
||||
hash = "sha256-RsvTHPIvF9TeOfjPGcArptIiF9g42BfZkVMCbjJcXnE=";
|
||||
rev = "e0182b944152fbcb49f5c16932d38c05a9fb2680";
|
||||
hash = "sha256-4FodFuO51ehvyjH4YaF/xBY9dwA6cP/e6/BvEsH4w7U=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
(
|
||||
cd $sourceRoot/external/git/
|
||||
cp -a ${letoram-openal-src}/ openal/
|
||||
chmod --recursive 744 openal/
|
||||
)
|
||||
pushd .
|
||||
cd $sourceRoot/external/git/
|
||||
cp -a ${letoram-openal-src}/ openal/
|
||||
chmod --recursive 744 openal/
|
||||
popd
|
||||
'';
|
||||
|
||||
# TODO: work with upstream in order to get rid of these hardcoded paths
|
||||
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
makeWrapper
|
||||
pkg-config
|
||||
] ++ lib.optionals buildManPages [
|
||||
] ++ lib.optionals buildManpages [
|
||||
ruby
|
||||
];
|
||||
|
||||
@ -123,8 +123,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# INFO: According to the source code, the manpages need to be generated before
|
||||
# the configure phase
|
||||
preConfigure = lib.optionalString buildManPages ''
|
||||
(cd doc; ruby docgen.rb mangen)
|
||||
preConfigure = lib.optionalString buildManpages ''
|
||||
pushd .
|
||||
cd doc
|
||||
ruby docgen.rb mangen
|
||||
popd
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
@ -9,25 +9,26 @@ rec {
|
||||
|
||||
# Arcan
|
||||
|
||||
arcan = callPackage ./arcan.nix { };
|
||||
arcan = callPackage ./arcan { };
|
||||
arcan-wrapped = callPackage ./wrapper.nix { };
|
||||
xarcan = callPackage ./xarcan.nix { };
|
||||
xarcan = callPackage ./xarcan { };
|
||||
|
||||
# Appls
|
||||
|
||||
durden = callPackage ./durden.nix { };
|
||||
durden = callPackage ./durden { };
|
||||
durden-wrapped = callPackage ./wrapper.nix {
|
||||
name = "durden-wrapped";
|
||||
appls = [ durden ];
|
||||
};
|
||||
|
||||
pipeworld = callPackage ./pipeworld.nix { };
|
||||
pipeworld = callPackage ./pipeworld { };
|
||||
pipeworld-wrapped = callPackage ./wrapper.nix {
|
||||
name = "pipeworld-wrapped";
|
||||
appls = [ pipeworld ];
|
||||
};
|
||||
|
||||
prio = callPackage ./prio.nix { };
|
||||
# Warning: prio is deprecated; however it works and is useful for testing
|
||||
prio = callPackage ./prio { };
|
||||
prio-wrapped = callPackage ./wrapper.nix {
|
||||
name = "prio-wrapped";
|
||||
appls = [ prio ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "durden";
|
||||
version = "0.6.1+unstable=2021-07-11";
|
||||
version = "0.6.1+unstable=2021-10-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = pname;
|
||||
rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5";
|
||||
hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0=";
|
||||
rev = "ab6cdaf19e87b74895a9ab5e1d005a07ea9396a6";
|
||||
hash = "sha256-FxqY1TUgbD/PjQjTZZerb7ngn5nkcqmVwqPvbRAYaqo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@ -24,6 +24,6 @@ symlinkJoin rec {
|
||||
done
|
||||
'';
|
||||
}
|
||||
# TODO: set ARCAN_FONTPATH to a set of fonts that can be provided in a parameter
|
||||
# TODO: set ARCAN_STATEBASEPATH to $HOME/.arcan/resources/savestates/ - possibly
|
||||
# via a suitable script
|
||||
# TODO: set ARCAN_FONTPATH to a set of default-but-configurable fontset
|
||||
|
||||
@ -2,14 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-EasyScreenCast";
|
||||
version = "unstable-2020-11-25";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
# To make it work with gnome 3.38, using effectively: https://github.com/EasyScreenCast/EasyScreenCast/pull/276
|
||||
owner = "Ian2020";
|
||||
owner = "EasyScreenCast";
|
||||
repo = "EasyScreenCast";
|
||||
rev = "b1ab4a999bc7110ecbf68b5fe42c37fa67d7cb0d";
|
||||
sha256 = "s9b0ITKUzgG6XOd1bK7i3mGxfc+T+UHrTZhBp0Ff8zQ=";
|
||||
rev = version;
|
||||
sha256 = "sha256-+lh/hqYC9+DUvLE016KuAY4Ybw8KrqEEG7WG4pUbg2k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -91,5 +91,15 @@
|
||||
"wireguard-indicator@gregos.me",
|
||||
"wireguard-indicator@atareao.es"
|
||||
]
|
||||
},
|
||||
"41": {
|
||||
"applications-menu": [
|
||||
"apps-menu@gnome-shell-extensions.gcampax.github.com",
|
||||
"Applications_Menu@rmy.pobox.com"
|
||||
],
|
||||
"floating-dock": [
|
||||
"floatingDock@sun.wxg@gmail.com",
|
||||
"floating-dock@nandoferreira_prof@hotmail.com"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -59,8 +59,9 @@ in rec {
|
||||
|
||||
gnome38Extensions = mapUuidNames (produceExtensionsList "38");
|
||||
gnome40Extensions = mapUuidNames (produceExtensionsList "40");
|
||||
gnome41Extensions = mapUuidNames (produceExtensionsList "41");
|
||||
|
||||
gnomeExtensions = lib.trivial.pipe gnome40Extensions [
|
||||
gnomeExtensions = lib.trivial.pipe (gnome40Extensions // gnome41Extensions) [
|
||||
# Apply some custom patches for automatically packaged extensions
|
||||
(callPackage ./extensionOverrides.nix {})
|
||||
# Add all manually packaged extensions
|
||||
|
||||
@ -3,10 +3,21 @@
|
||||
# - Every item from ./collisions.json (for the respective Shell version) should have an entry in here
|
||||
# - Set the value to `null` for filtering (duplicate or unmaintained extensions)
|
||||
# - Sort the entries in order of appearance in the collisions.json
|
||||
# - Make a separate section for each GNOME version. Collisions will come back eventually
|
||||
# as the extensions are updated.
|
||||
{
|
||||
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
|
||||
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
|
||||
|
||||
"floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
|
||||
"floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";
|
||||
|
||||
# ############################################################################
|
||||
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
|
||||
# Make sure to move them up once they are updated
|
||||
|
||||
# ####### GNOME 40 #######
|
||||
|
||||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
|
||||
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
|
||||
|
||||
@ -38,23 +49,14 @@
|
||||
"extension-list@tu.berry" = "extension-list";
|
||||
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug
|
||||
|
||||
"floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
|
||||
"floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";
|
||||
|
||||
# ############################################################################
|
||||
# These are conflicts for 3.38 extensions. They will very probably come back
|
||||
# once more of them support 40.
|
||||
# ####### GNOME 3.38 #######
|
||||
|
||||
# See https://github.com/pbxqdown/gnome-shell-extension-transparent-window/issues/12#issuecomment-800765381
|
||||
#"transparent-window@pbxqdown.github.com" = "transparent-window";
|
||||
#"transparentwindows.mdirshad07" = null;
|
||||
|
||||
#"floatingDock@sun.wxg@gmail.com" = "floating-dock";
|
||||
#"floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock-2";
|
||||
"transparent-window@pbxqdown.github.com" = "transparent-window";
|
||||
"transparentwindows.mdirshad07" = null;
|
||||
|
||||
# That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612
|
||||
#"flypie@schneegans.github.com" = null;
|
||||
|
||||
"flypie@schneegans.github.com" = null;
|
||||
|
||||
# ############################################################################
|
||||
# Overrides for extensions that were manually packaged in the past but are gradually
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -17,6 +17,7 @@ import base64
|
||||
supported_versions = {
|
||||
"38": "3.38",
|
||||
"40": "40",
|
||||
"41": "41",
|
||||
}
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,12 +6,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qbe";
|
||||
version = "unstable-2021-06-17";
|
||||
version = "unstable-2021-10-26";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://c9x.me/qbe.git";
|
||||
rev = "6d9ee1389572ae985f6a39bb99dbd10cdf42c123";
|
||||
sha256 = "NaURS5Eu8NBd92wGQcyFEXCALU9Z93nNQeZ8afq4KMw=";
|
||||
rev = "900805a8fe5cfa799966c4ef221524e967c44ca5";
|
||||
sha256 = "sha256-ahUpG2JH3Ee6FUGfTYZZ2TLk5tF6ovvMxbsjZjVug2o=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ buildPackages, callPackage }:
|
||||
{ buildPackages, callPackage, stdenv }@prev:
|
||||
|
||||
{ rustc, cargo, ... }:
|
||||
{ rustc, cargo, stdenv ? prev.stdenv, ... }:
|
||||
|
||||
rec {
|
||||
rust = {
|
||||
@ -9,27 +9,27 @@ rec {
|
||||
|
||||
fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
|
||||
git = buildPackages.gitMinimal;
|
||||
inherit cargo;
|
||||
inherit stdenv cargo;
|
||||
};
|
||||
|
||||
buildRustPackage = callPackage ../../../build-support/rust {
|
||||
git = buildPackages.gitMinimal;
|
||||
inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
|
||||
inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
|
||||
fetchCargoTarball importCargoLock rustc;
|
||||
};
|
||||
|
||||
importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};
|
||||
|
||||
rustcSrc = callPackage ./rust-src.nix {
|
||||
inherit rustc;
|
||||
inherit stdenv rustc;
|
||||
};
|
||||
|
||||
rustLibSrc = callPackage ./rust-lib-src.nix {
|
||||
inherit rustc;
|
||||
inherit stdenv rustc;
|
||||
};
|
||||
|
||||
# Hooks
|
||||
inherit (callPackage ../../../build-support/rust/hooks {
|
||||
inherit cargo rustc;
|
||||
inherit stdenv cargo rustc;
|
||||
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap
|
||||
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
|
||||
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)
|
||||
, linkableRuntime ? (stdenv.isi686 || stdenv.isx86_64)
|
||||
, disableImmobileSpace ? false
|
||||
# Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
|
||||
# Note that the created binaries still need `patchelf --set-interpreter ...`
|
||||
@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableFeatures = with lib;
|
||||
optional threadSupport "sb-thread" ++
|
||||
optional linkableRuntime "sb-linkable-runtime" ++
|
||||
optional stdenv.isAarch32 "arm";
|
||||
|
||||
disableFeatures = with lib;
|
||||
|
||||
@ -4,7 +4,8 @@ with builtins; with lib; let
|
||||
elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [
|
||||
{ case = "8.11"; out = { version = "1.11.4"; };}
|
||||
{ case = "8.12"; out = { version = "1.12.0"; };}
|
||||
{ case = "8.13"; out = { version = "1.13.5"; };}
|
||||
{ case = "8.13"; out = { version = "1.13.7"; };}
|
||||
{ case = "8.14"; out = { version = "1.13.7"; };}
|
||||
] {});
|
||||
in mkCoqDerivation {
|
||||
pname = "elpi";
|
||||
@ -12,11 +13,14 @@ in mkCoqDerivation {
|
||||
owner = "LPCIC";
|
||||
inherit version;
|
||||
defaultVersion = lib.switch coq.coq-version [
|
||||
{ case = "8.13"; out = "1.10.1"; }
|
||||
{ case = "8.14"; out = "1.11.2"; }
|
||||
{ case = "8.13"; out = "1.11.1"; }
|
||||
{ case = "8.12"; out = "1.8.3_8.12"; }
|
||||
{ case = "8.11"; out = "1.6.3_8.11"; }
|
||||
] null;
|
||||
release."1.10.1".sha256 = "1zsyx26dvj7pznfd2msl2w7zbw51q1nsdw0bdvdha6dga7ijf7xk";
|
||||
release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4";
|
||||
release."1.11.1".sha256 = "10j076vc2hdcbm15m6s7b6xdzibgfcbzlkgjnlkr2vv9k13qf8kc";
|
||||
release."1.10.1".sha256 = "1zsyx26dvj7pznfd2msl2w7zbw51q1nsdw0bdvdha6dga7ijf7xk";
|
||||
release."1.9.7".sha256 = "0rvn12h9dpk9s4pxy32p8j0a1h7ib7kg98iv1cbrdg25y5vs85n1";
|
||||
release."1.9.5".sha256 = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6";
|
||||
release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
|
||||
|
||||
@ -5,9 +5,11 @@ with lib; mkCoqDerivation {
|
||||
owner = "math-comp";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.13" "8.14"; out = "1.2.0"; }
|
||||
{ case = range "8.12" "8.13"; out = "1.1.0"; }
|
||||
{ case = isEq "8.11"; out = "0.10.0"; }
|
||||
] null;
|
||||
release."1.2.0".sha256 = "0sk01rvvk652d86aibc8rik2m8iz7jn6mw9hh6xkbxlsvh50719d";
|
||||
release."1.1.0".sha256 = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q=";
|
||||
release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp";
|
||||
release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
|
||||
@ -19,6 +21,8 @@ with lib; mkCoqDerivation {
|
||||
|
||||
mlPlugin = true;
|
||||
|
||||
buildPhase = "make build";
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
|
||||
extraInstallFlags = [ "VFILES=structures.v" ];
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, gnuradio
|
||||
, thrift
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
@ -49,6 +50,9 @@ in mkDerivation {
|
||||
gmp
|
||||
icu
|
||||
limesuite
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
python.pkgs.thrift
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, mpir
|
||||
, boost
|
||||
, gmp
|
||||
, thrift
|
||||
, fftwFloat
|
||||
, python
|
||||
, swig
|
||||
@ -52,11 +53,14 @@ in mkDerivation {
|
||||
libbladeRF
|
||||
rtl-sdr
|
||||
soapysdr-with-plugins
|
||||
] ++ lib.optional (gnuradio.hasFeature "gr-uhd" gnuradio.features) [
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
|
||||
uhd
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
python.pkgs.thrift
|
||||
];
|
||||
cmakeFlags = [
|
||||
(if (gnuradio.hasFeature "python-support" gnuradio.features) then
|
||||
(if (gnuradio.hasFeature "python-support") then
|
||||
"-DENABLE_PYTHON=ON"
|
||||
else
|
||||
"-DENABLE_PYTHON=OFF"
|
||||
@ -66,7 +70,7 @@ in mkDerivation {
|
||||
cmake
|
||||
pkg-config
|
||||
swig
|
||||
] ++ lib.optionals (gnuradio.hasFeature "python-support" gnuradio.features) [
|
||||
] ++ lib.optionals (gnuradio.hasFeature "python-support") [
|
||||
(if (gnuradio.versionAttr.major == "3.7") then
|
||||
python.pkgs.cheetah
|
||||
else
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, python
|
||||
, log4cpp
|
||||
, mpir
|
||||
, thrift
|
||||
, boost
|
||||
, gmp
|
||||
, icu
|
||||
@ -40,6 +41,9 @@ in mkDerivation {
|
||||
boost
|
||||
gmp
|
||||
icu
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
python.pkgs.thrift
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,13 +19,13 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
|
||||
version = "0.pre+unstable=2021-10-09";
|
||||
version = "0.pre+date=2021-10-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
repo = "CBQN";
|
||||
rev = "debc4e2afe313a3c54133df9f26969c2927dc8aa";
|
||||
hash = "sha256-ixFDmtq6hd2enmPbBT0JCv1bmxt84zle4zPQzz+rMCI=";
|
||||
rev = "f50b8ab503d05cccb6ff61df52f2625df3292a9e";
|
||||
hash = "sha256-pxToXVIKYS9P2TnGMGmKfJmAP54GVPVls9bm9tmS21s=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bqn";
|
||||
version = "0.pre+unstable=2021-10-06";
|
||||
version = "0.pre+date=2021-10-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlochbaum";
|
||||
repo = "BQN";
|
||||
rev = "2ce2dc40702431ef3d3ffece9e2f6f8b883ac6c5";
|
||||
hash = "sha256-bvXKOaBlddG6O0GbmtqU9prklqmOOvlbXuCUaFO+j0M=";
|
||||
rev = "e4edda2a8cf2309b77808cc749a8e6ff8a282b17";
|
||||
hash = "sha256-wCpwFV9AI0bfDQX9ARWHkTICmNnRu4vBACXBTM/RNeM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure";
|
||||
version = "1.10.3.986";
|
||||
version = "1.10.3.998";
|
||||
|
||||
src = fetchurl {
|
||||
# https://clojure.org/releases/tools
|
||||
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
||||
sha256 = "fahLaQjQDnSMLEatI+OD7eWc8YvzrkSbHDDNalC4DvY=";
|
||||
sha256 = "zvIgswjAGfvaTKRb29KGKETqggjmOToCBzb99/C7chA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "24.1.2";
|
||||
sha256 = "sha256-P0XU+gqDyhW0QQf1UzO+CV9Yc6YP70MRf3MLgdKzeU4=";
|
||||
version = "24.1.3";
|
||||
sha256 = "sha256-l0+eZh4F/erY0ZKikUilRPiwkIhEL1Fb5BauR7gh+Ew=";
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://liba52.sourceforge.net/files/${pname}-${version}.tar.gz";
|
||||
url = "https://liba52.sourceforge.io/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM=";
|
||||
};
|
||||
|
||||
|
||||
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
# being generated to make sure that they use our glibc.
|
||||
EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-crt1-cflags) $(cat $NIX_CC/nix-support/libc-cflags) -O2"
|
||||
|
||||
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before)"
|
||||
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags || true) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before || true)"
|
||||
for i in $extraLDFlags; do
|
||||
EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i"
|
||||
done
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{ lib, antBuild, fetchgit, perl }:
|
||||
|
||||
let
|
||||
version = "4.11";
|
||||
in antBuild {
|
||||
name = "junit-${version}";
|
||||
|
||||
# I think this is only used to generate the docs, and will likely disappear
|
||||
# with the next release of junit since its build system completely changes.
|
||||
buildInputs = [perl];
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/junit-team/junit.git";
|
||||
sha256 = "1cn5dhs6vpbfbcmnm2vb1212n0kblv8cxrvnwmksjxd6bzlkac1k";
|
||||
rev = "c2e4d911fadfbd64444fb285342a8f1b72336169";
|
||||
};
|
||||
|
||||
antProperties = [
|
||||
{ name = "version"; value = version; }
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.junit.org/";
|
||||
description = "A framework for repeatable tests in Java";
|
||||
license = lib.licenses.epl10;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
diff -rc junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java
|
||||
*** junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java Tue Jul 20 14:59:41 2010
|
||||
--- junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java Sun May 27 22:26:15 2012
|
||||
***************
|
||||
*** 43,49 ****
|
||||
String prefix = "lib";
|
||||
String suffix = ".so";
|
||||
String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
|
||||
! if ("macosx".equals(os)) {
|
||||
suffix = ".dylib";
|
||||
} else if ("linux".equals(os) || "freebsd".equals(os)
|
||||
|| "sunos".equals(os)) {
|
||||
--- 43,49 ----
|
||||
String prefix = "lib";
|
||||
String suffix = ".so";
|
||||
String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
|
||||
! if ("macosx".equals(os) || "darwin".equals(os)) {
|
||||
suffix = ".dylib";
|
||||
} else if ("linux".equals(os) || "freebsd".equals(os)
|
||||
|| "sunos".equals(os)) {
|
||||
@ -1,42 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, ant, jdk, junit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "junixsocket-1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/junixsocket/${name}-src.tar.bz2";
|
||||
sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym";
|
||||
};
|
||||
|
||||
patches = [ ./darwin.patch ];
|
||||
|
||||
buildInputs = [ ant jdk junit ];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
substituteInPlace src/main/org/newsclub/net/unix/NativeUnixSocketConfig.java \
|
||||
--replace /opt/newsclub/lib-native $out/lib
|
||||
'';
|
||||
|
||||
buildPhase = "ant";
|
||||
|
||||
ANT_ARGS =
|
||||
# Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
|
||||
(if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
|
||||
++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ]
|
||||
++ lib.optional stdenv.isDarwin "-DisMac=true";
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/share/java $out/lib
|
||||
cp -v dist/*.jar $out/share/java
|
||||
cp -v lib-native/*.so lib-native/*.dylib $out/lib/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A Java/JNI library for using Unix Domain Sockets from Java";
|
||||
homepage = "https://github.com/kohlschutter/junixsocket";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
8
pkgs/development/libraries/java/swt/awt-libs.patch
Normal file
8
pkgs/development/libraries/java/swt/awt-libs.patch
Normal file
@ -0,0 +1,8 @@
|
||||
--- a/make_linux.mak
|
||||
+++ b/make_linux.mak
|
||||
@@ -63,4 +63,4 @@
|
||||
|
||||
AWT_LFLAGS = -shared ${SWT_LFLAGS}
|
||||
-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
|
||||
+AWT_LIBS = `pkg-config --libs x11` -L$(AWT_LIB_PATH) -ljawt
|
||||
|
||||
@ -1,73 +1,158 @@
|
||||
{ stdenv, lib, fetchurl, unzip, jdk, pkg-config, gtk2
|
||||
, libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg
|
||||
, pango, gdk-pixbuf, glib
|
||||
{ lib
|
||||
, stdenv
|
||||
, canonicalize-jars-hook
|
||||
, fetchzip
|
||||
, pkg-config
|
||||
, atk
|
||||
, glib
|
||||
, gtk2
|
||||
, jdk
|
||||
, libGL
|
||||
, libGLU
|
||||
, libXt
|
||||
, libXtst
|
||||
, gnome2
|
||||
}:
|
||||
|
||||
let
|
||||
platformMap = {
|
||||
x86_64-linux =
|
||||
{ platform = "gtk-linux-x86_64";
|
||||
sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; };
|
||||
sha256 = "17frac2nsx22hfa72264as31rn35hfh9gfgy0n6wvc3knl5d2716"; };
|
||||
i686-linux =
|
||||
{ platform = "gtk-linux-x86";
|
||||
sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; };
|
||||
sha256 = "13ca17rga9yvdshqvh0sfzarmdcl4wv4pid0ls7v35v4844zbc8b"; };
|
||||
x86_64-darwin =
|
||||
{ platform = "cocoa-macosx-x86_64";
|
||||
sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; };
|
||||
sha256 = "0wjyxlw7i9zd2m8syd6k1q85fj8pzhxlfsrl8fpgsj37p698bd0a"; };
|
||||
};
|
||||
|
||||
metadata = assert platformMap ? ${stdenv.hostPlatform.system}; platformMap.${stdenv.hostPlatform.system};
|
||||
|
||||
metadata = assert platformMap ? ${stdenv.hostPlatform.system};
|
||||
platformMap.${stdenv.hostPlatform.system};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "swt";
|
||||
version = "4.5";
|
||||
fullVersion = "${version}-201506032000";
|
||||
pname = "swt";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# Alas, the Eclipse Project apparently doesn't produce source-only
|
||||
# releases of SWT. So we just grab a binary release and extract
|
||||
# "src.zip" from that.
|
||||
src = fetchurl {
|
||||
url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip";
|
||||
sha256 = metadata.sha256;
|
||||
src = fetchzip {
|
||||
url = "https://archive.eclipse.org/eclipse/downloads/drops4/" +
|
||||
"R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip";
|
||||
inherit (metadata) sha256;
|
||||
stripRoot = false;
|
||||
extraPostFetch = ''
|
||||
mkdir "$unpackDir"
|
||||
cd "$unpackDir"
|
||||
|
||||
renamed="$TMPDIR/src.zip"
|
||||
mv "$out/src.zip" "$renamed"
|
||||
unpackFile "$renamed"
|
||||
rm -r "$out"
|
||||
|
||||
mv "$unpackDir" "$out"
|
||||
'';
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
nativeBuildInputs = [
|
||||
canonicalize-jars-hook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
atk
|
||||
gtk2
|
||||
jdk
|
||||
libGL
|
||||
libGLU
|
||||
libXtst
|
||||
gnome2.gnome_vfs
|
||||
gnome2.libgnome
|
||||
gnome2.libgnomeui
|
||||
] ++ lib.optionals (lib.hasPrefix "8u" jdk.version) [
|
||||
libXt
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ unzip pkg-config ];
|
||||
buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ];
|
||||
patches = [ ./awt-libs.patch ./gtk-libs.patch ];
|
||||
|
||||
NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) +
|
||||
" -lX11 -lpango-1.0 -lgdk_pixbuf-2.0 -lglib-2.0";
|
||||
prePatch = ''
|
||||
# clear whitespace from makefiles (since we match on EOL later)
|
||||
sed -i 's/ \+$//' ./*.mak
|
||||
'';
|
||||
|
||||
postPatch = let makefile-sed = builtins.toFile "swt-makefile.sed" (''
|
||||
# fix pkg-config invocations in CFLAGS/LIBS pairs.
|
||||
#
|
||||
# change:
|
||||
# FOOCFLAGS = `pkg-config --cflags `foo bar`
|
||||
# FOOLIBS = `pkg-config --libs-only-L foo` -lbaz
|
||||
# into:
|
||||
# FOOCFLAGS = `pkg-config --cflags foo bar`
|
||||
# FOOLIBS = `pkg-config --libs foo bar`
|
||||
#
|
||||
# the latter works more consistently.
|
||||
/^[A-Z0-9_]\+CFLAGS = `pkg-config --cflags [^`]\+`$/ {
|
||||
N
|
||||
s'' +
|
||||
"/" + ''
|
||||
^\([A-Z0-9_]\+\)CFLAGS = `pkg-config --cflags \(.\+\)`\
|
||||
\1LIBS = `pkg-config --libs-only-L .\+$'' +
|
||||
"/" + ''
|
||||
\1CFLAGS = `pkg-config --cflags \2`\
|
||||
\1LIBS = `pkg-config --libs \2`'' +
|
||||
"/\n" + ''
|
||||
}
|
||||
# fix WebKit libs not being there
|
||||
s/\$(WEBKIT_LIB) \$(WEBKIT_OBJECTS)$/\0 `pkg-config --libs glib-2.0`/g
|
||||
''); in ''
|
||||
declare -a makefiles=(./*.mak)
|
||||
sed -i -f ${makefile-sed} "''${makefiles[@]}"
|
||||
# assign Makefile variables eagerly & change backticks to `$(shell …)`
|
||||
sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \
|
||||
-e 's/`\([^`]\+\)`/$(shell \1)/' \
|
||||
"''${makefiles[@]}"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
unzip src.zip -d src
|
||||
runHook preBuild
|
||||
|
||||
cd src
|
||||
sed -i "s#^LFLAGS =#LFLAGS = $NIX_LFLAGS #g" *.mak
|
||||
export JAVA_HOME=${jdk}
|
||||
|
||||
sh ./build.sh
|
||||
./build.sh
|
||||
|
||||
mkdir out
|
||||
javac -d out/ $(find org/ -name "*.java")
|
||||
find org/ -name '*.java' -type f -exec javac -d out/ {} +
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp *.so $out/lib
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/jars
|
||||
cp version.txt out/
|
||||
cd out && jar -c * > $out/jars/swt.jar
|
||||
if [ -n "$prefix" ]; then
|
||||
mkdir -p "$prefix"
|
||||
fi
|
||||
|
||||
mkdir -p "$out/lib"
|
||||
cp -t "$out/lib" ./*.so
|
||||
|
||||
mkdir -p "$out/jars"
|
||||
cp -t out/ version.txt
|
||||
(cd out && jar -c *) > "$out/jars/swt.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.eclipse.org/swt/";
|
||||
description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented";
|
||||
homepage = "https://www.eclipse.org/swt/";
|
||||
description = ''
|
||||
A widget toolkit for Java to access the user-interface facilities of
|
||||
the operating systems on which it is implemented.
|
||||
'';
|
||||
license = licenses.epl10;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ bb010g ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
14
pkgs/development/libraries/java/swt/gtk-libs.patch
Normal file
14
pkgs/development/libraries/java/swt/gtk-libs.patch
Normal file
@ -0,0 +1,14 @@
|
||||
--- a/make_linux.mak
|
||||
+++ b/make_linux.mak
|
||||
@@ -53,9 +53,4 @@
|
||||
|
||||
-# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
|
||||
-GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
|
||||
+GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gthread-2.0 gtk+-unix-print-$(GTK_VERSION) x11 xtst`
|
||||
+GTKLIBS = `pkg-config --libs gtk+-$(GTK_VERSION) gthread-2.0 gtk+-unix-print-$(GTK_VERSION) x11 xtst`
|
||||
-ifeq ($(GTK_VERSION), 3.0)
|
||||
-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0 -lXtst
|
||||
-else
|
||||
-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-$(GTK_VERSION) -lgthread-2.0 -lXtst
|
||||
-endif
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbpkg";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz";
|
||||
sha256 = "732849cdd5d773c589dd0ac220002fa41424784df10617adc4dea729faafb22b";
|
||||
sha256 = "sha256-K5KkhJa4qsh3AMDtCV4eA7bh3oU5DYEYMAacLmDoulU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://git.build2.org/cgit/libbpkg/log";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbutl";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz";
|
||||
sha256 = "d7944637ab4a17d3a299c04ff6f146e89b2a0f433ddd9d08d8632a25bae9c9cb";
|
||||
sha256 = "sha256-zKufrUsLZmjw6pNbOAv+dPyolWpgXgygEnW0Lka6zw8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -36,9 +36,7 @@ stdenv.mkDerivation rec {
|
||||
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
|
||||
];
|
||||
|
||||
# tests broken with -DNDEBUG
|
||||
# https://github.com/build2/libbutl/issues/4
|
||||
# doCheck = true;
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "build2 utility library";
|
||||
@ -50,5 +48,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://git.build2.org/cgit/libbutl/log";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libodb-sqlite";
|
||||
version = "2.5.0-b.19";
|
||||
version = "2.5.0-b.21";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
|
||||
sha256 = "9443653bfc31d02d0d723f18072f6b04083d090e6580844e33c1e769db122494";
|
||||
sha256 = "sha256-dxU8HyzowFGNYCrZIKrZEZDGi9zo3G0x3/L7nfQKo0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://git.codesynthesis.com/cgit/odb/libodb-sqlite/tree/NEWS";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libodb";
|
||||
version = "2.5.0-b.19";
|
||||
version = "2.5.0-b.21";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz";
|
||||
sha256 = "8180d9d40d8e74ed25b1712953f19379a29abdee3896ae98ba9ade35846adb39";
|
||||
sha256 = "sha256-Q4HZ8zU5osZ9Phz59ZAjXh0dbB8ELBY5gMRbDnawCWs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ build2 ];
|
||||
@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://git.codesynthesis.com/cgit/odb/libodb/tree/NEWS";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.2.2";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-RiglS0aqLRDOfwxhVE95NaKpRy94xfeul18o3NB5L3I=";
|
||||
sha256 = "sha256-NtT6NaNs43gp8sgPNkRj85PBbpaG7hdUctDF564nZIk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, ncurses
|
||||
, zlib
|
||||
, ffmpeg
|
||||
, readline
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, multimediaSupport ? true
|
||||
@ -14,20 +13,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notcurses";
|
||||
version = "2.4.2";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dankamongmen";
|
||||
repo = "notcurses";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EtHyxnTH2bVoVnWB9wvmF/nCdecvL1TTiVRaajFVC/0=";
|
||||
sha256 = "sha256-mVSToryo7+zW1mow8eJT8GrXYlGe/BeSheJtJDKAgzo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config pandoc ];
|
||||
|
||||
buildInputs = [ libunistring ncurses readline zlib ]
|
||||
buildInputs = [ libunistring ncurses zlib ]
|
||||
++ lib.optional multimediaSupport ffmpeg;
|
||||
|
||||
cmakeFlags = [ "-DUSE_QRCODEGEN=OFF" ]
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
@ -74,20 +73,20 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv";
|
||||
rev = version;
|
||||
sha256 = "sha256-pxi1VBF4txvRqspdqvCsAQ3XKzl633/o3wyOgD9wid4=";
|
||||
sha256 = "sha256-eIESkc/yYiZZ5iY4t/rAPd+jfjuMYR3srCBC4fO3g70=";
|
||||
};
|
||||
|
||||
contribSrc = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_contrib";
|
||||
rev = version;
|
||||
sha256 = "sha256-iMenRTY+qeL7WRgnRuQbsHflYDakE7pWWSHeIjrg0Iw=";
|
||||
sha256 = "sha256-RkCIGukZ8KJkmVZQAZTWdVcVKD2I3NcfGShcqzKhQD0=";
|
||||
};
|
||||
|
||||
# Contrib must be built in order to enable Tesseract support:
|
||||
@ -219,11 +218,6 @@ stdenv.mkDerivation {
|
||||
# Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
|
||||
patches = [
|
||||
./cmake-don-t-use-OpenCVFindOpenEXR.patch
|
||||
# Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch";
|
||||
sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41";
|
||||
})
|
||||
] ++ lib.optional enableCuda ./cuda_opt_flow.patch;
|
||||
|
||||
# This prevents cmake from using libraries in impure paths (which
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline ? null, ncurses ? null }:
|
||||
|
||||
assert readline != null -> ncurses != null;
|
||||
{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlcipher";
|
||||
@ -14,16 +12,24 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles tcl ];
|
||||
buildInputs = [ readline ncurses openssl ];
|
||||
buildInputs = [ readline ncurses openssl zlib ];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
configureFlags = [ "--enable-threadsafe" "--disable-tcl" ];
|
||||
configureFlags = [
|
||||
"--enable-threadsafe"
|
||||
"--with-readline-inc=-I${lib.getDev readline}/include"
|
||||
];
|
||||
|
||||
CFLAGS = [
|
||||
"-DSQLITE_ENABLE_COLUMN_METADATA=1"
|
||||
"-DSQLITE_SECURE_DELETE=1"
|
||||
"-DSQLITE_ENABLE_UNLOCK_NOTIFY=1"
|
||||
"-DSQLITE_HAS_CODEC"
|
||||
];
|
||||
|
||||
CFLAGS = [ "-DSQLITE_ENABLE_COLUMN_METADATA=1" "-DSQLITE_SECURE_DELETE=1" "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" "-DSQLITE_HAS_CODEC" ];
|
||||
LDFLAGS = lib.optional (readline != null) "-lncurses";
|
||||
BUILD_CC = "$(CC_FOR_BUILD)";
|
||||
|
||||
doCheck = false; # fails. requires tcl?
|
||||
TCLLIBDIR = "${placeholder "out"}/lib/tcl${lib.versions.majorMinor tcl.version}";
|
||||
|
||||
postInstall = ''
|
||||
installManPage sqlcipher.1
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thrift";
|
||||
version = "0.14.2";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-QZG/wLdJDiDMafn03G6ZH7thLUVRqp7vHb9/TEfOVU0=";
|
||||
sha256 = "sha256-1Yg1ZtFh+Pbd1OIfOp4+a4JyeZ0FSCDxwlsR6GcY+Gs=";
|
||||
};
|
||||
|
||||
# Workaround to make the python wrapper not drop this package:
|
||||
@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = "export PY_PREFIX=$out";
|
||||
|
||||
patches = [
|
||||
# ToStringTest.cpp is failing from some reason due to locale issue, this
|
||||
# doesn't disable all UnitTests as in Darwin.
|
||||
./disable-failing-test.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_JAVASCRIPT:BOOL=OFF"
|
||||
"-DBUILD_NODEJS:BOOL=OFF"
|
||||
|
||||
12
pkgs/development/libraries/thrift/disable-failing-test.patch
Normal file
12
pkgs/development/libraries/thrift/disable-failing-test.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git i/lib/cpp/test/CMakeLists.txt w/lib/cpp/test/CMakeLists.txt
|
||||
index 19854e1a3..9d428a166 100644
|
||||
--- i/lib/cpp/test/CMakeLists.txt
|
||||
+++ w/lib/cpp/test/CMakeLists.txt
|
||||
@@ -77,7 +77,6 @@ set(UnitTest_SOURCES
|
||||
TMemoryBufferTest.cpp
|
||||
TBufferBaseTest.cpp
|
||||
Base64Test.cpp
|
||||
- ToStringTest.cpp
|
||||
TypedefTest.cpp
|
||||
TServerSocketTest.cpp
|
||||
TServerTransportTest.cpp
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user