Merge branch 'master' into staging-next
Jan Tojnar
commit
c0d2951fa6
|
|
@ -425,7 +425,12 @@ in
|
|||
};
|
||||
|
||||
isoImage.squashfsCompression = mkOption {
|
||||
default = "xz -Xdict-size 100%";
|
||||
default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% "
|
||||
+ lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86"
|
||||
# Untested but should also reduce size for these platforms
|
||||
+ lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm"
|
||||
+ lib.optionalString (isPowerPC) "-Xbcj powerpc"
|
||||
+ lib.optionalString (isSparc) "-Xbcj sparc";
|
||||
description = ''
|
||||
Compression settings to use for the squashfs nix store.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -349,7 +349,7 @@ in
|
|||
{
|
||||
DOMAIN = cfg.domain;
|
||||
STATIC_ROOT_PATH = cfg.staticRootPath;
|
||||
LFS_JWT_SECRET = "#jwtsecret#";
|
||||
LFS_JWT_SECRET = "#lfsjwtsecret#";
|
||||
ROOT_URL = cfg.rootUrl;
|
||||
}
|
||||
(mkIf cfg.enableUnixSocket {
|
||||
|
|
@ -381,6 +381,7 @@ in
|
|||
|
||||
security = {
|
||||
SECRET_KEY = "#secretkey#";
|
||||
INTERNAL_TOKEN = "#internaltoken#";
|
||||
INSTALL_LOCK = true;
|
||||
};
|
||||
|
||||
|
|
@ -396,6 +397,10 @@ in
|
|||
mailer = mkIf (cfg.mailerPasswordFile != null) {
|
||||
PASSWD = "#mailerpass#";
|
||||
};
|
||||
|
||||
oauth2 = {
|
||||
JWT_SECRET = "#oauth2jwtsecret#";
|
||||
};
|
||||
};
|
||||
|
||||
services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) {
|
||||
|
|
@ -455,10 +460,20 @@ in
|
|||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ gitea pkgs.git ];
|
||||
|
||||
# In older versions the secret naming for JWT was kind of confusing.
|
||||
# The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET
|
||||
# wasn't persistant at all.
|
||||
# To fix that, there is now the file oauth2_jwt_secret containing the
|
||||
# values for JWT_SECRET and the file jwt_secret gets renamed to
|
||||
# lfs_jwt_secret.
|
||||
# We have to consider this to stay compatible with older installations.
|
||||
preStart = let
|
||||
runConfig = "${cfg.stateDir}/custom/conf/app.ini";
|
||||
secretKey = "${cfg.stateDir}/custom/conf/secret_key";
|
||||
jwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret";
|
||||
oauth2JwtSecret = "${cfg.stateDir}/custom/conf/oauth2_jwt_secret";
|
||||
oldLfsJwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret"; # old file for LFS_JWT_SECRET
|
||||
lfsJwtSecret = "${cfg.stateDir}/custom/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET
|
||||
internalToken = "${cfg.stateDir}/custom/conf/internal_token";
|
||||
in ''
|
||||
# copy custom configuration and generate a random secret key if needed
|
||||
${optionalString (cfg.useWizard == false) ''
|
||||
|
|
@ -468,24 +483,41 @@ in
|
|||
${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey}
|
||||
fi
|
||||
|
||||
if [ ! -e ${jwtSecret} ]; then
|
||||
${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}
|
||||
# Migrate LFS_JWT_SECRET filename
|
||||
if [[ -e ${oldLfsJwtSecret} && ! -e ${lfsJwtSecret} ]]; then
|
||||
mv ${oldLfsJwtSecret} ${lfsJwtSecret}
|
||||
fi
|
||||
|
||||
KEY="$(head -n1 ${secretKey})"
|
||||
if [ ! -e ${oauth2JwtSecret} ]; then
|
||||
${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret}
|
||||
fi
|
||||
|
||||
if [ ! -e ${lfsJwtSecret} ]; then
|
||||
${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret}
|
||||
fi
|
||||
|
||||
if [ ! -e ${internalToken} ]; then
|
||||
${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken}
|
||||
fi
|
||||
|
||||
SECRETKEY="$(head -n1 ${secretKey})"
|
||||
DBPASS="$(head -n1 ${cfg.database.passwordFile})"
|
||||
JWTSECRET="$(head -n1 ${jwtSecret})"
|
||||
OAUTH2JWTSECRET="$(head -n1 ${oauth2JwtSecret})"
|
||||
LFSJWTSECRET="$(head -n1 ${lfsJwtSecret})"
|
||||
INTERNALTOKEN="$(head -n1 ${internalToken})"
|
||||
${if (cfg.mailerPasswordFile == null) then ''
|
||||
MAILERPASSWORD="#mailerpass#"
|
||||
'' else ''
|
||||
MAILERPASSWORD="$(head -n1 ${cfg.mailerPasswordFile} || :)"
|
||||
''}
|
||||
sed -e "s,#secretkey#,$KEY,g" \
|
||||
sed -e "s,#secretkey#,$SECRETKEY,g" \
|
||||
-e "s,#dbpass#,$DBPASS,g" \
|
||||
-e "s,#jwtsecret#,$JWTSECRET,g" \
|
||||
-e "s,#oauth2jwtsecret#,$OAUTH2JWTSECRET,g" \
|
||||
-e "s,#lfsjwtsecret#,$LFSJWTSECRET,g" \
|
||||
-e "s,#internaltoken#,$INTERNALTOKEN,g" \
|
||||
-e "s,#mailerpass#,$MAILERPASSWORD,g" \
|
||||
-i ${runConfig}
|
||||
chmod 640 ${runConfig} ${secretKey} ${jwtSecret}
|
||||
chmod 640 ${runConfig} ${secretKey} ${oauth2JwtSecret} ${lfsJwtSecret} ${internalToken}
|
||||
''}
|
||||
|
||||
# update all hooks' binary paths
|
||||
|
|
|
|||
|
|
@ -909,8 +909,11 @@ in
|
|||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts =
|
||||
concatMap (o: optional (isInt o && o > 0 || o ? "port" && isInt o.port && o.port > 0) o.port)
|
||||
(flatten [
|
||||
concatMap (o:
|
||||
if isInt o && o > 0 then [o]
|
||||
else if o ? "port" && isInt o.port && o.port > 0 then [o.port]
|
||||
else []
|
||||
) (flatten [
|
||||
cfg.settings.ORPort
|
||||
cfg.settings.DirPort
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ in
|
|||
''
|
||||
${cfg.package}/bin/dockerd \
|
||||
--group=docker \
|
||||
--host=unix:// \
|
||||
--host=fd:// \
|
||||
--log-driver=${cfg.logDriver} \
|
||||
${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
|
||||
${optionalString cfg.liveRestore "--live-restore" } \
|
||||
|
|
@ -213,13 +213,10 @@ in
|
|||
message = "Option enableNvidia requires 32bit support libraries";
|
||||
}];
|
||||
}
|
||||
(mkIf cfg.enableNvidia {
|
||||
environment.etc."nvidia-container-runtime/config.toml".source = "${pkgs.nvidia-docker}/etc/config.toml";
|
||||
})
|
||||
]);
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed in favor of starting docker at boot")
|
||||
(mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active")
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
let
|
||||
cfg = config.virtualisation.podman;
|
||||
toml = pkgs.formats.toml { };
|
||||
nvidia-docker = pkgs.nvidia-docker.override { containerRuntimePath = "${pkgs.runc}/bin/runc"; };
|
||||
|
||||
inherit (lib) mkOption types;
|
||||
|
||||
|
|
@ -100,8 +99,8 @@ in
|
|||
containersConf.extraConfig = lib.optionalString cfg.enableNvidia
|
||||
(builtins.readFile (toml.generate "podman.nvidia.containers.conf" {
|
||||
engine = {
|
||||
conmon_env_vars = [ "PATH=${lib.makeBinPath [ nvidia-docker ]}" ];
|
||||
runtimes.nvidia = [ "${nvidia-docker}/bin/nvidia-container-runtime" ];
|
||||
conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ];
|
||||
runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ];
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
|
@ -111,14 +110,7 @@ in
|
|||
assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable;
|
||||
message = "Option dockerCompat conflicts with docker";
|
||||
}
|
||||
{
|
||||
assertion = cfg.enableNvidia -> !config.virtualisation.docker.enableNvidia;
|
||||
message = "Option enableNvidia conflicts with docker.enableNvidia";
|
||||
}
|
||||
];
|
||||
}
|
||||
(lib.mkIf cfg.enableNvidia {
|
||||
environment.etc."nvidia-container-runtime/config.toml".source = "${nvidia-docker}/etc/podman-config.toml";
|
||||
})
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
testScript = with pkgs.dockerTools; ''
|
||||
unix_time_second1 = "1970-01-01T00:00:01Z"
|
||||
|
||||
docker.wait_for_unit("docker.service")
|
||||
docker.wait_for_unit("sockets.target")
|
||||
|
||||
with subtest("Ensure Docker images use a stable date by default"):
|
||||
docker.succeed(
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
testScript = ''
|
||||
start_all()
|
||||
|
||||
docker.wait_for_unit("docker.service")
|
||||
docker.wait_for_unit("sockets.target")
|
||||
docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
|
||||
docker.succeed(
|
||||
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
, yelp-tools
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightdm";
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
"--sysconfdir=/etc"
|
||||
"--disable-indicator-services-command"
|
||||
"--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically
|
||||
] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
|
||||
] ++ lib.optional useGTK2 "--with-gtk2";
|
||||
|
||||
preConfigure = ''
|
||||
configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )
|
||||
|
|
|
|||
|
|
@ -553,6 +553,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
company = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "company";
|
||||
ename = "company";
|
||||
version = "0.9.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.13.tar";
|
||||
sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/company.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "company-ebdb";
|
||||
|
|
@ -636,6 +651,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "cpio-mode";
|
||||
ename = "cpio-mode";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar";
|
||||
sha256 = "144ajbxmz6amb2234a278c9sl4zg69ndswb8vk0mcq8y9s2abm1x";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
crisp = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "crisp";
|
||||
|
|
@ -696,6 +726,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dash = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dash";
|
||||
ename = "dash";
|
||||
version = "2.12.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dash-2.12.0.tar";
|
||||
sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dash.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dbus-codegen";
|
||||
|
|
@ -726,6 +771,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
|
||||
elpaBuild {
|
||||
pname = "delight";
|
||||
ename = "delight";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/delight-1.7.el";
|
||||
sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/delight.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }:
|
||||
elpaBuild {
|
||||
pname = "dict-tree";
|
||||
|
|
@ -741,6 +801,36 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "diff-hl";
|
||||
ename = "diff-hl";
|
||||
version = "1.8.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar";
|
||||
sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/diff-hl.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
diffview = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "diffview";
|
||||
ename = "diffview";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/diffview-1.0.el";
|
||||
sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/diffview.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dired-du";
|
||||
|
|
@ -756,6 +846,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dired-git-info";
|
||||
ename = "dired-git-info";
|
||||
version = "0.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.el";
|
||||
sha256 = "1kd0rpw7l32wvwi7q8s0inx4bc66xrl7hkllnlicyczsnzw2z52z";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "disk-usage";
|
||||
|
|
@ -771,6 +876,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dismal";
|
||||
ename = "dismal";
|
||||
version = "1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dismal-1.5.tar";
|
||||
sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dismal.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
djvu = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "djvu";
|
||||
|
|
@ -846,6 +966,51 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }:
|
||||
elpaBuild {
|
||||
pname = "ebdb-gnorb";
|
||||
ename = "ebdb-gnorb";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el";
|
||||
sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i";
|
||||
};
|
||||
packageRequires = [ ebdb gnorb ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
|
||||
elpaBuild {
|
||||
pname = "ebdb-i18n-chn";
|
||||
ename = "ebdb-i18n-chn";
|
||||
version = "1.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el";
|
||||
sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl";
|
||||
};
|
||||
packageRequires = [ ebdb pyim ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ediprolog = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ediprolog";
|
||||
ename = "ediprolog";
|
||||
version = "2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ediprolog-2.1.el";
|
||||
sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ediprolog.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
|
|
@ -934,6 +1099,36 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "electric-spacing";
|
||||
ename = "electric-spacing";
|
||||
version = "5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el";
|
||||
sha256 = "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "elisp-benchmarks";
|
||||
ename = "elisp-benchmarks";
|
||||
version = "1.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar";
|
||||
sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
|
||||
elpaBuild {
|
||||
pname = "emms";
|
||||
|
|
@ -964,6 +1159,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
epoch-view = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "epoch-view";
|
||||
ename = "epoch-view";
|
||||
version = "0.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el";
|
||||
sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/epoch-view.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ergoemacs-mode = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
|
|
@ -984,6 +1194,43 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
excorporate = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, fsm
|
||||
, lib
|
||||
, nadvice
|
||||
, soap-client
|
||||
, url-http-ntlm }:
|
||||
elpaBuild {
|
||||
pname = "excorporate";
|
||||
ename = "excorporate";
|
||||
version = "0.9.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar";
|
||||
sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j";
|
||||
};
|
||||
packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/excorporate.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
expand-region = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "expand-region";
|
||||
ename = "expand-region";
|
||||
version = "0.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar";
|
||||
sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/expand-region.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }:
|
||||
elpaBuild {
|
||||
pname = "exwm";
|
||||
|
|
@ -1119,6 +1366,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ggtags";
|
||||
ename = "ggtags";
|
||||
version = "0.8.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ggtags-0.8.13.el";
|
||||
sha256 = "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ggtags.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gited";
|
||||
|
|
@ -1276,6 +1538,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
greenbar = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "greenbar";
|
||||
ename = "greenbar";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/greenbar-1.1.el";
|
||||
sha256 = "01ixv3489zdx2b67zqad6h7g8cpnzpzrvvkqyx7csqyrfx0qy27n";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/greenbar.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
guess-language = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
|
|
@ -1328,6 +1605,36 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "hook-helpers";
|
||||
ename = "hook-helpers";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar";
|
||||
sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
html5-schema = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "html5-schema";
|
||||
ename = "html5-schema";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar";
|
||||
sha256 = "19k1jal6j64zq78w8h0lw7cljivmp2jzs5sa1ppc0mqkpn2hyq1i";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/html5-schema.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "hydra";
|
||||
|
|
@ -1403,6 +1710,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
|
||||
elpaBuild {
|
||||
pname = "ivy-explorer";
|
||||
ename = "ivy-explorer";
|
||||
version = "0.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.el";
|
||||
sha256 = "0q9gy9w22hnq30bfmnpqknk0qc1rcbjcybpjgb8hnlldvcci95l7";
|
||||
};
|
||||
packageRequires = [ emacs ivy ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ivy-posframe = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
|
|
@ -1453,6 +1775,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "js2-mode";
|
||||
ename = "js2-mode";
|
||||
version = "20201220";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20201220.tar";
|
||||
sha256 = "0zdrp8lap1ijrmsn9jsnvm44b6vxlgh9vcla5ysh1ga95zkjxrwm";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/js2-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "json-mode";
|
||||
|
|
@ -1708,6 +2045,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
memory-usage = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "memory-usage";
|
||||
ename = "memory-usage";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/memory-usage-0.2.el";
|
||||
sha256 = "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/memory-usage.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "metar";
|
||||
|
|
@ -1783,6 +2135,36 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "mmm-mode";
|
||||
ename = "mmm-mode";
|
||||
version = "0.5.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar";
|
||||
sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "modus-operandi-theme";
|
||||
ename = "modus-operandi-theme";
|
||||
version = "0.12.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el";
|
||||
sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "modus-vivendi-theme";
|
||||
|
|
@ -2137,6 +2519,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "paced";
|
||||
ename = "paced";
|
||||
version = "1.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/paced-1.1.3.tar";
|
||||
sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl";
|
||||
};
|
||||
packageRequires = [ async emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/paced.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "parsec";
|
||||
|
|
@ -2152,6 +2549,36 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "path-iterator";
|
||||
ename = "path-iterator";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar";
|
||||
sha256 = "0kgl7rhv9x23jyr6ahfy6ql447zpz9fnmfwldkpn69g7jdx6a3cc";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/path-iterator.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "peg";
|
||||
ename = "peg";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/peg-1.0.tar";
|
||||
sha256 = "0skr5dz9k34r409hisnj37n1b7n62l3md0glnfx578xkbmxlpcxl";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/peg.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
persist = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "persist";
|
||||
|
|
@ -2216,10 +2643,10 @@
|
|||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-0.8.3.el";
|
||||
sha256 = "05m56aw2yxik0pgcvyr5c92j2mwfksxgq1syzvik6161gy8hdd0g";
|
||||
url = "https://elpa.gnu.org/packages/posframe-0.8.4.tar";
|
||||
sha256 = "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2242,6 +2669,36 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
psgml = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "psgml";
|
||||
ename = "psgml";
|
||||
version = "1.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar";
|
||||
sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/psgml.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "pspp-mode";
|
||||
ename = "pspp-mode";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el";
|
||||
sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "python";
|
||||
|
|
@ -2753,6 +3210,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "smalltalk-mode";
|
||||
ename = "smalltalk-mode";
|
||||
version = "4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/smalltalk-mode-4.0.tar";
|
||||
sha256 = "1i1w2fk241z10mph92lry8ly55rxr24n1v4840cddpiw81nrqpcn";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "smart-yank";
|
||||
|
|
@ -2843,6 +3315,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
spinner = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "spinner";
|
||||
ename = "spinner";
|
||||
version = "1.7.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/spinner-1.7.3.el";
|
||||
sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/spinner.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "sql-beeline";
|
||||
|
|
@ -2933,6 +3420,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
|
||||
elpaBuild {
|
||||
pname = "swiper";
|
||||
ename = "swiper";
|
||||
version = "0.13.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/swiper-0.13.1.tar";
|
||||
sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1";
|
||||
};
|
||||
packageRequires = [ emacs ivy ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/swiper.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "system-packages";
|
||||
|
|
@ -3201,6 +3703,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "vcl-mode";
|
||||
ename = "vcl-mode";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el";
|
||||
sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
|
||||
elpaBuild {
|
||||
pname = "vdiff";
|
||||
|
|
@ -3371,6 +3888,36 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "which-key";
|
||||
ename = "which-key";
|
||||
version = "3.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar";
|
||||
sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/which-key.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "windower";
|
||||
ename = "windower";
|
||||
version = "0.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/windower-0.0.1.el";
|
||||
sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/windower.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
windresize = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "windresize";
|
||||
|
|
@ -3436,6 +3983,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
xclip = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "xclip";
|
||||
ename = "xclip";
|
||||
version = "1.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xclip-1.10.el";
|
||||
sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/xclip.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "xelb";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -16,11 +16,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "nano";
|
||||
version = "5.4";
|
||||
version = "5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
|
||||
sha256 = "1sc6xl9935k9s9clkv83hapijka4qknfnj6f15c3b1i2n84396gy";
|
||||
sha256 = "0jkyd3yzcidnvnj1k9bmplzlbd303x6xxblpp5np7zs1kfzq22rr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ in mkDerivation rec {
|
|||
] ++ (with pythonPackages; [
|
||||
matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
|
||||
GitPython # for addon manager
|
||||
scipy pyyaml # (at least for) PyrateWorkbench
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ];
|
||||
|
||||
unpackPhase = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
unpackPhase = lib.optionalString stdenv.isDarwin ''
|
||||
xar -xf $src
|
||||
zcat Payload | cpio -i
|
||||
'';
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontStrip = stdenv.isDarwin;
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "abook-0.6.1";
|
||||
|
|
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "http://abook.sourceforge.net/";
|
||||
description = "Text-based addressbook program designed to use with mutt mail client";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.edwtjo ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.edwtjo ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
|
||||
{ lib, stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
|
||||
, gdk-pixbuf, gdk-pixbuf-xlib }:
|
||||
|
||||
assert stdenv.hostPlatform.system == "i686-linux";
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
# We should probably remove those and use the regular Nixpkgs
|
||||
# versions.
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath
|
||||
libPath = lib.makeLibraryPath
|
||||
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ];
|
||||
|
||||
passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "Adobe Reader, a viewer for PDF documents";
|
||||
homepage = "http://www.adobe.com/products/reader";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
license = lib.licenses.unfree;
|
||||
knownVulnerabilities = [
|
||||
"Numerous unresolved vulnerabilities"
|
||||
"See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53"
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
version = "0.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, attemptoClex, callPackage }:
|
||||
{ lib, stdenv, attemptoClex, callPackage }:
|
||||
|
||||
callPackage ./. {
|
||||
pname = "ape-clex";
|
||||
lexiconPath = "${attemptoClex}/clex_lexicon.pl";
|
||||
description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)";
|
||||
license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ];
|
||||
license = with lib; [ licenses.lgpl3 licenses.gpl3 ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf
|
||||
cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade
|
||||
''
|
||||
+ stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||
+ lib.optionalString (!stdenv.isDarwin) ''
|
||||
install -D ../apvlv.desktop $out/share/applications/apvlv.desktop
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
, enableLibpulseaudio ? true, libpulseaudio ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sox-14.4.2";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, cmake }:
|
||||
{ lib, stdenv, fetchurl, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "soxr-0.1.3";
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "An audio resampling library";
|
||||
homepage = "http://soxr.sourceforge.net";
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wavesurfer-1.8.5";
|
||||
|
|
@ -17,12 +17,12 @@ stdenv.mkDerivation {
|
|||
ln -s $out/{nix-support,bin}/wavesurfer.tcl
|
||||
wrapProgram "$out/nix-support/wavesurfer.tcl" \
|
||||
--set TCLLIBPATH "${snack}/lib" \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}"
|
||||
--prefix PATH : "${lib.makeBinPath [ tcl tk ]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tool for recording, playing, editing, viewing and labeling of audio";
|
||||
homepage = "http://www.speech.kth.se/wavesurfer/";
|
||||
license = stdenv.lib.licenses.bsd0;
|
||||
license = lib.licenses.bsd0;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@ stdenv.mkDerivation {
|
|||
|
||||
cat >> "$out/bin/avrdudess" << __EOF__
|
||||
#!${runtimeShell}
|
||||
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
|
||||
export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}"
|
||||
# We need PATH from user env for xdg-open to find its tools, which
|
||||
# typically depend on the currently running desktop environment.
|
||||
export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH"
|
||||
export PATH="${lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH"
|
||||
|
||||
# avrdudess must have its resource files in its current working directory
|
||||
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath}
|
||||
'';
|
||||
|
||||
sqltoolsserviceRpath = stdenv.lib.makeLibraryPath [
|
||||
sqltoolsserviceRpath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
libunwind
|
||||
libuuid
|
||||
|
|
@ -62,10 +62,10 @@ stdenv.mkDerivation rec {
|
|||
# this will most likely need to be updated when azuredatastudio's version changes
|
||||
sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/2.0.0-release.56";
|
||||
|
||||
rpath = stdenv.lib.concatStringsSep ":" [
|
||||
rpath = lib.concatStringsSep ":" [
|
||||
atomEnv.libPath
|
||||
(
|
||||
stdenv.lib.makeLibraryPath [
|
||||
lib.makeLibraryPath [
|
||||
libuuid
|
||||
at-spi2-core
|
||||
at-spi2-atk
|
||||
|
|
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = with stdenv.lib.maintainers; [ xavierzwirtz ];
|
||||
maintainers = with lib.maintainers; [ xavierzwirtz ];
|
||||
description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW";
|
||||
homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
|
||||
openssl, wrapGAppsHook,
|
||||
avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
|
||||
}:
|
||||
|
|
@ -23,7 +23,7 @@ mkDerivation rec {
|
|||
'';
|
||||
|
||||
qtWrapperArgs = [
|
||||
''--prefix PATH : ${stdenv.lib.makeBinPath [ openssl ]}''
|
||||
''--prefix PATH : ${lib.makeBinPath [ openssl ]}''
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -35,8 +35,8 @@ mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://github.com/debauchee/barrier";
|
||||
downloadPage = "https://github.com/debauchee/barrier/releases";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.phryneas ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.phryneas ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional waylandSupport "wayland"
|
||||
++ lib.optional x11Support "x11";
|
||||
|
||||
buildInputs = with stdenv.lib; [
|
||||
buildInputs = with lib; [
|
||||
cairo
|
||||
fribidi
|
||||
harfbuzz
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
|
||||
{ lib, mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
|
||||
, qtbase, qttools, qtsvg, qtwebkit
|
||||
}:
|
||||
|
||||
|
|
@ -29,8 +29,8 @@ mkDerivation rec {
|
|||
meta = {
|
||||
description = "A Qt4 Bible study tool";
|
||||
homepage = "http://www.bibletime.info/";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.piotr ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.piotr ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.8";
|
||||
|
|
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://github.com/dpayne/cli-visualizer";
|
||||
description = "CLI based audio visualizer";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.matthiasbeyer ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ gtk3 libayatana-appindicator ];
|
||||
|
||||
gappsWrapperArgs = [
|
||||
"--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}"
|
||||
"--prefix" "PATH" ":" "${lib.makeBinPath [ xdotool which ]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, qt4, qmake4Hook }:
|
||||
{ lib, stdenv, fetchurl, qt4, qmake4Hook }:
|
||||
|
||||
let version = "0.6.4"; in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -22,8 +22,8 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "Offline conference schedule viewer";
|
||||
homepage = "http://www.toastfreeware.priv.at/confclerk";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ ehmry ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec{
|
|||
];
|
||||
|
||||
runtimeDeps = [ mesa-demos vulkan-tools ];
|
||||
binPath = stdenv.lib.makeBinPath runtimeDeps;
|
||||
binPath = lib.makeBinPath runtimeDeps;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cpu-x \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
|
|
@ -64,7 +65,7 @@ mkDerivation rec {
|
|||
|
||||
buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing";
|
||||
homepage = "https://crow-translate.github.io/";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crumbs";
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
cp crumbs-completion.fish $out/share/fish/vendor_completions.d/crumbs.fish
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib;
|
||||
meta = with lib;
|
||||
{ description = "Bookmarks for the command line";
|
||||
homepage = "https://github.com/fasseg/crumbs";
|
||||
license = licenses.wtfpl;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
|
||||
# Create desktop item.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }:
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }:
|
||||
|
||||
mkDerivation {
|
||||
pname = "dfilemanager";
|
||||
|
|
@ -19,7 +19,7 @@ mkDerivation {
|
|||
meta = {
|
||||
homepage = "http://dfilemanager.sourceforge.net/";
|
||||
description = "File manager written in Qt/C++";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
|
||||
{ lib, stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "2.1.3";
|
||||
|
|
@ -51,9 +51,9 @@ mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "http://www.qtrac.eu/diffpdfc.html";
|
||||
description = "Tool for diffing pdf files visually or textually";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [ tstrobel ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ tstrobel ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
cp -v ding.png $out/share/pixmaps/
|
||||
cp -v ding.desktop $out/share/applications/
|
||||
|
||||
wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
|
||||
wrapProgram $out/bin/ding --prefix PATH : ${lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ mkDerivation {
|
|||
nativeBuildInputs = [ cmake qttools pkgconfig xxd ];
|
||||
buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
|
||||
|
||||
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
|
||||
hardeningDisable = lib.optional stdenv.isDarwin "format";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://doomseeker.drdteam.org/";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }:
|
||||
{ lib, stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "12010904";
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
Defaults to dozenal Roman numerals.
|
||||
'';
|
||||
homepage = "https://github.com/dgoodmaniii/dozenal/";
|
||||
maintainers = with stdenv.lib.maintainers; [ CharlesHD ];
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ CharlesHD ];
|
||||
license = lib.licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication {
|
|||
cp -ar ${tests} $sourceRoot/electrum/tests
|
||||
'';
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
|
||||
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiohttp
|
||||
|
|
@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication {
|
|||
keepkey
|
||||
trezor
|
||||
btchip
|
||||
] ++ stdenv.lib.optionals enableQt [ pyqt5 qdarkstyle ];
|
||||
] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ];
|
||||
|
||||
preBuild = ''
|
||||
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
|
||||
|
|
@ -94,7 +94,7 @@ python3.pkgs.buildPythonApplication {
|
|||
sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
|
||||
'');
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isLinux ''
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
# Despite setting usr_share above, these files are installed under
|
||||
# $out/nix ...
|
||||
mv $out/${python3.sitePackages}/nix/store"/"*/share $out
|
||||
|
|
@ -108,7 +108,7 @@ python3.pkgs.buildPythonApplication {
|
|||
|
||||
'';
|
||||
|
||||
postFixup = stdenv.lib.optionalString enableQt ''
|
||||
postFixup = lib.optionalString enableQt ''
|
||||
wrapQtApp $out/bin/electrum
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
, enableSystemd ? false
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elogind";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Simple tool for input event debugging";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, sqlite
|
||||
|
|
@ -26,7 +27,7 @@ buildGoModule rec {
|
|||
"-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "An interactive command line expense logger";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.manojkarthick ];
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
|
||||
|
||||
buildInputs = [ wxGTK30 glib pcre ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
|
||||
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace far2l/bootstrap/trash.sh \
|
||||
--replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash'
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace far2l/CMakeLists.txt \
|
||||
--replace "-framework System" -lSystem
|
||||
'' + ''
|
||||
|
|
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/share/icons/hicolor/$size/apps
|
||||
convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png
|
||||
done
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
wrapProgram $out/bin/far2l --argv0 $out/bin/far2l
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, AppKit, Cocoa
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
assert elem uiTarget [ "desktop" "macosx" ];
|
||||
assert elem uiType [ "qt4" "gtk" "cocoa" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, openssl }:
|
||||
{ lib, stdenv, fetchurl, openssl }:
|
||||
|
||||
let
|
||||
version = "6.4.14";
|
||||
|
|
@ -28,8 +28,8 @@ stdenv.mkDerivation {
|
|||
IPSEC.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.peti ];
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg";
|
||||
};
|
||||
|
||||
pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]);
|
||||
pathAdd = lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]);
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ bashInteractive ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
withCuda ? true
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "firestarter";
|
||||
version = "1.7.4";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
pname = "gtkglarea";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl
|
||||
{ lib, stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl
|
||||
, libiconv, gettext, sqlite
|
||||
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
|
||||
, postgresSupport ? false, postgresql ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gammu";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }:
|
||||
{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }:
|
||||
stdenv.mkDerivation {
|
||||
name = "garmin-plugin-0.3.26";
|
||||
src = fetchurl {
|
||||
|
|
@ -19,8 +19,8 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
meta = {
|
||||
homepage = "http://www.andreas-diesner.de/garminplugin";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ncurses, fetchpatch }:
|
||||
{ lib, stdenv, fetchurl, ncurses, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcal";
|
||||
|
|
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
|
|||
also displays holiday lists for many countries around the globe.
|
||||
'';
|
||||
homepage = "https://www.gnu.org/software/gcal/";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.romildo ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}:
|
||||
{ lib, stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "get_iplayer";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which
|
||||
{ lib, fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which
|
||||
, IOKit ? null }:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gkrellm-2.3.11";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu,
|
||||
{ lib, stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu,
|
||||
intltool, libstartup_notification, gtk-doc, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
|
@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
|
|||
as another user.
|
||||
'';
|
||||
homepage = "https://www.nongnu.org/gksu/";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.romildo ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, enableGlfw ? false, glfw, runtimeShell }:
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional makeLibraryPath;
|
||||
inherit (lib) optional makeLibraryPath;
|
||||
|
||||
wrapperScript = writeScript "glava" ''
|
||||
#!${runtimeShell}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "lib" "dev" "doc" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk";
|
||||
};
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
|
|||
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-python=boost_python${stdenv.lib.versions.major python3.version}${stdenv.lib.versions.minor python3.version}"
|
||||
"--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3
|
||||
{ lib, stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3
|
||||
, gsettings-desktop-schemas, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
|
@ -25,8 +25,8 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "A simple MP3 and Media player client for UNIX and UNIX like systems";
|
||||
homepage = "https://gmtp.sourceforge.io";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
version = "3.32.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
|
|||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
version = "3.38.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,28 +21,28 @@ mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
./0001-dont-check-for-updates.patch
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
./0001-dont-use-maclibs.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace goldendict.pro \
|
||||
--replace "hunspell-1.6.1" "hunspell-${stdenv.lib.versions.majorMinor hunspell.version}"
|
||||
--replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake ];
|
||||
buildInputs = [
|
||||
qtbase qtsvg qtwebkit qttools
|
||||
libvorbis hunspell xz lzo
|
||||
] ++ stdenv.lib.optionals stdenv.isLinux [ qtx11extras libXtst ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ bzip2 libiconv ]
|
||||
++ stdenv.lib.optional withCC opencc
|
||||
++ stdenv.lib.optional withEpwing libeb
|
||||
++ stdenv.lib.optional withExtraTiff libtiff
|
||||
++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg_3 ]
|
||||
++ stdenv.lib.optional withZim zstd;
|
||||
] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ]
|
||||
++ lib.optionals stdenv.isDarwin [ bzip2 libiconv ]
|
||||
++ lib.optional withCC opencc
|
||||
++ lib.optional withEpwing libeb
|
||||
++ lib.optional withExtraTiff libtiff
|
||||
++ lib.optionals withFFmpeg [ libao ffmpeg_3 ]
|
||||
++ lib.optional withZim zstd;
|
||||
|
||||
qmakeFlags = with stdenv.lib; [
|
||||
qmakeFlags = with lib; [
|
||||
"goldendict.pro"
|
||||
(optional withCC "CONFIG+=chinese_conversion_support")
|
||||
(optional (!withCC) "CONFIG+=no_chinese_conversion_support")
|
||||
|
|
@ -53,7 +53,7 @@ mkDerivation rec {
|
|||
(optional withZim "CONFIG+=zim_support")
|
||||
];
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv GoldenDict.app $out/Applications
|
||||
wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
|
|||
in ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${env}/bin/gollum $out/bin/gollum \
|
||||
--prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]}
|
||||
--prefix PATH ":" ${lib.makeBinPath [ git ]}
|
||||
makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \
|
||||
--prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]}
|
||||
--prefix PATH ":" ${lib.makeBinPath [ git ]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "gollum";
|
||||
|
|
|
|||
|
|
@ -463,4 +463,4 @@
|
|||
};
|
||||
version = "0.16.10";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
|
||||
else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2";
|
||||
version = "7.1.8.3036";
|
||||
fullPath = stdenv.lib.makeLibraryPath [
|
||||
fullPath = lib.makeLibraryPath [
|
||||
glibc
|
||||
glib
|
||||
stdenv.cc.cc
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, stdenv, ncurses, gnupg }:
|
||||
{ fetchurl, lib, stdenv, ncurses, gnupg }:
|
||||
|
||||
let version = "0.7.4";
|
||||
in stdenv.mkDerivation {
|
||||
|
|
@ -7,7 +7,7 @@ in stdenv.mkDerivation {
|
|||
inherit version;
|
||||
meta = {
|
||||
homepage = "https://tamentis.com/projects/mdp/";
|
||||
license = [stdenv.lib.licenses.isc];
|
||||
license = [lib.licenses.isc];
|
||||
description = "Manage your passwords with GnuPG and a text editor";
|
||||
};
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [ "--with-zlib=system" ]
|
||||
# Floating point behavior on i686 causes test failures. Preventing
|
||||
# extended precision fixes this problem.
|
||||
++ stdenv.lib.optionals stdenv.isi686 [
|
||||
++ lib.optionals stdenv.isi686 [
|
||||
"CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ mkDerivation {
|
|||
'';
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${stdenv.lib.makeBinPath [ gpsbabel ]}"
|
||||
"--prefix PATH : ${lib.makeBinPath [ gpsbabel ]}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpx";
|
||||
|
|
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Gcode to x3g conversion postprocessor";
|
||||
homepage = "https://github.com/markwal/GPX/";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.leo60228 ];
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.leo60228 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ in buildPythonApplication rec {
|
|||
nativeBuildInputs = [ wrapGAppsHook intltool gettext ];
|
||||
buildInputs = [ gtk3 gobject-introspection pango gexiv2 ]
|
||||
# Map support
|
||||
++ stdenv.lib.optional enableOSM osm-gps-map
|
||||
++ lib.optional enableOSM osm-gps-map
|
||||
# Graphviz support
|
||||
++ stdenv.lib.optional enableGraphviz graphviz
|
||||
++ lib.optional enableGraphviz graphviz
|
||||
# Ghostscript support
|
||||
++ stdenv.lib.optional enableGhostscript ghostscript
|
||||
++ lib.optional enableGhostscript ghostscript
|
||||
;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte
|
||||
{ lib, stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte
|
||||
, curl, cdparanoia, libid3tag, ncurses, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "GTK-based audio CD player/ripper";
|
||||
homepage = "http://nostatic.org/grip";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2;
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber peti ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ marcweber peti ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
|
||||
{ lib, stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gsimplecal";
|
||||
|
|
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
|
|||
Also, you can configure it to not only show the calendar, but also
|
||||
display multiple clocks for different world time zones.
|
||||
'';
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = [ stdenv.lib.maintainers.romildo ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, pkgs
|
||||
{ lib, stdenv, pkgs
|
||||
, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive
|
||||
, pkgconfig, intltool, autoreconfHook, wrapGAppsHook
|
||||
}:
|
||||
|
|
@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://gummi.app";
|
||||
description = "Simple LaTex editor for GTK users";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ flokli ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ flokli ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }:
|
||||
{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }:
|
||||
|
||||
let
|
||||
name = "gv-3.7.4";
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
|
||||
};
|
||||
|
||||
configureFlags = stdenv.lib.optionals stdenv.isDarwin [
|
||||
configureFlags = lib.optionals stdenv.isDarwin [
|
||||
"--enable-SIGCHLD-fallback"
|
||||
];
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||
ghostscriptX
|
||||
perl
|
||||
pkgconfig
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
];
|
||||
|
||||
|
|
@ -41,8 +41,8 @@ stdenv.mkDerivation {
|
|||
interface for the Ghostscript interpreter.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }:
|
||||
{ lib, stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gxmessage";
|
||||
|
|
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "A GTK enabled dropin replacement for xmessage";
|
||||
homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [jfb];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [jfb];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.02";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Hebrew calendar and solar astronomical times library and utilities";
|
||||
homepage = "https://sourceforge.net/projects/libhdate/";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ CharlesHD ];
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ CharlesHD ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, runtimeShell }:
|
||||
{ lib, stdenv, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "example-unfree-package";
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = {
|
||||
description = "An example package with unfree license (for testing)";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
maintainers = [ stdenv.lib.maintainers.oxij ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.oxij ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }:
|
||||
{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }:
|
||||
|
||||
let
|
||||
ld_library_path = builtins.concatStringsSep ":" [
|
||||
"${stdenv.cc.cc.lib}/lib64"
|
||||
(stdenv.lib.makeLibraryPath [
|
||||
(lib.makeLibraryPath [
|
||||
libGLU
|
||||
libGL
|
||||
xorg.libXmu
|
||||
|
|
@ -79,9 +79,9 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "3D animation application software";
|
||||
homepage = "https://www.sidefx.com";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.canndrew ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.canndrew ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, readline, ncurses
|
||||
{ lib, stdenv, fetchFromGitHub, readline, ncurses
|
||||
, autoreconfHook, pkgconfig, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://github.com/dvorka/hstr";
|
||||
description = "Shell history suggest box - easily view, navigate, search and use your command history";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.matthiasbeyer ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
|
||||
inherit (data) version url sha256;
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath
|
||||
rpath = lib.makeLibraryPath
|
||||
[ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
|
||||
libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3
|
||||
curl libXfixes libXScrnSaver ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }:
|
||||
let
|
||||
lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ];
|
||||
lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iceSL";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
|
||||
{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
|
||||
, gitSupport ? false, git ? null
|
||||
, docutilsSupport ? false, python ? null, docutils ? null
|
||||
, monotoneSupport ? false, monotone ? null
|
||||
|
|
@ -20,8 +20,6 @@ assert mercurialSupport -> (mercurial != null);
|
|||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20200202.3";
|
||||
|
||||
lib = stdenv.lib;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
|
@ -85,8 +83,8 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "Wiki compiler, storing pages and history in a RCS";
|
||||
homepage = "http://ikiwiki.info/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.peti ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin Security;
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
checkInputs = [ gitMinimal util-linuxMinimal ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \
|
||||
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}" \
|
||||
"$out/opt/ipmicfg/IPMICFG-Linux.x86_64"
|
||||
|
||||
ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg"
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
|
|||
else throw "IPMIView is not supported on this platform";
|
||||
in
|
||||
''
|
||||
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
|
||||
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
|
||||
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
|
||||
'';
|
||||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
# WORK_DIR: unfortunately the ikvm related binaries are loaded from
|
||||
# and user configuration is written to files in the CWD
|
||||
makeWrapper $out/jre/bin/java $out/bin/IPMIView \
|
||||
--set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \
|
||||
--set LD_LIBRARY_PATH "${lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \
|
||||
--prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \
|
||||
--add-flags "-jar $out/IPMIView20.jar" \
|
||||
--run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, java, runtimeShell }:
|
||||
{ lib, stdenv, fetchurl, java, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jbidwatcher";
|
||||
|
|
@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
|
|||
binary.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -421,4 +421,4 @@
|
|||
};
|
||||
version = "2.4.2";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
xorg.libXinerama
|
||||
xorg.libXrandr
|
||||
python3Packages.python
|
||||
] ++ stdenv.lib.optionals enableXfcePanelApplet [
|
||||
] ++ lib.optionals enableXfcePanelApplet [
|
||||
gtk3
|
||||
xfce.libxfce4util
|
||||
xfce.xfce4-panel
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
]
|
||||
++ stdenv.lib.optionals enableXfcePanelApplet [
|
||||
++ lib.optionals enableXfcePanelApplet [
|
||||
"--with-xfce4-panel-applet"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, db, gtk2, bzip2 }:
|
||||
{ lib, stdenv, fetchurl, db, gtk2, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "jigdo-0.7.3";
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "Download utility that can fetch files from several sources simultaneously";
|
||||
homepage = "http://atterer.net/jigdo/";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
|||
|
||||
dontUnpack = true;
|
||||
|
||||
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ];
|
||||
buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ];
|
||||
|
||||
installPhase =
|
||||
if stdenv.isDarwin then ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, enableTesseract ? true, leptonica, tesseract4
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
# k2pdfopt is a pain to package. It requires modified versions of mupdf,
|
||||
# leptonica, and tesseract. Instead of shipping patches for these upstream
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, requireFile, unzip, rlwrap, bash, zlib }:
|
||||
{ lib, stdenv, requireFile, unzip, rlwrap, bash, zlib }:
|
||||
|
||||
assert (stdenv.hostPlatform.system == "i686-linux");
|
||||
|
||||
let
|
||||
libPath = stdenv.lib.makeLibraryPath
|
||||
libPath = lib.makeLibraryPath
|
||||
[ stdenv.cc.libc stdenv.cc.cc zlib ];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -68,8 +68,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Analytics and time-series database";
|
||||
homepage = "http://www.kx.com/";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "i686-linux" ];
|
||||
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
|
||||
maintainers = [ lib.maintainers.thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, buildEnv, fetchzip, mono }:
|
||||
{ lib, stdenv, buildEnv, fetchzip, mono }:
|
||||
|
||||
let
|
||||
version = "0.12.0";
|
||||
|
|
@ -15,8 +15,8 @@ let
|
|||
meta = {
|
||||
description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication";
|
||||
homepage = "http://lechnology.com/software/keeagent";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = with lib.platforms; linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, buildEnv, fetchFromGitHub, mono }:
|
||||
{ lib, stdenv, buildEnv, fetchFromGitHub, mono }:
|
||||
|
||||
let
|
||||
version = "1.8.4.2";
|
||||
|
|
@ -18,8 +18,8 @@ let
|
|||
meta = {
|
||||
description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP";
|
||||
homepage = "https://github.com/pfn/keepasshttp";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = with lib.platforms; linux;
|
||||
license = lib.licenses.gpl3;
|
||||
};
|
||||
|
||||
pluginFilename = "KeePassHttp.plgx";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, buildEnv, fetchzip, mono }:
|
||||
{ lib, stdenv, buildEnv, fetchzip, mono }:
|
||||
|
||||
let
|
||||
version = "2.6";
|
||||
|
|
@ -15,9 +15,9 @@ let
|
|||
meta = {
|
||||
description = "OtpKeyProv is a key provider based on one-time passwords";
|
||||
homepage = "https://keepass.info/plugins.html#otpkeyprov";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.ente ];
|
||||
platforms = with lib.platforms; linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.ente ];
|
||||
};
|
||||
|
||||
pluginFilename = "OtpKeyProv.plgx";
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ with builtins; buildDotnetPackage rec {
|
|||
desktopName = "Keepass";
|
||||
genericName = "Password manager";
|
||||
categories = "Utility;";
|
||||
mimeType = stdenv.lib.concatStringsSep ";" [
|
||||
mimeType = lib.concatStringsSep ";" [
|
||||
"application/x-keepass2"
|
||||
""
|
||||
];
|
||||
|
|
@ -85,7 +85,7 @@ with builtins; buildDotnetPackage rec {
|
|||
# is found and does not pollute output path.
|
||||
binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
|
||||
|
||||
dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ];
|
||||
dynlibPath = lib.makeLibraryPath [ gtk2 ];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
|
|
@ -111,8 +111,8 @@ with builtins; buildDotnetPackage rec {
|
|||
meta = {
|
||||
description = "GUI password manager with strong cryptography";
|
||||
homepage = "http://www.keepass.info/";
|
||||
maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ amorsillo obadz jraygauthier ];
|
||||
platforms = with lib.platforms; all;
|
||||
license = lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
|
||||
{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepassx2";
|
||||
|
|
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
|
||||
homepage = "https://www.keepassx.org/";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ qknight ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ qknight ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
, withKeePassFDOSecrets ? true
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepassxc";
|
||||
|
|
@ -49,18 +49,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
|
||||
"-Wno-old-style-cast"
|
||||
"-Wno-error"
|
||||
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
|
||||
];
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr/local/bin" "../bin" \
|
||||
--replace "/usr/local/share/man" "../share/man"
|
||||
'';
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
|
||||
|
||||
patches = [
|
||||
./darwin.patch
|
||||
|
|
@ -111,9 +111,9 @@ stdenv.mkDerivation rec {
|
|||
yubikey-personalization
|
||||
zlib
|
||||
]
|
||||
++ stdenv.lib.optional withKeePassKeeShareSecure quazip
|
||||
++ stdenv.lib.optional stdenv.isDarwin qtmacextras
|
||||
++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
|
||||
++ lib.optional withKeePassKeeShareSecure quazip
|
||||
++ lib.optional stdenv.isDarwin qtmacextras
|
||||
++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
|
||||
|
||||
preFixup = optionalString stdenv.isDarwin ''
|
||||
# Make it work without Qt in PATH.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
|
||||
{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepassx";
|
||||
|
|
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
|
||||
homepage = "https://www.keepassx.org/";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ qknight ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ qknight ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue