Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
05d1c49209
@ -5521,7 +5521,7 @@
|
||||
name = "Marius Bakke";
|
||||
};
|
||||
mbaillie = {
|
||||
email = "martin@baillie.email";
|
||||
email = "martin@baillie.id";
|
||||
github = "martinbaillie";
|
||||
githubId = 613740;
|
||||
name = "Martin Baillie";
|
||||
|
||||
@ -25,7 +25,6 @@ let
|
||||
HTTP_ADDR = ${cfg.httpAddress}
|
||||
HTTP_PORT = ${toString cfg.httpPort}
|
||||
ROOT_URL = ${cfg.rootUrl}
|
||||
STATIC_ROOT_PATH = ${cfg.staticRootPath}
|
||||
|
||||
[session]
|
||||
COOKIE_NAME = session
|
||||
@ -179,13 +178,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
staticRootPath = mkOption {
|
||||
type = types.str;
|
||||
default = "${pkgs.gogs.data}";
|
||||
example = "/var/lib/gogs/data";
|
||||
description = "Upper level of template and static files path.";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
|
||||
@ -5,7 +5,7 @@ with lib;
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.exwm;
|
||||
loadScript = pkgs.writeText "emacs-exwm-load" ''
|
||||
(require 'exwm)
|
||||
${cfg.loadScript}
|
||||
${optionalString cfg.enableDefaultConfig ''
|
||||
(require 'exwm-config)
|
||||
(exwm-config-default)
|
||||
@ -19,6 +19,18 @@ in
|
||||
options = {
|
||||
services.xserver.windowManager.exwm = {
|
||||
enable = mkEnableOption "exwm";
|
||||
loadScript = mkOption {
|
||||
default = "(require 'exwm)";
|
||||
example = literalExample ''
|
||||
(require 'exwm)
|
||||
(exwm-enable)
|
||||
'';
|
||||
description = ''
|
||||
Emacs lisp code to be run after loading the user's init
|
||||
file. If enableDefaultConfig is true, this will be run
|
||||
before loading the default config.
|
||||
'';
|
||||
};
|
||||
enableDefaultConfig = mkOption {
|
||||
default = true;
|
||||
type = lib.types.bool;
|
||||
|
||||
@ -159,9 +159,14 @@ in
|
||||
|
||||
boot.initrd.extraUtilsCommandsTest = ''
|
||||
# sshd requires a host key to check config, so we pass in the test's
|
||||
tmpkey="$(mktemp initrd-ssh-testkey.XXXXXXXXXX)"
|
||||
cp "${../../../tests/initrd-network-ssh/ssh_host_ed25519_key}" "$tmpkey"
|
||||
# keys from Nix store are world-readable, which sshd doesn't like
|
||||
chmod 600 "$tmpkey"
|
||||
echo -n ${escapeShellArg sshdConfig} |
|
||||
$out/bin/sshd -t -f /dev/stdin \
|
||||
-h ${../../../tests/initrd-network-ssh/ssh_host_ed25519_key}
|
||||
-h "$tmpkey"
|
||||
rm "$tmpkey"
|
||||
'';
|
||||
|
||||
boot.initrd.network.postCommands = ''
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "2018-10-11";
|
||||
version = "2020-07-23";
|
||||
pname = "cmusfm-unstable";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arkq";
|
||||
repo = "cmusfm";
|
||||
rev = "ad2fd0aad3f4f1a25add1b8c2f179e8859885873";
|
||||
sha256 = "0wpwdwgyrp64nvwc6shy0n387p31j6aw6cnmfi9x2y1jhl5hbv6b";
|
||||
rev = "73df3e64d8aa3b5053b639615b8f81d512420e52";
|
||||
sha256 = "1p9i65v8hda9bsps4hm9m2b7aw9ivk4ncllg8svyp455gn5v8xx6";
|
||||
};
|
||||
# building
|
||||
configureFlags = [ "--enable-libnotify" ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, unzip
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, imagemagick
|
||||
, SDL
|
||||
@ -37,7 +38,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src";
|
||||
|
||||
nativeBuildInputs = [ unzip imagemagick ];
|
||||
nativeBuildInputs = [ copyDesktopItems unzip imagemagick ];
|
||||
buildInputs = [ SDL ];
|
||||
|
||||
# PREFIX gets treated as BINDIR.
|
||||
@ -51,11 +52,16 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
# Other files get installed during the build phase.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
convert goattrk2.bmp goattracker.png
|
||||
install -Dm644 goattracker.png $out/share/icons/hicolor/32x32/apps/goattracker.png
|
||||
${desktopItem.buildCommand}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
|
||||
meta = {
|
||||
description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices"
|
||||
+ optionalString isStereo " - Stereo version";
|
||||
@ -66,4 +72,3 @@ in stdenv.mkDerivation rec {
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
stdenv.mkDerivation {
|
||||
name = "kak-auto-pairs";
|
||||
version = "2019-07-27";
|
||||
version = "2020-07-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexherbo2";
|
||||
repo = "auto-pairs.kak";
|
||||
rev = "886449b1a04d43e5deb2f0ef4b1aead6084c7a5f";
|
||||
sha256 = "0knfhdvslzw1f1r1k16733yhkczrg3yijjz6n2qwira84iv3239j";
|
||||
rev = "5b4b3b723c34c8b7f40cee60868204974349bf9f";
|
||||
sha256 = "1wgrv03f1lkzflbbaz8n23glij5rvfxf8pcqysd668mbx1hcrk9i";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtcharts
|
||||
, qtsvg
|
||||
, marble
|
||||
@ -12,18 +11,17 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "zombietrackergps";
|
||||
version = "1.01";
|
||||
version = "1.03";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ldutils-projects";
|
||||
repo = pname;
|
||||
rev = "v_${version}";
|
||||
sha256 = "0h354ydbahy8rpkmzh5ym5bddbl6irjzklpcg6nbkv6apry84d48";
|
||||
sha256 = "1rmdy6kijmcxamm4mqmz8638xqisijlnpv8mimgxywpf90h9rrwq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ldutils
|
||||
qtbase
|
||||
qtcharts
|
||||
qtsvg
|
||||
marble.dev
|
||||
@ -49,7 +47,8 @@ mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "GPS track manager for Qt using KDE Marble maps";
|
||||
homepage = "https://gitlab.com/ldutils-projects/zombietrackergps";
|
||||
homepage = "https://www.zombietrackergps.net/ztgps/";
|
||||
changelog = "https://www.zombietrackergps.net/ztgps/history.html";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sohalt ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.3.4";
|
||||
version = "4.4";
|
||||
|
||||
binpath = stdenv.lib.makeBinPath [
|
||||
cabextract
|
||||
@ -65,7 +65,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
|
||||
sha256 = "019dvb55zqrhlbx73p6913807ql866rm0j011ix5mkk2g79dzhqp";
|
||||
sha256 = "0n40927c8cnjackfns68zwl7h4d7dvhf7cyqdkazzwwx4k2xxvma";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -386,4 +386,6 @@ buildStdenv.mkDerivation ({
|
||||
|
||||
# on aarch64 this is also required
|
||||
dontUpdateAutotoolsGnuConfigScripts = true;
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
})
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
|
||||
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
|
||||
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
|
||||
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
|
||||
, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
|
||||
, kerberos, libdrm, mesa
|
||||
, libxkbcommon, wayland # ozone/wayland
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
, chromium
|
||||
|
||||
, gsettings-desktop-schemas
|
||||
, gnome2, gnome3
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -49,8 +49,6 @@ let
|
||||
};
|
||||
|
||||
version = chromium.upstream-info.version;
|
||||
gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
|
||||
gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
|
||||
|
||||
deps = [
|
||||
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
|
||||
@ -65,7 +63,7 @@ let
|
||||
kerberos libdrm mesa coreutils
|
||||
libxkbcommon wayland
|
||||
] ++ optional pulseSupport libpulseaudio
|
||||
++ [ gtk ];
|
||||
++ [ gtk3 ];
|
||||
|
||||
suffix = if channel != "stable" then "-" + channel else "";
|
||||
|
||||
@ -79,10 +77,10 @@ in stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||
buildInputs = [
|
||||
# needed for GSETTINGS_SCHEMAS_PATH
|
||||
gsettings-desktop-schemas glib gtk
|
||||
gsettings-desktop-schemas glib gtk3
|
||||
|
||||
# needed for XDG_ICON_DIRS
|
||||
gnome.adwaita-icon-theme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, bzip2
|
||||
, cargo
|
||||
, common-updater-scripts
|
||||
, copyDesktopItems
|
||||
, coreutils
|
||||
, curl
|
||||
, dbus
|
||||
@ -83,6 +84,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
autoconf213
|
||||
cargo
|
||||
copyDesktopItems
|
||||
gnused
|
||||
llvmPackages.llvm
|
||||
m4
|
||||
@ -262,8 +264,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = let
|
||||
desktopItem = makeDesktopItem {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
categories = lib.concatStringsSep ";" [ "Application" "Network" ];
|
||||
desktopName = "Thunderbird";
|
||||
genericName = "Mail Reader";
|
||||
@ -283,12 +285,11 @@ stdenv.mkDerivation rec {
|
||||
"x-scheme-handler/snews"
|
||||
"x-scheme-handler/nntp"
|
||||
];
|
||||
};
|
||||
in ''
|
||||
})
|
||||
];
|
||||
postInstall = ''
|
||||
# TODO: Move to a dev output?
|
||||
rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
|
||||
|
||||
${desktopItem.buildCommand}
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, bzip2
|
||||
, cargo
|
||||
, common-updater-scripts
|
||||
, copyDesktopItems
|
||||
, coreutils
|
||||
, curl
|
||||
, dbus
|
||||
@ -82,6 +83,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
autoconf213
|
||||
cargo
|
||||
copyDesktopItems
|
||||
gnused
|
||||
llvmPackages.llvm
|
||||
m4
|
||||
@ -257,8 +259,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = let
|
||||
desktopItem = makeDesktopItem {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
categories = lib.concatStringsSep ";" [ "Application" "Network" ];
|
||||
desktopName = "Thunderbird";
|
||||
genericName = "Mail Reader";
|
||||
@ -278,12 +280,12 @@ stdenv.mkDerivation rec {
|
||||
"x-scheme-handler/snews"
|
||||
"x-scheme-handler/nntp"
|
||||
];
|
||||
};
|
||||
in ''
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# TODO: Move to a dev output?
|
||||
rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
|
||||
|
||||
${desktopItem.buildCommand}
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
@ -321,6 +323,8 @@ stdenv.mkDerivation rec {
|
||||
gnugrep curl runtimeShell;
|
||||
};
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A full-featured e-mail client";
|
||||
homepage = "https://www.thunderbird.net";
|
||||
|
||||
@ -409,7 +409,11 @@ in (mkDrv rec {
|
||||
librevenge libe-book libmwaw glm ncurses epoxy
|
||||
libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
|
||||
]
|
||||
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
|
||||
gst-libav
|
||||
])
|
||||
++ lib.optional kdeIntegration [ qtbase qtx11extras kcoreaddons kio ];
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper
|
||||
{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems
|
||||
|
||||
# Dynamic Libraries
|
||||
, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender
|
||||
@ -27,6 +27,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
@ -110,17 +111,14 @@ in stdenv.mkDerivation {
|
||||
# remove broken symbolic links
|
||||
find $out -xtype l -ls -exec rm {} \;
|
||||
|
||||
# Add desktop items
|
||||
${desktopItems.planmaker.buildCommand}
|
||||
${desktopItems.presentations.buildCommand}
|
||||
${desktopItems.textmaker.buildCommand}
|
||||
|
||||
# Add mime types
|
||||
install -D -t $out/share/mime/packages ${pname}/mime/softmaker-*office*${shortEdition}.xml
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = builtins.attrValues desktopItems;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An office suite with a word processor, spreadsheet and presentation program";
|
||||
homepage = "https://www.softmaker.com/";
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, cups
|
||||
, dbus
|
||||
, expat
|
||||
, ffmpeg_3
|
||||
, ffmpeg
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk-pixbuf
|
||||
@ -38,11 +38,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wpsoffice";
|
||||
version = "11.1.0.9505";
|
||||
version = "11.1.0.9615";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9505/wps-office_11.1.0.9505.XA_amd64.deb";
|
||||
sha256 = "1bvaxwd3npw3kswk7k1p6mcbfg37x0ym4sp6xis6ykz870qivqk5";
|
||||
url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9615/wps-office_11.1.0.9615.XA_amd64.deb";
|
||||
sha256 = "0dpd4njpizclllps3qagipycfws935rhj9k5gmdhjfgsk0ns188w";
|
||||
};
|
||||
unpackCmd = "dpkg -x $src .";
|
||||
sourceRoot = ".";
|
||||
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
cairo
|
||||
dbus.lib
|
||||
expat
|
||||
ffmpeg_3
|
||||
ffmpeg
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
arch = "x86_64";
|
||||
|
||||
desktopItem = makeDesktopItem rec {
|
||||
@ -25,7 +25,7 @@ in stdenv.mkDerivation {
|
||||
inherit version;
|
||||
src = fetchzip {
|
||||
url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
|
||||
sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm";
|
||||
sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
|
||||
{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper
|
||||
, git, bash, gzip, openssh, pam
|
||||
, sqliteSupport ? true
|
||||
, pamSupport ? true
|
||||
@ -6,25 +6,26 @@
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "gogs";
|
||||
version = "0.11.91";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gogs";
|
||||
repo = "gogs";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yfimgjg9n773kdml17119539w9736mi66bivpv5yp3cj2hj9mlj";
|
||||
sha256 = "0ix3mxy8cpqbx24qffbzyf5z88x7605icm7rk5n54r8bdsr7cckd";
|
||||
};
|
||||
|
||||
patches = [ ./static-root-path.patch ];
|
||||
vendorSha256 = "0m0g4dsiq8p2ngsbjxfi3wff7x4xpm67qlhgcgf8b48mqai4d2gc";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace pkg/setting/setting.go --subst-var data
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper openssh ];
|
||||
|
||||
buildInputs = optional pamSupport pam;
|
||||
|
||||
@ -34,18 +35,12 @@ buildGoPackage rec {
|
||||
( optional sqliteSupport "sqlite"
|
||||
++ optional pamSupport "pam");
|
||||
|
||||
outputs = [ "out" "data" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $data
|
||||
cp -R $src/{public,templates} $data
|
||||
|
||||
wrapProgram $out/bin/gogs \
|
||||
--prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
|
||||
'';
|
||||
|
||||
goPackagePath = "github.com/gogs/gogs";
|
||||
|
||||
meta = {
|
||||
description = "A painless self-hosted Git service";
|
||||
homepage = "https://gogs.io";
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
|
||||
index f206592d..796da6ef 100644
|
||||
--- a/pkg/setting/setting.go
|
||||
+++ b/pkg/setting/setting.go
|
||||
@@ -474,7 +474,7 @@ func NewContext() {
|
||||
LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/")
|
||||
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
|
||||
DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
|
||||
- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir)
|
||||
+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
|
||||
AppDataPath = sec.Key("APP_DATA_PATH").MustString("data")
|
||||
EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pitivi";
|
||||
version = "2020.09.1";
|
||||
version = "2020.09.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1by52b56s9c3h23n40iccygkazwlhii2gb28zhnj2xz5805j05y2";
|
||||
sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
42
pkgs/build-support/setup-hooks/copy-desktop-items.sh
Normal file
42
pkgs/build-support/setup-hooks/copy-desktop-items.sh
Normal file
@ -0,0 +1,42 @@
|
||||
# shellcheck shell=bash
|
||||
|
||||
# Setup hook that installs specified desktop items.
|
||||
#
|
||||
# Example usage in a derivation:
|
||||
#
|
||||
# { …, makeDesktopItem, copyDesktopItems, … }:
|
||||
#
|
||||
# let desktopItem = makeDesktopItem { … }; in
|
||||
# stdenv.mkDerivation {
|
||||
# …
|
||||
# nativeBuildInputs = [ copyDesktopItems ];
|
||||
#
|
||||
# desktopItems = [ desktopItem ];
|
||||
# …
|
||||
# }
|
||||
#
|
||||
# This hook will copy files which are either given by full path
|
||||
# or all '*.desktop' files placed inside the 'share/applications'
|
||||
# folder of each `desktopItems` argument.
|
||||
|
||||
postInstallHooks+=(copyDesktopItems)
|
||||
|
||||
copyDesktopItems() {
|
||||
if [ "${dontCopyDesktopItems-}" = 1 ]; then return; fi
|
||||
|
||||
if [ -z "$desktopItems" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
for desktopItem in $desktopItems; do
|
||||
if [[ -f "$desktopItem" ]]; then
|
||||
echo "Copying '$f' into '$out/share/applications'"
|
||||
install -D -m 444 -t "$out"/share/applications "$f"
|
||||
else
|
||||
for f in "$desktopItem"/share/applications/*.desktop; do
|
||||
echo "Copying '$f' into '$out/share/applications'"
|
||||
install -D -m 444 -t "$out"/share/applications "$f"
|
||||
done
|
||||
fi
|
||||
done
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
|
||||
, targetPackages
|
||||
, fetchurl, file, python3
|
||||
, llvm_10, darwin, cmake, rust, rustPlatform
|
||||
, pkgconfig, openssl
|
||||
@ -92,6 +93,8 @@ in stdenv.mkDerivation rec {
|
||||
"${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config"
|
||||
] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [
|
||||
"--enable-profiler" # build libprofiler_builtins
|
||||
] ++ optionals stdenv.targetPlatform.isMusl [
|
||||
"${setTarget}.musl-root=${targetPackages.stdenv.cc.libc}"
|
||||
];
|
||||
|
||||
# The bootstrap.py will generated a Makefile that then executes the build.
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, qtbase
|
||||
, qtcharts
|
||||
, qtsvg
|
||||
, qmake
|
||||
@ -9,17 +8,16 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "ldutils";
|
||||
version = "1.01";
|
||||
version = "1.03";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ldutils-projects";
|
||||
repo = pname;
|
||||
rev = "v_${version}";
|
||||
sha256 = "09k2d5wj70xfr3sb4s9ajczq0lh65705pggs54zqqqjxazivbmgk";
|
||||
sha256 = "0pi05py71hh5vlhl0kjh9wxmd7yixw10s0kr2wb4l4c0abqxr82j";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtcharts
|
||||
qtsvg
|
||||
];
|
||||
|
||||
@ -1,17 +1,25 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchgit, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libnova-0.12.3";
|
||||
pname = "libnova";
|
||||
version = "0.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libnova/${name}.tar.gz";
|
||||
sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc";
|
||||
# pull from git repo because upstream stopped tarball releases after v0.15
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/libnova/${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "0icwylwkixihzni0kgl0j8dx3qhqvym6zv2hkw2dy6v9zvysrb1b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Celestial Mechanics, Astrometry and Astrodynamics Library";
|
||||
homepage = "http://libnova.sf.net";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librealsense";
|
||||
version = "2.38.0";
|
||||
version = "2.40.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "IntelRealSense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12rs0gklgzn8bplqjmaxixk04pr870i333mmcp9i5bhkn8x86zbx";
|
||||
sha256 = "KZNriNDxRKR14KFJrAbzZLfSQ3iiZ8PKC80fVh0AQls=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nlopt";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevengj";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1k6x14lgyfhfqpbs7xx8mrgklp8l6jkkcs39zgi2sj3kg6n0hdc9";
|
||||
sha256 = "0xm8y9cg5p2vgxbn8wn8gqfpxkbm0m4qsidp0bq1dqs8gvj9017v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "mongodb";
|
||||
|
||||
version = "1.8.2";
|
||||
sha256 = "01l300204ph9nd7khd9qazpdbi1biqvmjqbxbngdfjk9n5d8vvzw";
|
||||
version = "1.9.0";
|
||||
sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
|
||||
|
||||
nativeBuildInputs = [ pkgs.pkgconfig ];
|
||||
buildInputs = with pkgs; [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ mkDerivation, fetchurl, pkgs, lib, php }:
|
||||
let
|
||||
pname = "phpstan";
|
||||
version = "0.12.55";
|
||||
version = "0.12.57";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
|
||||
sha256 = "1qyywsivfal1d8485v2iyg5x3f9krnviv5nidgfv53ywrm9k4lgp";
|
||||
sha256 = "0i1ycfmi638myl9840k4rl0z9klk0q25l8ykkkfg20kx5mdidvgc";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ mkDerivation, fetchurl, pkgs, lib, php }:
|
||||
let
|
||||
pname = "psalm";
|
||||
version = "4.1.1";
|
||||
version = "4.2.1";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
|
||||
sha256 = "05qjrg8wxlqxihv7xl31n73ygx7ykvcpbh2gq958iin4rr1bcy88";
|
||||
sha256 = "0g6s3bn8aaggpqjgr0bqchgkgb4my5ksfycyyqy7nrly2bgn1kbz";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "xdebug";
|
||||
|
||||
version = "2.9.8";
|
||||
sha256 = "12igfrdfisqfmfqpc321g93pm2w1y7h24bclmxjrjv6rb36bcmgm";
|
||||
version = "3.0.0";
|
||||
sha256 = "0qnaqgn2rdjxc70lyrm3nmy7cfma69c7zn6if23hhkhx5kl0fl44";
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
@ -1,32 +1,24 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
|
||||
, pep8, nose, unittest2, docutils, blockdiag, reportlab }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, nose, docutils, blockdiag, reportlab }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "actdiag";
|
||||
version = "0.5.4";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af";
|
||||
sha256 = "0g51v9dmdq18z33v332f1f0cmb3hqgaga5minj0mc2sglark1s7h";
|
||||
};
|
||||
|
||||
patches = fetchpatch {
|
||||
name = "drop_test_pep8.py.patch";
|
||||
url = "https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw";
|
||||
sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4";
|
||||
};
|
||||
propagatedBuildInputs = [ blockdiag docutils ];
|
||||
|
||||
buildInputs = [ pep8 nose unittest2 docutils ];
|
||||
|
||||
propagatedBuildInputs = [ blockdiag ];
|
||||
|
||||
checkInputs = [ reportlab ];
|
||||
checkInputs = [ nose reportlab ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
|
||||
homepage = "http://blockdiag.com/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
maintainers = with maintainers; [ bjornfor SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.1.25";
|
||||
version = "1.1.26";
|
||||
pname = "azure-common";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054";
|
||||
sha256 = "b2866238aea5d7492cfb0282fc8b8d5f6d06fb433872345864d45753c10b6e4f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
pname = "azure-core";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "621b53271f7988b766f8a7d7f7a2c44241e3d2c1d8db13e68089d6da6241748e";
|
||||
sha256 = "ef8ae93a2ce8b595f231395579be11aadc1838168cbc2582e2d0bbd8b15c461f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-identity";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
disabled = isPy38;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "7b071089faf0789059ac24052e311e2b096a002c173d42b96896db09c6e2ba5d";
|
||||
sha256 = "872adfa760b2efdd62595659b283deba92d47b7a67557eb9ff48f0b5d04ee396";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -4,24 +4,26 @@
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-authorization";
|
||||
version = "0.61.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "f5cceea3add04e9445ea88492f15eecf6c126f0406d967c95f6e48b79be8db75";
|
||||
sha256 = "9a9fc16866b46387853381ab4fa0f84c1765e0afea5b0124709ea9fae10ee752";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "17.0.0";
|
||||
version = "18.0.0";
|
||||
pname = "azure-mgmt-compute";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "c7350b404e5d10a548ceddb034394c8fad6c852ce33a3d3b211065813c1da404";
|
||||
sha256 = "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -4,24 +4,26 @@
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerinstance";
|
||||
version = "2.0.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "5ad247d186c3c040da7a1d40ad39c9881e99afc58271f673abb602abb0b6b85b";
|
||||
sha256 = "9f624df0664ba80ba886bc96ffe5e468c620eb5b681bc3bc2a28ce26042fd465";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -4,24 +4,26 @@
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerservice";
|
||||
version = "10.0.0";
|
||||
version = "14.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "9b44b2d0b281fc1999324a715fb5cf4f47d392a35bc0a01f24bb8dbc4c123acd";
|
||||
sha256 = "fbb13448fb52a4090ee91940ae8676403dbe8ae81044b7a5cd3c9e58b47d66de";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
pname = "azure-mgmt-core";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "a3906fa77edfedfcc3229dc3b69489d5ed63b107c7eacbc50092e6cbfbfd83f0";
|
||||
sha256 = "4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -4,24 +4,26 @@
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cosmosdb";
|
||||
version = "1.0.0";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "e08b37aea8e6b62596f55f9beb924e1759b2dc424c180ab2e752153a2b01b723";
|
||||
sha256 = "15e4140870f2756fbd43965ccceca55361a634a0504bbdb033a1909eff14dfb1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -4,24 +4,26 @@
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-redis";
|
||||
version = "6.0.0";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "db999e104edeee3a13a8ceb1881e15196fe03a02635e0e20855eb52c1e2ecca1";
|
||||
sha256 = "8ae563e3df82a2f206d0483ae6f05d93d0d1835111c0bbca7236932521eed356";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
pname = "azure-mgmt-security";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c0d232cdb5ad74f4590db2e44df74c0872fcb9fded7f03c7b57188a63b54ecfa";
|
||||
sha256 = "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@ -4,24 +4,26 @@
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-servicebus";
|
||||
version = "1.0.0";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "bb37d97eb3798740a0bc1bfa37b04946a193a6d1a3b0849fdc5e1dc2a9f25d81";
|
||||
sha256 = "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -4,24 +4,26 @@
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-sql";
|
||||
version = "0.24.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "da391ed00d82cd8e20ca50affdc43b99fd9a7919b54a3a0d53c73cb41eea09d3";
|
||||
sha256 = "c7904f8798fbb285a2160c41c8bd7a416c6bd987f5d36a9b98c16f41e24e9f47";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-synapse";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
disabled = pythonOlder "3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ebd4dcb980a6425f4db7dd94225332b6bd74e1089b0c6e57af868d96ceab1d3c";
|
||||
sha256 = "4eb76230c38525b71eb1addefebd265bc3d9b68ba7ff60ce5356d39f68ed2837";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@ -4,24 +4,26 @@
|
||||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-web";
|
||||
version = "0.48.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "da0f9e3b57528c72a7bc92e3515413a4a4fdbc9626c26ac04b7551a7739a81ec";
|
||||
sha256 = "c4b218a5d1353cd7c55b39c9b2bd1b13bfbe3b8a71bc735122b171eab81670d1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchPypi
|
||||
, uamqp
|
||||
, azure-common
|
||||
, azure-core
|
||||
, msrestazure
|
||||
, futures
|
||||
, isPy3k
|
||||
@ -10,17 +11,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-servicebus";
|
||||
version = "0.50.3";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "2b1e60c81fcf5b6a5bb3ceddb27f24543f479912e39a4706a390a16d8c0a71f4";
|
||||
sha256 = "875527251c1fed99fcb90597c6abb7daa4bc0ed88e080b4c36f897b704668450";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
uamqp
|
||||
azure-common
|
||||
azure-core
|
||||
msrestazure
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
futures
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-storage-blob";
|
||||
version = "12.5.0";
|
||||
version = "12.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1469a5a0410296fb5ff96c326618d939c9cb0c0ea45eb931c89c98fa742d8daa";
|
||||
sha256 = "dc7832d48ae3f5b31a0b24191084ce6ef7d8dfbf73e553dfe34eaddcb6813be3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-storage-file-share";
|
||||
version = "12.2.0";
|
||||
version = "12.3.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "b649ed8afd67c10c9833f349a7c579d771a6425ad6b88027130a6b8cfa433ffb";
|
||||
sha256 = "9f24a0ab51fd7ad294353594660b21081233f68ed8ee7483cdca26a70ce0ccbc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,23 +1,21 @@
|
||||
{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
|
||||
, pillow, webcolors, funcparserlib
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub
|
||||
, setuptools, funcparserlib, pillow, webcolors, reportlab, docutils
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blockdiag";
|
||||
version = "1.5.3";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
|
||||
sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "blockdiag";
|
||||
repo = "blockdiag";
|
||||
rev = version;
|
||||
sha256 = "1cvcl66kf4wdh2n4fdk37zk59lp58wd2fhf84n7pbn0lilyksk5x";
|
||||
};
|
||||
|
||||
buildInputs = [ pep8 nose unittest2 docutils ];
|
||||
propagatedBuildInputs = [ setuptools funcparserlib pillow webcolors reportlab docutils ];
|
||||
|
||||
propagatedBuildInputs = [ pillow webcolors funcparserlib ];
|
||||
|
||||
# One test fails:
|
||||
# ...
|
||||
# FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams)
|
||||
# require network and fail
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@ -25,6 +23,6 @@ buildPythonPackage rec {
|
||||
homepage = "http://blockdiag.com/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
maintainers = with maintainers; [ bjornfor SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, blockdiag
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blockdiagcontrib-cisco";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "06iw3q1w4g3lbgcmyz8m93rv0pfnk2gp8k83rs9ir671ym99gwr2";
|
||||
};
|
||||
|
||||
buildInputs = [ blockdiag ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Noderenderer plugin for blockdiag containing Cisco networking symbols";
|
||||
homepage = "https://bitbucket.org/blockdiag/blockdiag-contrib/";
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
license = licenses.psfl;
|
||||
};
|
||||
|
||||
}
|
||||
24
pkgs/development/python-modules/hjson/default.nix
Normal file
24
pkgs/development/python-modules/hjson/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hjson";
|
||||
version = "3.0.2";
|
||||
|
||||
# N.B. pypi src tarball does not have tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "hjson";
|
||||
repo = "hjson-py";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jc7j790rcqnhbrfj4lhnz3f6768dc55aij840wmx16jylfqpc2n";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A user interface for JSON";
|
||||
homepage = "https://github.com/hjson/hjson-py";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
};
|
||||
}
|
||||
@ -1,19 +1,18 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, aiohttp, future-fstrings, pythonOlder
|
||||
{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder
|
||||
, sqlalchemy, ruamel_yaml, CommonMark, lxml, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.5.8";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0";
|
||||
sha256 = "0bnflaz0nkjvps3b87ig02d3pymnrgrwcd0p0s6qyzx9s08lcz5x";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
future-fstrings
|
||||
|
||||
# defined in optional-requirements.txt
|
||||
sqlalchemy
|
||||
@ -22,7 +21,7 @@ buildPythonPackage rec {
|
||||
lxml
|
||||
];
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# no tests available
|
||||
doCheck = false;
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msal-extensions";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "31414753c484679bb3b6c6401623eb4c3ccab630af215f2f78c1d5c4f8e1d1a9";
|
||||
sha256 = "0qbq5qn46053aclpwyzac5zs2xgqirn4hwrf1plrg0m8bnhxy8sm";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msal";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7efb0256c96a7b2eadab49ce29ecdb91352a91440c12a40bed44303724b62fda";
|
||||
sha256 = "15mx1fakz9c5qrrspsckd3yr3l5lac0pbjq8v65r26n3203xx5f9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -41,7 +41,10 @@ buildPythonPackage rec {
|
||||
install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf"
|
||||
install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf"
|
||||
|
||||
cp -ra powerline/bindings/{bash,fish,shell,tcsh,tmux,vim,zsh} $out/share/
|
||||
install -dm755 "$out/share/fish/vendor_functions.d"
|
||||
install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish"
|
||||
|
||||
cp -ra powerline/bindings/{bash,shell,tcsh,tmux,vim,zsh} $out/share/
|
||||
rm $out/share/*/*.py
|
||||
'';
|
||||
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "799fa5fc172ff0a5bc8eb5dfcd1db200747c114320d2dc40060594a71efa3e53";
|
||||
sha256 = "a5c8805759114aac3a1db1b20f42af1124da5315be903ccb4c472cc8452393fb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,16 +2,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "telethon";
|
||||
version = "1.14.0";
|
||||
version = "1.17.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Telethon";
|
||||
sha256 = "1fg12gcg6ca7rjh7m3g48m30cx4aaw5g09855nlyz2sa1kw3gfyq";
|
||||
sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async_generator
|
||||
rsa
|
||||
pyaes
|
||||
];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pack";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildpacks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0i3lzfn5m38f8aiwqydffdq2j8gfcnkmcgasfjxbn6rrs0hw5g92";
|
||||
sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c";
|
||||
};
|
||||
|
||||
vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7";
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, nixosTests
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, wrapGAppsHook
|
||||
@ -38,7 +39,6 @@ let
|
||||
comment = "Official launcher for Minecraft, a sandbox-building game";
|
||||
desktopName = "Minecraft Launcher";
|
||||
categories = "Game;";
|
||||
fileValidation = false;
|
||||
};
|
||||
|
||||
envLibPath = stdenv.lib.makeLibraryPath [
|
||||
@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
|
||||
nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems ];
|
||||
buildInputs = [ gobject-introspection ];
|
||||
|
||||
sourceRoot = ".";
|
||||
@ -110,11 +110,14 @@ stdenv.mkDerivation rec {
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt
|
||||
mv minecraft-launcher $out/opt
|
||||
|
||||
${desktopItem.buildCommand}
|
||||
install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
@ -140,6 +143,8 @@ stdenv.mkDerivation rec {
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Official launcher for Minecraft, a sandbox-building game";
|
||||
homepage = "https://minecraft.net";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile
|
||||
, openal, libtheora, SDL2, lzo, libjpeg, libogg, tbb
|
||||
, pcre, makeWrapper }:
|
||||
, pcre, makeWrapper, fetchpatch }:
|
||||
|
||||
let
|
||||
version = "784-october-preview";
|
||||
@ -41,6 +41,13 @@ in stdenv.mkDerivation rec {
|
||||
hardeningDisable = [ "format" ];
|
||||
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch";
|
||||
sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo
|
||||
libjpeg libogg tbb pcre
|
||||
@ -50,10 +57,6 @@ in stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
substituteInPlace src/xrCore/xrCore.cpp \
|
||||
--replace /usr/share $out/share
|
||||
|
||||
# https://github.com/OpenXRay/xray-16/issues/667
|
||||
echo "inline const char* xr_sys_errlist[100] = {};" >> src/Common/PlatformLinux.inl
|
||||
echo "#define _sys_errlist xr_sys_errlist" >> src/Common/PlatformLinux.inl
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "18.3";
|
||||
version = "18.4";
|
||||
pname = "pentobi";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "enz";
|
||||
repo = "pentobi";
|
||||
rev = "v${version}";
|
||||
sha256 = "9AymvAlXi0zkkcakTR0mC4gmyrweZR4EwlhORkmVshw=";
|
||||
sha256 = "1wawy6s3i4pcc6n6kfspn5b4g957ds0728mgwzw19agp5yyid73b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake docbook_xsl qttools ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommandNoCC, makeDesktopItem
|
||||
, xonotic-data
|
||||
, xonotic-data, copyDesktopItems
|
||||
, # required for both
|
||||
unzip, libjpeg, zlib, libvorbis, curl
|
||||
, # glx
|
||||
@ -131,7 +131,8 @@ in rec {
|
||||
|
||||
xonotic = runCommandNoCC "xonotic${variant}-${version}" {
|
||||
inherit xonotic-unwrapped;
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||
desktopItems = [ desktopItem ];
|
||||
passthru = {
|
||||
inherit version;
|
||||
meta = meta // {
|
||||
@ -151,7 +152,7 @@ in rec {
|
||||
'' + lib.optionalString (withSDL || withGLX) ''
|
||||
mkdir -p $out/share
|
||||
ln -s ${xonotic-unwrapped}/share/icons $out/share/icons
|
||||
${desktopItem.buildCommand}
|
||||
copyDesktopItems
|
||||
'' + ''
|
||||
for binary in $out/bin/xonotic-*; do
|
||||
wrapProgram $binary --add-flags "-basedir ${xonotic-data}"
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sysdig";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "draios";
|
||||
repo = "sysdig";
|
||||
rev = version;
|
||||
sha256 = "0lpp271g0749sx7qgpwl6myi0kgfpsxk1kc4yp3r9k1pynv8bq1b";
|
||||
sha256 = "sha256-lYjMvxMIReANNwMr62u881Nugrs9piOaN3EmrvGzRns=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
||||
@ -8,11 +8,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdns-recursor";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
|
||||
sha256 = "12z59xf63iskid08c3y55h238ma2chgvcbks0zprag7i00p97g06";
|
||||
sha256 = "162nczipxnsbgg7clap697yikxjz1vdsjkaxxsn6hb6l6m3a6zzr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -11,20 +11,24 @@ let
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "mautrix-telegram";
|
||||
version = "0.8.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.9.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0mhy9b933haz1bldkglvn81warjxdjdzgkviiv5k6fykghq473jf";
|
||||
sha256 = "1543ljjl3jg3ayid7ifi4bamqh4gq85pmlbs3m8i7phjbbm7g9dn";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/alembic>/d' requirements.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytestrunner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
Mako
|
||||
aiohttp
|
||||
@ -32,7 +36,6 @@ in buildPythonPackage rec {
|
||||
sqlalchemy
|
||||
CommonMark
|
||||
ruamel_yaml
|
||||
future-fstrings
|
||||
python_magic
|
||||
telethon
|
||||
telethon-session-sqlalchemy
|
||||
@ -53,9 +56,12 @@ in buildPythonPackage rec {
|
||||
];
|
||||
});
|
||||
|
||||
# Tests are broken and throw the following for every test:
|
||||
# TypeError: 'Mock' object is not subscriptable
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestrunner
|
||||
pytest-mock
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
@ -18,14 +18,14 @@ stdenv.mkDerivation rec {
|
||||
''}
|
||||
'';
|
||||
|
||||
buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd;
|
||||
buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd;
|
||||
# More cross-compiling fixes.
|
||||
# Note: this enables libc malloc as a temporary fix for cross-compiling.
|
||||
# Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
|
||||
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
|
||||
++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"];
|
||||
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "2.14.2";
|
||||
version = "2.15.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
sha256 = "1d5qd39b0i5icg193ybr9gzl0axqw5ml5zjwqin1zxqj5y3r6sc2";
|
||||
sha256 = "05vwaafb6yzvrhig0gjkb4803yj6qr00gqh41rws9520899f2m9d";
|
||||
};
|
||||
|
||||
# put packages that needs to be overriden in the py package scope
|
||||
|
||||
@ -83,6 +83,11 @@ let
|
||||
++ lib.optionals isPy3k [ antlr4-python3-runtime ]
|
||||
++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2"
|
||||
'';
|
||||
|
||||
doCheck = stdenv.isLinux;
|
||||
# ignore tests that does network call
|
||||
checkPhase = ''
|
||||
@ -128,8 +133,8 @@ let
|
||||
azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip"
|
||||
"1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83";
|
||||
|
||||
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "0.2.0" "zip"
|
||||
"1li2bcdwdapwwx7xbvgfsq51f2mrwm0qyzih8cjhszcah2rkpxw5";
|
||||
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip"
|
||||
"8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
|
||||
|
||||
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip"
|
||||
"1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd";
|
||||
@ -191,8 +196,8 @@ let
|
||||
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
|
||||
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
|
||||
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.12.0" "zip"
|
||||
"7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76";
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.13.0" "zip"
|
||||
"1fq3hgwwhba6vv07rciiibwmp2zlygz20zp1mzdxajqlfg838q78";
|
||||
|
||||
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
|
||||
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
|
||||
@ -248,8 +253,8 @@ let
|
||||
azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip"
|
||||
"186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85";
|
||||
|
||||
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b3" "zip"
|
||||
"1w8kp4r8v54cr4sskkgv5mbqx2pisrly2066ma5msg6amy97jnr6";
|
||||
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip"
|
||||
"2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d";
|
||||
|
||||
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip"
|
||||
"0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm";
|
||||
@ -269,8 +274,8 @@ let
|
||||
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
|
||||
"0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m";
|
||||
|
||||
azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.2.0" "zip"
|
||||
"0a05djzgwnd9lwj5mazmjfv91k72v9scf612kf6vkjjq7jzkr3pw";
|
||||
azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "16.0.0" "zip"
|
||||
"2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5";
|
||||
|
||||
azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip"
|
||||
"1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj";
|
||||
@ -278,8 +283,8 @@ let
|
||||
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip"
|
||||
"0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap";
|
||||
|
||||
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip"
|
||||
"0nq9gbhc2qlllz6v6mdymw25acxpay9cxiafb63pss30jyyj04cx";
|
||||
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.0.0" "zip"
|
||||
"fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8";
|
||||
|
||||
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz"
|
||||
"09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf";
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchCrate, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
pname = "oxipng";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "0p9h006l75ci324lbcx496732pb77srcd46g6dnfw3mcrg33cspc";
|
||||
sha256 = "0mgd33cb112yg1bz8jhsbk2w8p2gdiw510bfv4z82b2mg6pl6b9r";
|
||||
};
|
||||
|
||||
cargoSha256 = "1r2zw7p95abxqc31b5gswdyhm4msxsiml34dsh9x8zydhqnwy17j";
|
||||
cargoSha256 = "01g3qansrvvv85b1kxg4609lnj3bizavg3r7651hn03cnlychj2n";
|
||||
|
||||
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ GEM
|
||||
ethon (0.12.0)
|
||||
ffi (>= 1.3.0)
|
||||
ffi (1.13.1)
|
||||
html-proofer (3.17.2)
|
||||
html-proofer (3.17.3)
|
||||
addressable (~> 2.3)
|
||||
mercenary (~> 0.3)
|
||||
nokogumbo (~> 2.0)
|
||||
@ -18,7 +18,7 @@ GEM
|
||||
mini_portile2 (2.4.0)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.3)
|
||||
nokogumbo (2.0.4)
|
||||
nokogiri (~> 1.8, >= 1.8.4)
|
||||
parallel (1.20.1)
|
||||
public_suffix (4.0.6)
|
||||
|
||||
@ -37,10 +37,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05h3liirjx6wvh97vdl59hmwzgji1ih61xq1w5nl87cmhpsxaqsf";
|
||||
sha256 = "1i05vgyhyyps867zgpcd13wdidf0cpra39rhfff1jhkc1hn766lm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.17.2";
|
||||
version = "3.17.3";
|
||||
};
|
||||
mercenary = {
|
||||
groups = ["default"];
|
||||
@ -79,10 +79,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nif9bn7zlizfcsk464b8n5gvspdim34hl7ldw2y7w4lcnwgg4zg";
|
||||
sha256 = "0pxm7hx2lhmanm8kljd39f1j1742kl0a31zx98jsjiwrkfb5hhc6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
};
|
||||
parallel = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, unzip, jre, makeDesktopItem }:
|
||||
{ stdenv, fetchurl, unzip, jre, makeDesktopItem, copyDesktopItems }:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
@ -18,11 +18,12 @@ stdenv.mkDerivation {
|
||||
sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
buildInputs = [ unzip ];
|
||||
inherit jre;
|
||||
|
||||
installPhase = ''
|
||||
source $stdenv/setup
|
||||
runHook preInstall
|
||||
|
||||
unzip $src
|
||||
|
||||
@ -38,9 +39,11 @@ stdenv.mkDerivation {
|
||||
EOF
|
||||
chmod +x $out/bin/jdiskreport
|
||||
|
||||
${desktopItem.buildCommand}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.jgoodies.com/freeware/jdiskreport/";
|
||||
description = "A graphical utility to visualize disk usage";
|
||||
|
||||
@ -10,16 +10,16 @@ let
|
||||
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "cached-nix-shell";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xzfc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ni671wr2lrvyz6myaz3v4llrjvq4jc1ygw1m7rvnadzyf3va3lw";
|
||||
sha256 = "0w6khry1ncyqy5h6996xw1f6viw4wdrfji5m8lz9gm487xlq5v0b";
|
||||
};
|
||||
|
||||
cargoSha256 = "19i39b1yqdf81ql4psr3nfah6ci2mw3ljkv740clqmz088j2av8g";
|
||||
cargoSha256 = "0d4fz0rhqy1n30wfl2pmf76zpp21agr3h0hswp3r5bfnxqp6i54h";
|
||||
|
||||
# The BLAKE3 C library is intended to be built by the project depending on it
|
||||
# rather than as a standalone library.
|
||||
@ -29,14 +29,11 @@ in rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ ronn ];
|
||||
|
||||
postBuild = ''
|
||||
ronn -r cached-nix-shell.1.md
|
||||
make -f nix/Makefile post-build
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty
|
||||
cp $releaseDir/build/cached-nix-shell-*/out/trace-nix.so $out/lib
|
||||
cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh
|
||||
cp cached-nix-shell.1 $out/share/man/man1
|
||||
make -f nix/Makefile post-install
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, perl, writeText, runtimeShell }:
|
||||
{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell }:
|
||||
|
||||
let
|
||||
pname = "jd-gui";
|
||||
@ -55,9 +55,9 @@ let
|
||||
}
|
||||
'';
|
||||
|
||||
desktopItem = launcher: makeDesktopItem {
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "jd-gui";
|
||||
exec = "${launcher} %F";
|
||||
exec = "jd-gui %F";
|
||||
icon = "jd-gui";
|
||||
comment = "Java Decompiler JD-GUI";
|
||||
desktopName = "JD-GUI";
|
||||
@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
nativeBuildInputs = [ jdk gradle_5 ];
|
||||
nativeBuildInputs = [ jdk gradle_5 copyDesktopItems ];
|
||||
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
@ -81,6 +81,8 @@ in stdenv.mkDerivation rec {
|
||||
installPhase = let
|
||||
jar = "$out/share/jd-gui/${name}.jar";
|
||||
in ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps}
|
||||
cp build/libs/${name}.jar ${jar}
|
||||
cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png
|
||||
@ -92,9 +94,11 @@ in stdenv.mkDerivation rec {
|
||||
EOF
|
||||
chmod +x $out/bin/jd-gui
|
||||
|
||||
${(desktopItem "$out/bin/jd-gui").buildCommand}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Fast Java Decompiler with powerful GUI";
|
||||
homepage = "https://java-decompiler.github.io/";
|
||||
|
||||
@ -463,6 +463,8 @@ in
|
||||
|
||||
madonctl = callPackage ../applications/misc/madonctl { };
|
||||
|
||||
copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh;
|
||||
|
||||
makeDesktopItem = callPackage ../build-support/make-desktopitem { };
|
||||
|
||||
makeAutostartItem = callPackage ../build-support/make-startupitem { };
|
||||
@ -25072,7 +25074,7 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { };
|
||||
zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { };
|
||||
|
||||
zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { };
|
||||
|
||||
|
||||
@ -910,7 +910,7 @@ in {
|
||||
|
||||
blockdiag = callPackage ../development/python-modules/blockdiag { };
|
||||
|
||||
blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { };
|
||||
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
|
||||
|
||||
block-io = callPackage ../development/python-modules/block-io { };
|
||||
|
||||
@ -2757,6 +2757,8 @@ in {
|
||||
|
||||
hiyapyco = callPackage ../development/python-modules/hiyapyco { };
|
||||
|
||||
hjson = callPackage ../development/python-modules/hjson { };
|
||||
|
||||
hkdf = callPackage ../development/python-modules/hkdf { };
|
||||
|
||||
hmmlearn = callPackage ../development/python-modules/hmmlearn { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user