ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-01-13 16:08:59 +01:00
commit ed1b0d0bac
79 changed files with 753 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/languages-frameworks/rust.section.md
View File

@ -32,17 +32,17 @@ Rust applications are packaged by using the `buildRustPackage` helper from `rust
```
rustPlatform.buildRustPackage rec {
name = "ripgrep-${version}";
version = "0.4.0";
pname = "ripgrep";
version = "11.0.2";
src = fetchFromGitHub {
owner = "BurntSushi";
repo = "ripgrep";
rev = "${version}";
sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
repo = pname;
rev = version;
sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3";
};
cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh";
verifyCargoDeps = true;
meta = with stdenv.lib; {
@ -66,7 +66,11 @@ added in `cargoPatches` will also be prepended to the patches in `patches` at
build-time.
When `verifyCargoDeps` is set to `true`, the build will also verify that the
`cargoSha256` is not out of date by comparing the `Cargo.lock` file in both the `cargoDeps` and `src`. Note that this option changes the value of `cargoSha256` since it also copies the `Cargo.lock` in it. To avoid breaking backward-compatibility this option is not enabled by default but hopefully will be in the future.
`cargoSha256` is not out of date by comparing the `Cargo.lock` file in both the
`cargoDeps` and `src`. Note that this option changes the value of `cargoSha256`
since it also copies the `Cargo.lock` in it. To avoid breaking
backward-compatibility this option is not enabled by default but hopefully will
be in the future.
### Building a crate for a different target

2
lib/default.nix
View File

@ -100,7 +100,7 @@ let
inherit (sources) pathType pathIsDirectory cleanSourceFilter
cleanSource sourceByRegex sourceFilesBySuffices
commitIdFromGitRepo cleanSourceWith pathHasContext
canCleanSource;
canCleanSource pathIsRegularFile;
inherit (modules) evalModules unifyModuleSyntax
applyIfFunction mergeModules
mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions

34
lib/sources.nix
View File

@ -9,6 +9,9 @@ rec {
# Returns true if the path exists and is a directory, false otherwise
pathIsDirectory = p: if builtins.pathExists p then (pathType p) == "directory" else false;
# Returns true if the path exists and is a regular file, false otherwise
pathIsRegularFile = p: if builtins.pathExists p then (pathType p) == "regular" else false;
# Bring in a path as a source, filtering out all Subversion and CVS
# directories, as well as backup files (*~).
cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! (
@ -110,24 +113,43 @@ rec {
with builtins;
let fileName = toString path + "/" + file;
packedRefsName = toString path + "/packed-refs";
in if lib.pathExists fileName
in if pathIsRegularFile path
# Resolve git worktrees. See gitrepository-layout(5)
then
let m = match "^gitdir: (.*)$" (lib.fileContents path);
in if m == null
then throw ("File contains no gitdir reference: " + path)
else
let gitDir = lib.head m;
commonDir' = if pathIsRegularFile "${gitDir}/commondir"
then lib.fileContents "${gitDir}/commondir"
else gitDir;
commonDir = if lib.hasPrefix "/" commonDir'
then commonDir'
else toString (/. + "${gitDir}/${commonDir'}");
refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}";
in readCommitFromFile refFile commonDir
else if pathIsRegularFile fileName
# Sometimes git stores the commitId directly in the file but
# sometimes it stores something like: «ref: refs/heads/branch-name»
then
let fileContent = lib.fileContents fileName;
# Sometimes git stores the commitId directly in the file but
# sometimes it stores something like: «ref: refs/heads/branch-name»
matchRef = match "^ref: (.*)$" fileContent;
in if matchRef == null
in if matchRef == null
then fileContent
else readCommitFromFile (lib.head matchRef) path
else if pathIsRegularFile packedRefsName
# Sometimes, the file isn't there at all and has been packed away in the
# packed-refs file, so we have to grep through it:
else if lib.pathExists packedRefsName
then
let fileContent = readFile packedRefsName;
matchRef = match (".*\n([^\n ]*) " + file + "\n.*") fileContent;
in if matchRef == null
in if matchRef == null
then throw ("Could not find " + file + " in " + packedRefsName)
else lib.head matchRef
else throw ("Not a .git directory: " + path);
in readCommitFromFile "HEAD";

3
lib/tests/modules.sh
View File

@ -174,8 +174,7 @@ checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules.
checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix
## Paths should be allowed as values and work as expected
# Temporarily disabled until https://github.com/NixOS/nixpkgs/pull/76861
#checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix
checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix
# Check that disabledModules works recursively and correctly
checkConfigOutput "true" config.enable ./disable-recursive/main.nix

2
lib/trivial.nix
View File

@ -191,7 +191,7 @@ rec {
let
revisionFile = "${toString ./..}/.git-revision";
gitRepo = "${toString ./..}/.git";
in if lib.pathIsDirectory gitRepo
in if builtins.pathExists gitRepo
then lib.commitIdFromGitRepo gitRepo
else if lib.pathExists revisionFile then lib.fileContents revisionFile
else default;

80
lib/types.nix
View File

@ -340,18 +340,80 @@ rec {
let
padWidth = stringLength (toString (length def.value));
unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i;
anyString = placeholder "name";
nameAttrs = [
{ path = [ "environment" "etc" ];
name = "target";
}
{ path = [ "containers" anyString "bindMounts" ];
name = "mountPoint";
}
{ path = [ "programs" "ssh" "knownHosts" ];
# hostNames is actually a list so we would need to handle it only when singleton
name = "hostNames";
}
{ path = [ "fileSystems" ];
name = "mountPoint";
}
{ path = [ "boot" "specialFileSystems" ];
name = "mountPoint";
}
{ path = [ "services" "znapzend" "zetup" ];
name = "dataset";
}
{ path = [ "services" "znapzend" "zetup" anyString "destinations" ];
name = "label";
}
{ path = [ "services" "geoclue2" "appConfig" ];
name = "desktopID";
}
{ path = [ "home-manager" "users" anyString "programs" "ssh" "matchBlocks" ];
name = "host"; # https://github.com/rycee/home-manager/blob/e8dbc3561373b68d12decb3c0d7c1ba245f138f7/modules/programs/ssh.nix#L265
}
{ path = [ "home-manager" "users" anyString "home" "file" ];
name = "target"; # https://github.com/rycee/home-manager/blob/0e9b7aab3c6c27bf020402e0e2ef20b65c040552/modules/files.nix#L33
}
{ path = [ "home-manager" "users" anyString "xdg" "configFile" ];
name = "target"; # https://github.com/rycee/home-manager/blob/54de0e1d79a1370e57a8f23bef89f99f9b92ab67/modules/misc/xdg.nix#L41
}
{ path = [ "home-manager" "users" anyString "xdg" "dataFile" ];
name = "target"; # https://github.com/rycee/home-manager/blob/54de0e1d79a1370e57a8f23bef89f99f9b92ab67/modules/misc/xdg.nix#L58
}
];
matched = let
equals = a: b: b == anyString || a == b;
fallback = { name = "name"; };
in findFirst ({ path, ... }: all (v: v == true) (zipListsWith equals loc path)) fallback nameAttrs;
nameAttr = matched.name;
nameValueOld = value:
if isList value then
if length value > 0 then
"[ " + concatMapStringsSep " " escapeNixString value + " ]"
else
"[ ]"
else
escapeNixString value;
nameValueNew = value: unnamed:
if isList value then
if length value > 0 then
head value
else
unnamed
else
value;
res =
{ inherit (def) file;
value = listToAttrs (
imap1 (elemIdx: elem:
{ name = elem.name or (unnamed elemIdx);
{ name = nameValueNew (elem.${nameAttr} or (unnamed elemIdx)) (unnamed elemIdx);
value = elem;
}) def.value);
};
option = concatStringsSep "." loc;
sample = take 3 def.value;
list = concatMapStrings (x: ''{ name = "${x.name or "unnamed"}"; ...} '') sample;
set = concatMapStrings (x: ''${x.name or "unnamed"} = {...}; '') sample;
more = lib.optionalString (length def.value > 3) "... ";
list = concatMapStrings (x: ''{ ${nameAttr} = ${nameValueOld (x.${nameAttr} or "unnamed")}; ...} '') sample;
set = concatMapStrings (x: ''${nameValueNew (x.${nameAttr} or "unnamed") "unnamed"} = {...}; '') sample;
msg = ''
In file ${def.file}
a list is being assigned to the option config.${option}.
@ -359,10 +421,10 @@ rec {
See https://git.io/fj2zm for more information.
Do
${option} =
{ ${set}...}
{ ${set}${more}}
instead of
${option} =
[ ${list}...]
[ ${list}${more}]
'';
in
lib.warn msg res
@ -430,14 +492,16 @@ rec {
else unify (if shorthandOnlyDefinesConfig then { config = value; } else value);
allModules = defs: modules ++ imap1 (n: { value, file }:
# Annotate the value with the location of its definition for better error messages
coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value
if isAttrs value || isFunction value then
# Annotate the value with the location of its definition for better error messages
coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value
else value
) defs;
in
mkOptionType rec {
name = "submodule";
check = x: isAttrs x || isFunction x;
check = x: isAttrs x || isFunction x || path.check x;
merge = loc: defs:
(evalModules {
modules = allModules defs;

12
maintainers/maintainer-list.nix
View File

@ -505,6 +505,12 @@
githubId = 750786;
name = "Justin Wood";
};
anmonteiro = {
email = "anmonteiro@gmail.com";
github = "anmonteiro";
githubId = 661909;
name = "Antonio Nuno Monteiro";
};
anpryl = {
email = "anpryl@gmail.com";
github = "anpryl";
@ -4430,6 +4436,12 @@
githubId = 158568;
name = "Matthias C. M. Troffaes";
};
McSinyx = {
email = "vn.mcsinyx@gmail.com";
github = "McSinyx";
githubId = 13689192;
name = "Nguyễn Gia Phong";
};
mdaiter = {
email = "mdaiter8121@gmail.com";
github = "mdaiter";

6
nixos/doc/manual/development/option-types.xml
View File

@ -257,9 +257,9 @@
<listitem>
<para>
A set of sub options <replaceable>o</replaceable>.
<replaceable>o</replaceable> can be an attribute set or a function
returning an attribute set. Submodules are used in composed types to
create modular options. This is equivalent to
<replaceable>o</replaceable> can be an attribute set, a function
returning an attribute set, or a path to a file containing such a value. Submodules are used in
composed types to create modular options. This is equivalent to
<literal>types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }</literal>.
Submodules are detailed in
<xref

10
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -391,6 +391,16 @@ users.users.me =
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR #63103</link>.
</para>
</listitem>
<listitem>
<para>
For NixOS modules, the types <literal>types.submodule</literal> and <literal>types.submoduleWith</literal> now support
paths as allowed values, similar to how <literal>imports</literal> supports paths.
Because of this, if you have a module that defines an option of type
<literal>either (submodule ...) path</literal>, it will break since a path
is now treated as the first type instead of the second. To fix this, change
the type to <literal>either path (submodule ...)</literal>.
</para>
</listitem>
</itemizedlist>
</section>

4
nixos/modules/misc/version.nix
View File

@ -91,8 +91,8 @@ in
# These defaults are set here rather than up there so that
# changing them would not rebuild the manual
version = mkDefault (cfg.release + cfg.versionSuffix);
revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
revision = mkIf (pathExists gitRepo) (mkDefault gitCommitId);
versionSuffix = mkIf (pathExists gitRepo) (mkDefault (".git." + gitCommitId));
};
# Generate /etc/os-release. See

2
nixos/modules/services/continuous-integration/buildbot/master.nix
View File

@ -222,7 +222,7 @@ in {
};
config = mkIf cfg.enable {
users.groups = optional (cfg.group == "buildbot") {
users.groups = optionalAttrs (cfg.group == "buildbot") {
buildbot = { };
};

2
nixos/modules/services/continuous-integration/buildbot/worker.nix
View File

@ -136,7 +136,7 @@ in {
config = mkIf cfg.enable {
services.buildbot-worker.workerPassFile = mkDefault (pkgs.writeText "buildbot-worker-password" cfg.workerPass);
users.groups = optional (cfg.group == "bbworker") {
users.groups = optionalAttrs (cfg.group == "bbworker") {
bbworker = { };
};

2
nixos/modules/services/continuous-integration/jenkins/slave.nix
View File

@ -50,7 +50,7 @@ in {
};
config = mkIf (cfg.enable && !masterCfg.enable) {
users.groups = optional (cfg.group == "jenkins") {
users.groups = optionalAttrs (cfg.group == "jenkins") {
jenkins.gid = config.ids.gids.jenkins;
};

2
nixos/modules/services/databases/openldap.nix
View File

@ -259,6 +259,8 @@ in
${openldap.out}/bin/slapadd ${configOpts} -l ${dataFile}
''}
chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
${openldap}/bin/slaptest ${configOpts}
'';
serviceConfig.ExecStart =
"${openldap.out}/libexec/slapd -d '${cfg.logLevel}' " +

2
nixos/modules/services/hardware/usbmuxd.nix
View File

@ -51,7 +51,7 @@ in
};
};
users.groups = optional (cfg.group == defaultUserGroup) {
users.groups = optionalAttrs (cfg.group == defaultUserGroup) {
${cfg.group} = { };
};

5
nixos/modules/services/mail/postfix.nix
View File

@ -612,10 +612,7 @@ in
{
environment = {
etc = singleton
{ source = "/var/lib/postfix/conf";
target = "postfix";
};
etc.postfix.source = "/var/lib/postfix/conf";
# This makes it comfortable to run 'postqueue/postdrop' for example.
systemPackages = [ pkgs.postfix ];

2
nixos/modules/services/mail/spamassassin.nix
View File

@ -124,7 +124,7 @@ in
# Allow users to run 'spamc'.
environment = {
etc = singleton { source = spamdEnv; target = "spamassassin"; };
etc.spamassassin.source = spamdEnv;
systemPackages = [ pkgs.spamassassin ];
};

2
nixos/modules/services/misc/gitea.nix
View File

@ -364,7 +364,7 @@ in
''}
sed -e "s,#secretkey#,$KEY,g" \
-e "s,#dbpass#,$DBPASS,g" \
-e "s,#jwtsecet#,$JWTSECET,g" \
-e "s,#jwtsecret#,$JWTSECRET,g" \
-e "s,#mailerpass#,$MAILERPASSWORD,g" \
-i ${runConfig}
chmod 640 ${runConfig} ${secretKey} ${jwtSecret}

14
nixos/modules/services/misc/paperless.nix
View File

@ -123,9 +123,9 @@ in
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - ${cfg.user} ${cfg.user} - -"
"d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
] ++ (optional cfg.consumptionDirIsPublic
"d '${cfg.consumptionDir}' 777 ${cfg.user} ${cfg.user} - -"
"d '${cfg.consumptionDir}' 777 - - - -"
# If the consumption dir is not created here, it's automatically created by
# 'manage' with the default permissions.
);
@ -169,17 +169,15 @@ in
};
users = optionalAttrs (cfg.user == defaultUser) {
users = [{
name = defaultUser;
users.${defaultUser} = {
group = defaultUser;
uid = config.ids.uids.paperless;
home = cfg.dataDir;
}];
};
groups = [{
name = defaultUser;
groups.${defaultUser} = {
gid = config.ids.gids.paperless;
}];
};
};
};
}

20
nixos/modules/services/networking/ndppd.nix
View File

@ -161,7 +161,25 @@ in {
documentation = [ "man:ndppd(1)" "man:ndppd.conf(5)" ];
after = [ "network-pre.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.ndppd}/bin/ndppd -c ${ndppdConf}";
serviceConfig = {
ExecStart = "${pkgs.ndppd}/bin/ndppd -c ${ndppdConf}";
# Sandboxing
CapabilityBoundingSet = "CAP_NET_RAW CAP_NET_ADMIN";
ProtectSystem = "strict";
ProtectHome = true;
PrivateTmp = true;
PrivateDevices = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectControlGroups = true;
RestrictAddressFamilies = "AF_INET6 AF_PACKET AF_NETLINK";
RestrictNamespaces = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
};
};
};
}

7
nixos/modules/services/networking/wpa_supplicant.nix
View File

@ -233,6 +233,7 @@ in {
path = [ pkgs.wpa_supplicant ];
script = ''
iface_args="-s -u -D${cfg.driver} -c ${configFile}"
${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do
DEVTYPE=
@ -240,14 +241,14 @@ in {
if [ -e "$UEVENT_PATH" ]; then
source "$UEVENT_PATH"
if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
ifaces="$ifaces''${ifaces:+ -N} -i$i"
args+="''${args:+ -N} -i$i $iface_args"
fi
fi
done
'' else ''
ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
''}
exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
exec wpa_supplicant $args
'';
};

4
nixos/modules/services/security/certmgr.nix
View File

@ -113,7 +113,7 @@ in
otherCert = "/var/certmgr/specs/other-cert.json";
}
'';
type = with types; attrsOf (either (submodule {
type = with types; attrsOf (either path (submodule {
options = {
service = mkOption {
type = nullOr str;
@ -148,7 +148,7 @@ in
description = "certmgr spec request object.";
};
};
}) path);
}));
description = ''
Certificate specs as described by:
<link xlink:href="https://github.com/cloudflare/certmgr#certificate-specs" />

8
pkgs/applications/editors/emacs-modes/elpa-generated.nix generated
View File

@ -3236,10 +3236,10 @@
elpaBuild {
pname = "undo-tree";
ename = "undo-tree";
version = "0.7";
version = "0.7.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/undo-tree-0.7.el";
sha256 = "0mc5spiqx20z8vh8b24dp9hqj27h5bm5wqk0ga7c6s6mp69r72h4";
url = "https://elpa.gnu.org/packages/undo-tree-0.7.2.el";
sha256 = "0gdqh5rkgwlancbjx5whgl5gqkdipdkspkl2bqmrq70sgg5ahrcc";
};
packageRequires = [];
meta = {
@ -3734,4 +3734,4 @@
license = lib.licenses.free;
};
}) {};
}
}

5
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -111,6 +111,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
flycheck-rtags = fix-rtags super.flycheck-rtags;
gnuplot = super.gnuplot.overrideAttrs (old: {
nativeBuildInputs =
(old.nativeBuildInputs or []) ++ [ pkgs.autoreconfHook ];
});
pdf-tools = super.pdf-tools.overrideAttrs(old: {
nativeBuildInputs = [ external.pkgconfig ];
buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];

4
pkgs/applications/editors/neovim/qt.nix
View File

@ -4,13 +4,13 @@
let
unwrapped = mkDerivation rec {
pname = "neovim-qt-unwrapped";
version = "0.2.12";
version = "0.2.15";
src = fetchFromGitHub {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
sha256 = "09s3044j0y8nmyi8ykslfii6fx7k9mckmdvb0jn2xmdabpb60i20";
sha256 = "097nykglqp4jyvla4yp32sc1f1hph4cqqhp6rm9ww7br8c0j54xl";
};
cmakeFlags = [

19
pkgs/applications/misc/font-manager/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
}:
stdenv.mkDerivation rec {
pname = "font-manager";
version = "0.7.5";
version = "0.7.7";
src = fetchFromGitHub {
owner = "FontManager";
repo = "master";
rev = version;
sha256 = "16hma8rrkam6ngn5vbdaryn31vdixvii6920g9z928gylz9xkd3g";
sha256 = "1bzqvspplp1zj0n0869jqbc60wgbjhf0vdrn5bj8dfawxynh8s5f";
};
nativeBuildInputs = [
@ -38,19 +38,6 @@ stdenv.mkDerivation rec {
gnome3.adwaita-icon-theme
];
mesonFlags = [
"-Ddisable_pycompile=true"
];
patches = [
# fix build with Vala 0.46
(fetchpatch {
url = "https://github.com/FontManager/font-manager/commit/c73b40de11f376f4515a0edfe97fb3721a264b35.patch";
sha256 = "0lacwsifgvda2r3z6j2a0svdqr6mgav7zkvih35xa8155y8wfpnw";
excludes = [ "fedora/font-manager.spec" ];
})
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py

6
pkgs/applications/misc/mako/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "mako";
version = "1.4";
version = "1.4.1";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "11ymiq6cr2ma0iva1mqybn3j6k73bsc6lv6pcbdq7hkhd4f9b7j9";
sha256 = "0hwvibpnrximb628w9dsfjpi30b5jy7nfkm4d94z5vhp78p43vxh";
};
nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
description = "A lightweight Wayland notification daemon";
homepage = https://wayland.emersion.fr/mako/;
license = licenses.mit;
maintainers = with maintainers; [ dywedir ];
maintainers = with maintainers; [ dywedir synthetica ];
platforms = platforms.linux;
};
}

4
pkgs/applications/networking/cawbird/default.nix
View File

@ -20,14 +20,14 @@
}:
stdenv.mkDerivation rec {
version = "1.0.3.1";
version = "1.0.4";
pname = "cawbird";
src = fetchFromGitHub {
owner = "IBBoard";
repo = "cawbird";
rev = "v${version}";
sha256 = "sha256:1v1y4bx0mm518b9vlpsry12fw1qz2j28jfhjqq73blvzd89lgb0y";
sha256 = "sha256:1gqi7bn08b9cjpb0mgs6bk1a2npdfhn56ckps95nck0jyqzfbnir";
};
nativeBuildInputs = [

4
pkgs/applications/networking/cluster/cni/plugins.nix
View File

@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }:
buildGoPackage rec {
pname = "cni-plugins";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
sha256 = "0dc4fs08x4x518yhgvq3drjvansnc0cb8rm4h5wiw7k3whjii3cd";
sha256 = "02kz6y3klhbriybsskn4hmldwli28cycnp2klsm2x0y9c73iczdp";
};
goDeps = ./plugins-deps.nix;

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
version = "1.13.2";
version = "1.13.3";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "0x4yfvk8415p80h9an242n6q3b43mw6mnnczh95zd3j0zwdr6wrg";
sha256 = "0y3ks10mc7m8c7pd4c4j8pj7n5rqcvzrjs8mzldv7z7jnlb30hkq";
};
patches = optional smimeSupport (fetchpatch {

4
pkgs/build-support/rust/default.nix
View File

@ -100,9 +100,9 @@ stdenv.mkDerivation (args // {
'' + stdenv.lib.optionalString verifyCargoDeps ''
if ! diff source/Cargo.lock $cargoDeps/Cargo.lock ; then
echo
echo "ERROR: cargoSha256 is out of date."
echo "ERROR: cargoSha256 is out of date"
echo
echo "Cargo.lock is not the same in $cargoDeps."
echo "Cargo.lock is not the same in $cargoDeps"
echo
echo "To fix the issue:"
echo '1. Use "1111111111111111111111111111111111111111111111111111" as the cargoSha256 value'

4
pkgs/data/fonts/victor-mono/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "victor-mono";
version = "1.3.0";
version = "1.3.1";
in fetchFromGitHub rec {
name = "${pname}-${version}";
@ -26,7 +26,7 @@ in fetchFromGitHub rec {
unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname}
'';
sha256 = "1lv2x7kfspabnhvm8z79n165fw3awvzj1r8f0g5zn26wgdalgw69";
sha256 = "1yj91rhs9pd705406r4lqabdfzjclbz837nzm6z1rziy6mbpd61s";
meta = with lib; {
description = "Free programming font with cursive italics and ligatures";

4
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View File

@ -26,11 +26,11 @@
stdenv.mkDerivation rec {
pname = "seahorse";
version = "3.34";
version = "3.34.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16sfnqrdlr5xx6kixx2ln1mva7nngjlw1k3f5n454vyaigffjh2v";
sha256 = "19c2zylwgycb5q9hal8rmflc2sywc5c2grpsfsq3rf37i9lfwynw";
};
doCheck = true;

2
pkgs/development/compilers/bs-platform/default.nix
View File

@ -4,7 +4,7 @@ let
description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code.";
homepage = https://bucklescript.github.io;
license = licenses.lgpl3;
maintainers = with maintainers; [ turbomack gamb ];
maintainers = with maintainers; [ turbomack gamb anmonteiro ];
platforms = platforms.all;
};
in

6
pkgs/development/compilers/ghc/8.10.1.nix
View File

@ -86,12 +86,12 @@ let
in
stdenv.mkDerivation (rec {
version = "8.10.0.20191210";
version = "8.10.0.20200108";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/8.10.1-alpha2/ghc-${version}-src.tar.xz";
sha256 = "1mmv8s9cs41kp7wh1qqnzin5wv32cvs3lmzgda7njz0ssqb0mmvj";
url = "https://downloads.haskell.org/ghc/8.10.1-rc1/ghc-${version}-src.tar.xz";
sha256 = "1xm6cb3s2x3rycnyvkh12mp65xi3zbwrk5ima8sg7c245f3dl0ay";
};
enableParallelBuilding = true;

3
pkgs/development/interpreters/perl/default.nix
View File

@ -96,8 +96,7 @@ let
"-Dprefix=${placeholder "out"}"
"-Dman1dir=${placeholder "out"}/share/man/man1"
"-Dman3dir=${placeholder "out"}/share/man/man3"
]
++ optional (stdenv.isAarch32 || stdenv.isMips) "-Dldflags=\"-lm -lrt\"";
];
configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure";

24
pkgs/development/libraries/alure2/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }:
stdenv.mkDerivation rec {
pname = "alure2";
version = "unstable-2020-01-09";
src = fetchFromGitHub {
owner = "kcat";
repo = "alure";
rev = "4b7b58d3f0de444d6f26aa705704deb59145f586";
sha256 = "0ds18hhy2wpvx498z5hcpzfqz9i60ixsi0cjihyvk20rf4qy12vg";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openal libvorbis opusfile libsndfile ];
meta = with stdenv.lib; {
description = "A utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming";
homepage = "https://github.com/kcat/alure";
license = licenses.zlib;
platforms = platforms.linux;
maintainers = with maintainers; [ McSinyx ];
};
}

4
pkgs/development/libraries/cln/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cln";
version = "1.3.5";
version = "1.3.6";
src = fetchurl {
url = "${meta.homepage}${pname}-${version}.tar.bz2";
sha256 = "0bc43v4fyxwik9gjkvm8jan74bkx9bjssv61lfh9jhhblmj010bq";
sha256 = "0jlq9l4hphk7qqlgqj9ihjp4m3rwjbhk6q4v00lsbgbri07574pl";
};
buildInputs = [ gmp ];

16
pkgs/development/libraries/cpp-netlib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, boost, openssl, asio }:
{ stdenv, fetchFromGitHub, cmake, boost, openssl }:
stdenv.mkDerivation rec {
pname = "cpp-netlib";
@ -14,18 +14,22 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake boost openssl ];
# This can be removed when updating to 0.13, see https://github.com/cpp-netlib/cpp-netlib/issues/629
propagatedBuildInputs = [ asio ];
cmakeFlags = [
"-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
];
enableParallelBuilding = true;
# The test driver binary lacks an RPath to the library's libs
preCheck = ''
export LD_LIBRARY_PATH=$PWD/libs/network/src
'';
# Most tests make network GET requests to various websites
doCheck = false;
meta = with stdenv.lib; {
description =
"Collection of open-source libraries for high level network programming";
description = "Collection of open-source libraries for high level network programming";
homepage = https://cpp-netlib.org;
license = licenses.boost;
platforms = platforms.all;

4
pkgs/development/libraries/glfw/3.x.nix
View File

@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
version = "3.3";
version = "3.3.1";
pname = "glfw";
src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
rev = version;
sha256 = "1f1hqpqffzg46z33ybs2c3akmkly7b3qmgp5byk50nvad6g2pm4p";
sha256 = "0c7nlrhq84gdq10diyv6nshjbv8410bmn0vging815pfvis208xc";
};
enableParallelBuilding = true;

12
pkgs/development/libraries/glog/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gflags, perl, static ? false }:
stdenv.mkDerivation rec {
pname = "glog";
@ -20,9 +20,17 @@ stdenv.mkDerivation rec {
})
];
postPatch = lib.optionalString stdenv.isDarwin ''
# A path clash on case-insensitive file systems blocks creation of the build directory.
# The file in question is specific to bazel and does not influence the build result.
rm BUILD
'';
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
propagatedBuildInputs = [ gflags ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ];
checkInputs = [ perl ];
doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm"

4
pkgs/development/libraries/leptonica/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "leptonica";
version = "1.78.0";
version = "1.79.0";
src = fetchurl {
url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2";
sha256 = "1n004gv1dj3pq1fcnfdclvvx5nang80336aa67nvs3nnqp4ncn84";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

6
pkgs/development/libraries/libdeflate/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libdeflate";
version = "1.3";
version = "1.5";
src = fetchFromGitHub {
owner = "ebiggers";
repo = "libdeflate";
rev = "v${version}";
sha256 = "019xsz5dnbpxiz29j3zqsxyi4ksjkkygi6a2zyc8fxbm8lvaa9ar";
sha256 = "1v0y7998p8a8wpblnpdyk5zzvpj8pbrpzxwxmv0b0axrhaarxrf3";
};
postPatch = ''
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Fast DEFLATE/zlib/gzip compressor and decompressor";
license = licenses.mit;
homepage = https://github.com/ebiggers/libdeflate;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ orivej ];
};
}

1
pkgs/development/libraries/libvirt/default.nix
View File

@ -102,6 +102,7 @@ in stdenv.mkDerivation rec {
] ++ optionals stdenv.isLinux [
"QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
"QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
"EBTABLES_PATH=${ebtables}/bin/ebtables-legacy"
"--with-attr"
"--with-apparmor"
"--with-secdriver-apparmor"

4
pkgs/development/libraries/physics/rivet/default.nix
View File

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
patches = [
./darwin.patch # configure relies on impure sw_vers to -Dunix
(fetchpatch {
url = "https://phab-files.hepforge.org/file/data/j3ja4jirrdyrovrmnbuh/PHID-FILE-6vnor4aoz3s2ejruisrg/file";
sha256 = "0flxv08wcd0m5di75s2zvm015k2k70nqgpcgcbq7m604z26pd6ab";
url = "https://gitlab.com/hepcedar/rivet/commit/37bd34f52cce66946ebb311a8fe61bfc5f69cc00.diff";
sha256 = "0wj3ilpfq2gpc33bj3800l9vyvc9lrrlj1x9ss5qki0yiqd8i2aa";
})
];

4
pkgs/development/libraries/science/biology/htslib/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "htslib";
version = "1.9";
version = "1.10.2";
src = fetchurl {
url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0";
sha256 = "0f8rglbvf4aaw41i2sxlpq7pvhly93sjqiz0l4q3hwki5zg47dg3";
};
# perl is only used during the check phase.

20
pkgs/development/ocaml-modules/sqlite3/default.nix
View File

@ -1,24 +1,22 @@
{ stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }:
{ lib, fetchurl, sqlite, pkgconfig, buildDunePackage }:
stdenv.mkDerivation rec {
pname = "ocaml-sqlite3";
version = "2.0.9";
buildDunePackage rec {
pname = "sqlite3";
version = "5.0.1";
minimumOCamlVersion = "4.05";
src = fetchurl {
url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/v${version}/sqlite3-ocaml-${version}.tar.gz";
sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551";
url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz";
sha256 = "0iymkszrs6qwak0vadfzc8yd8jfwn06zl08ggb4jr2mgk2c8mmsn";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocaml findlib ocamlbuild sqlite ];
buildInputs = [ sqlite ];
createFindlibDestdir = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://mmottl.github.io/sqlite3-ocaml/;
description = "OCaml bindings to the SQLite 3 database access library";
license = licenses.mit;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
maggesi vbgl
];

6
pkgs/development/ocaml-modules/uchar/default.nix
View File

@ -8,10 +8,10 @@ stdenv.mkDerivation {
sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7";
};
nativeBuildInputs = [ ocaml ocamlbuild findlib opaline ];
buildInputs = [ findlib ocaml ocamlbuild opaline ];
nativeBuildInputs = [ ocaml ocamlbuild findlib ];
buildInputs = [ findlib ocaml ocamlbuild ];
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${if withShared then "true" else "false"}";
installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";
installPhase = "${opaline}/bin/opaline -libdir $OCAMLFIND_DESTDIR";
configurePlatforms = [];
meta = {

11
pkgs/development/python-modules/django-extensions/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder
, six, typing, pygments
, django, shortuuid, python-dateutil, pytest
, pytest-django, pytestcov, mock, vobject
@ -16,6 +16,15 @@ buildPythonPackage rec {
sha256 = "0053yqq4vq3mwy7zkfs5vfm3g8j9sfy3vrc6xby83qlj9wz43ipi";
};
# This patch fixes a single failing test and can be removed when updating this pkg
# to the next version
patches = [
(fetchpatch {
url = "https://github.com/django-extensions/django-extensions/commit/1d21786da2e6868d98ae34c82079e1e03ad1aa97.patch";
sha256 = "0d81zpj0f8a7ijrfb12j0b67fgj89k3axaskz1nwqsr4wc6n4bw2";
})
];
postPatch = ''
substituteInPlace setup.py --replace "'tox'," ""

27
pkgs/development/python-modules/gpxpy/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, fetchFromGitHub, buildPythonPackage, python, lxml }:
buildPythonPackage rec {
pname = "gpxpy";
version = "1.3.5";
src = fetchFromGitHub {
owner = "tkrajina";
repo = pname;
rev = "v${version}";
sha256 = "18r7pfda7g3l0hv8j9565n52cvvgjxiiqqzagfdfaba1djgl6p8b";
};
propagatedBuildInputs = [ lxml ];
checkPhase = ''
${python.interpreter} -m unittest test
'';
meta = with lib; {
description = "Python GPX (GPS eXchange format) parser";
homepage = "https://github.com/tkrajina/gpxpy";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ sikmir ];
};
}

5
pkgs/development/python-modules/python-olm/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, olm,
cffi, future, typing }:
cffi, future, isPy3k, typing }:
buildPythonPackage {
pname = "python-olm";
@ -15,8 +15,7 @@ buildPythonPackage {
propagatedBuildInputs = [
cffi
future
typing
];
] ++ lib.optionals (!isPy3k) [ typing ];
doCheck = false;

4
pkgs/development/python-modules/srsly/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "srsly";
version = "0.2.0";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "0gha1xfh64mapvgn0sghnjsvmjdrh5rywhs3j3bhkvwk42kf40ma";
sha256 = "0d49a90gsfyxwp8g14mvvw1kjm77qgx86zg4812kcmlz9ycb80hi";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;

4
pkgs/development/tools/boomerang/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "boomerang";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "BoomerangDecompiler";
repo = pname;
rev = "v${version}";
sha256 = "046ba4km8c31kbnllx05nbqhjmk7bpi56d3n8md8bsr98nj21a2j";
sha256 = "0xncdp0z8ry4lkzmvbj5d7hlzikivghpwicgywlv47spgh8ny0ix";
};
nativeBuildInputs = [ cmake bison flex ];

22
pkgs/development/tools/rnix-lsp/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ callPackage, lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "rnix-lsp";
version = "0.1.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "rnix-lsp";
rev = "v${version}";
sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn";
};
cargoSha256 = "1wm5m7b6zr6wg1k59rmqis1zp9i2990p7y0ml852hxv34an7pp5d";
meta = with lib; {
description = "A work-in-progress language server for Nix, with syntax checking and basic completion";
license = licenses.mit;
maintainers = with maintainers; [ jD91mZM2 ];
};
}

106
pkgs/games/mindustry/default.nix Normal file
View File

@ -0,0 +1,106 @@
{ stdenv
, makeWrapper
, makeDesktopItem
, fetchFromGitHub
, gradle_5
, perl
, jre
, libpulseaudio
# Make the build version easily overridable.
# Server and client build versions must match, and an empty build version means
# any build is allowed, so this parameter acts as a simple whitelist.
# Takes the package version and returns the build version.
, makeBuildVersion ? (v: v)
}:
let
pname = "mindustry";
# Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch).
version = "102";
buildVersion = makeBuildVersion version;
src = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
sha256 = "0g4zy2zlynv6f427pq1ngnl0zpr6nnih10wd2l8vl9bxwzjygwdr";
};
desktopItem = makeDesktopItem {
type = "Application";
name = "Mindustry";
desktopName = "Mindustry";
exec = "mindustry";
icon = "mindustry";
};
postPatch = ''
# Remove unbuildable iOS stuff
sed -i '/^project(":ios"){/,/^}/d' build.gradle
sed -i '/robo(vm|VM)/d' build.gradle
rm ios/build.gradle
# Pin 'SNAPSHOT' versions
sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle
'';
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit version src postPatch;
nativeBuildInputs = [ gradle_5 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
gradle --no-daemon desktop:dist -Pbuildversion=${buildVersion}
gradle --no-daemon server:dist -Pbuildversion=${buildVersion}
'';
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
installPhase = ''
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1sscxrr32f2agwz34pm491xqkz7m4bwdc1p3g64kcnl3p6rg7r7k";
};
in stdenv.mkDerivation rec {
inherit pname version src postPatch;
nativeBuildInputs = [ gradle_5 makeWrapper ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# point to offline repo
sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" build.gradle
gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion}
gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion}
'';
installPhase = ''
install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar
mkdir $out/bin
makeWrapper ${jre}/bin/java $out/bin/mindustry \
--prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \
--add-flags "-jar $out/share/mindustry.jar"
makeWrapper ${jre}/bin/java $out/bin/mindustry-server \
--add-flags "-jar $out/share/mindustry-server.jar"
install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png
install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop
'';
meta = with stdenv.lib; {
homepage = "https://mindustrygame.github.io/";
downloadPage = "https://github.com/Anuken/Mindustry/releases";
description = "A sandbox tower defense game";
license = licenses.gpl3;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
};
}

8
pkgs/games/ultrastardx/default.nix
View File

@ -12,21 +12,19 @@ let
in stdenv.mkDerivation rec {
pname = "ultrastardx";
version = "2017.8.0";
version = "unstable-2019-01-07";
src = fetchFromGitHub {
owner = "UltraStar-Deluxe";
repo = "USDX";
rev = "v${version}";
sha256 = "1zp0xfwzci3cjmwx3cprcxvm60cik5cvhvrz9n4d6yb8dv38nqzm";
rev = "3df142590f29db1505cc58746af9f8cf7cb4a6a5";
sha256 = "EpwGKK9B8seF7gRwo3kCeSzFQQW1p8rP4HXeu8/LoyA=";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ fpc libpng ] ++ sharedLibs;
# https://github.com/UltraStar-Deluxe/USDX/issues/462
postPatch = ''
substituteInPlace src/config.inc.in \
--subst-var-by lua_LIB_NAME liblua.so \
--subst-var-by libpcre_LIBNAME libpcre.so.1
'';

285
pkgs/misc/vim-plugins/generated.nix
View File

@ -50,12 +50,12 @@ let
alchemist-vim = buildVimPluginFrom2Nix {
pname = "alchemist-vim";
version = "2019-11-27";
version = "2020-01-10";
src = fetchFromGitHub {
owner = "slashmili";
repo = "alchemist.vim";
rev = "911eda990ef259d1f035061c5dfb2f44adb2697e";
sha256 = "04lm3k6svq4y2a7kqq5phzyny93ynnjdmsv2s98pw6c4z5fq5y1m";
rev = "a5158d2e731afe3bca25a6a76eb706ff34e155b0";
sha256 = "0r1xiw0f46if7whxan2asi1klyijlyaf61p0xg5v81nnh64w6lhs";
};
};
@ -193,12 +193,12 @@ let
bufexplorer = buildVimPluginFrom2Nix {
pname = "bufexplorer";
version = "2019-02-13";
version = "2020-01-10";
src = fetchFromGitHub {
owner = "jlanzarotta";
repo = "bufexplorer";
rev = "162f6031ada3b2d1ad171e02e93f417ee1689176";
sha256 = "0ws8yw1s77pb0gm5wvj5w5symx8fqqzcdizds8cg47cfmw97zz1h";
rev = "8014787603fff635dfae6afd4dbe9297673a0b39";
sha256 = "0drj8q6wg9h08nf517l0dks1fbcnc558zg7dqavxc43maymq5mxm";
};
};
@ -424,23 +424,23 @@ let
coc-metals = buildVimPluginFrom2Nix {
pname = "coc-metals";
version = "2020-01-03";
version = "2020-01-12";
src = fetchFromGitHub {
owner = "ckipp01";
repo = "coc-metals";
rev = "a2c71dc75b35251549d1ba2cdb5f9ee286ab9f90";
sha256 = "0hzd7m1rli2vgwvykrv9ld5q9na867l5d56fl02d7d3q9ykfn6j7";
rev = "569547beb3bbed8c1b882dc5ad0331f95b7d100f";
sha256 = "1s9qyks69x3nbp9nn8p2yhv3wi9s77nihcjck7l5rzmmdcg5rka8";
};
};
coc-neco = buildVimPluginFrom2Nix {
pname = "coc-neco";
version = "2019-09-23";
version = "2020-01-11";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-neco";
rev = "e6eb1ccc2ab98966fe678107c6da0d4ddfa34f10";
sha256 = "14lph4dg7q0s5yjdr8snz9yl7bn6gs42ikizb6mxq43qqfdnxzdx";
rev = "e203327ff80c56fc51d85f73df9049455edf1a56";
sha256 = "1snfb92pahdfkch0cwhd0pcmia35al518351np2hq8dhbs7fc02n";
};
};
@ -523,12 +523,12 @@ let
coc-solargraph = buildVimPluginFrom2Nix {
pname = "coc-solargraph";
version = "2019-08-11";
version = "2020-01-11";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-solargraph";
rev = "6a146623192e661e18830c58abe1055fddcf57d7";
sha256 = "1mc8jqpgwy5q4jzb5p09j5mal9paq50dl1hsxhg0y5q6rqrr7qhz";
rev = "c767dd19c8d07920e10f126b4b71f187c7bdcb6a";
sha256 = "014k1sqjfzcr052vnqnr5ccxpw2yr0dfgd0657nwjgbhnpf8qn3s";
};
};
@ -545,12 +545,12 @@ let
coc-tabnine = buildVimPluginFrom2Nix {
pname = "coc-tabnine";
version = "2019-12-10";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-tabnine";
rev = "f72b4f47109918cc6ad43b42ed566bec61feff8e";
sha256 = "1jaj6qsascdpdyz0g8yvi7bcxf4jwcrb0766x4dsmfk9r7prxifl";
rev = "442c829185ecab2268d1b9fd076c5286bbd39562";
sha256 = "0as4b33nnp7anqbxkkja8lp37y4a74b3507zyk3gmmna0my1ca3r";
};
};
@ -700,12 +700,12 @@ let
context_filetype-vim = buildVimPluginFrom2Nix {
pname = "context_filetype-vim";
version = "2019-08-17";
version = "2020-01-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "context_filetype.vim";
rev = "9d495ce4ddfdae8f0b268fcec3a7a5e0062456e8";
sha256 = "0g5ixgg8p2vrpjhyy52xln7a5f8rcbglgyir620ynzhz1phdilg4";
rev = "cbe3c0069e6a13bd9bfcd9739c0770f7fd4b4ef4";
sha256 = "07mnch8vi7snx8jfz32hkg4v4ml2ywb8yn0jycshn317j253fbmj";
};
};
@ -808,17 +808,6 @@ let
};
};
defx-icons = buildVimPluginFrom2Nix {
pname = "defx-icons";
version = "2019-11-03";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "defx-icons";
rev = "1412fd083eb54ffedb4f3ae32ddc7ce28613a144";
sha256 = "1x0xpixbmxm15g5nmsslccdngm14sg86ymy6mywg9xfbnrh1vn0p";
};
};
defx-git = buildVimPluginFrom2Nix {
pname = "defx-git";
version = "2019-12-25";
@ -830,14 +819,25 @@ let
};
};
defx-icons = buildVimPluginFrom2Nix {
pname = "defx-icons";
version = "2019-11-03";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "defx-icons";
rev = "1412fd083eb54ffedb4f3ae32ddc7ce28613a144";
sha256 = "1x0xpixbmxm15g5nmsslccdngm14sg86ymy6mywg9xfbnrh1vn0p";
};
};
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
version = "2020-01-02";
version = "2020-01-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "aa1b5c762bbabaeeb5f3eca976e65bbb2f82a883";
sha256 = "0pfsky4i4h769fjmrvy89d9ickkfifvmq0m54c6qhs24bycx0s7j";
rev = "2823cfbf37ae86bf20b56a4dacff123c54dc85fa";
sha256 = "0hbmdkwfhihjn1sxlznhv6fls8zgfvm7srigw8anxh7zr7rx2qz3";
};
};
@ -876,12 +876,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2020-01-05";
version = "2020-01-11";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "908cd3a3fe5b03783da7186441b2fe0c146f31b3";
sha256 = "0qrz0mrrx79525rzab0l1qx3q49531306b05hgqrlkzx9zcppk8l";
rev = "ef50148d730a9a14b3def3fa07c6cce4917172ed";
sha256 = "1kb8gl5c1sgrs3p2x7ib01nwwnwa73kzsgzg38w6xwsrnw044d18";
};
};
@ -978,12 +978,12 @@ let
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
version = "2019-12-24";
version = "2020-01-10";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete-lsp";
rev = "0985ba9f5a5f35521087b9ca0858c96ab3785158";
sha256 = "09bfsd217qi1ndfrfrjla1vlhnp8r9q9qirkwjjajbqhk4ws90pm";
rev = "7a8c44f423bc4339c092a759abaad40131d2c98a";
sha256 = "1gg9j26xq668s4gbww0p2x8pkh3ssbzgyp2hxppk2ws7x8c2cihi";
};
};
@ -1022,12 +1022,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2019-12-27";
version = "2020-01-10";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "840c46aed8033efe19c7a5a809713c809b4a6bb5";
sha256 = "09bivhh6iig9vskia9fz1cz2c6dbn3xf4cgm77z9ppaii00n9wh3";
rev = "1e1af97ed05f12ad16104365d40e1f26a3e98a1d";
sha256 = "01zgvadp7h47ni9bvvgbg68vxb0hijw670xyps557ii4aadkk28f";
};
};
@ -1245,12 +1245,12 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
version = "2019-12-22";
version = "2020-01-10";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
rev = "76669c3c1d675833f9d89f6496f16a7accc0f40e";
sha256 = "0p5z9bljjfnp4kkpf9pb5zwv5l9xdk3aikpfxjj8scafl99k4m5r";
rev = "8a6894d6a560497bd35947f55ece381bf4f2d9ed";
sha256 = "17f64c3z03g45iw68ir9wszq3bjlk661ccy87g0wxvl2pkcmnk53";
};
};
@ -1278,12 +1278,12 @@ let
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
version = "2019-12-14";
version = "2020-01-09";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
rev = "723054642faf15082bbad6a0d6db921918e5db61";
sha256 = "0ln5y7jfd4m59ci39zffjmzi9bda0bck7mkxk0i5fyp4whp8jqdr";
rev = "40a6ed21bc811e7795c525ce9a4fc689c6b99f60";
sha256 = "020g3032gggxllnapqf7nbg5wqjg3c2z190f2jx3cl6z0fswgiwz";
};
};
@ -1300,12 +1300,12 @@ let
gist-vim = buildVimPluginFrom2Nix {
pname = "gist-vim";
version = "2019-07-08";
version = "2020-01-09";
src = fetchFromGitHub {
owner = "mattn";
repo = "gist-vim";
rev = "e485c6c24a62b378a2a4c8687e36e7f54ceca18c";
sha256 = "1fkm7aada088l9f5rf6fk1valfanwzfrsfip9w4q9w2mqvd7n1kn";
rev = "c1f9b5aef7fa68f5151e62ceadbc9a9c48d58962";
sha256 = "0q83dqhp3n0hj0mdkvj2kilywpqy512r1vpay0f9z57vkx29grzr";
};
};
@ -1531,12 +1531,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
version = "2020-01-01";
version = "2020-01-10";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
rev = "2572136fcb4c9941553dd05504007806613c8946";
sha256 = "08fdaxaldbmg76bkj0xni4cpgqiss4cdxnv3jxskwvs6v9dxmbcs";
rev = "c0ded0baf2971cec3698d7c799c04ad971a1484d";
sha256 = "0bbivgm62a9v28r968dsx174km72an9xxz98r1r4z5krllccilab";
fetchSubmodules = true;
};
};
@ -1928,12 +1928,12 @@ let
neomake = buildVimPluginFrom2Nix {
pname = "neomake";
version = "2019-12-20";
version = "2020-01-07";
src = fetchFromGitHub {
owner = "neomake";
repo = "neomake";
rev = "212c0d8b05ee65b9be77675db147d05abd323a46";
sha256 = "0fjmrnmnqjb1r4cxbrlxwpwbm7jgs47wx6pql565946adv5bckh2";
rev = "2669c679fa2d39457eba3f84f50404d7994e22cf";
sha256 = "1ag11acrg32qgwn0c3lsv7ai0f8hs3hklpnqjx84jb0kb1fqp8s2";
};
};
@ -1961,12 +1961,12 @@ let
neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet-vim";
version = "2019-12-28";
version = "2020-01-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
rev = "6cccbd41851f3d8f47c5e225d552a217cede4f3f";
sha256 = "0jrdya11fzis746x1s802g2w20v47dhaxlmczb2fv4x3fxfwql5p";
rev = "5673f584c06431978a17609865f2adcf5e934be3";
sha256 = "05g4dixqn584h6z2w7va676q74fl1839f86wsjfm09kfdlql4n1m";
};
};
@ -2038,12 +2038,12 @@ let
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
version = "2020-01-02";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdtree";
rev = "8a14891241e3468f9c13deaa6cf88aebe53b519f";
sha256 = "033qnzna0awys5w5wf9sj2gydm433l1919zz9cm984l0nmgmkp29";
rev = "ee79ecfb67e4403e54ea59c175ca4d39544395e8";
sha256 = "0zny0ycxfkcfj65y8m70spj96lv81fv52s07r8ncfa4bqm9kk9sd";
};
};
@ -2102,6 +2102,17 @@ let
};
};
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
version = "2019-10-28";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
rev = "aa343ab3089cb520289a614a7b7c71f43134b34a";
sha256 = "0qn0mq59x8jdkjvv47g2fjxnagvpa7pb01vl4jjrdwq34639i1bg";
};
};
nvim-hs-vim = buildVimPluginFrom2Nix {
pname = "nvim-hs-vim";
version = "2019-04-14";
@ -2687,12 +2698,12 @@ let
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
version = "2019-11-20";
version = "2020-01-12";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "syntastic";
rev = "39b35b23b952d620b8ec7cabb13110f586663837";
sha256 = "1nc3019c969ms6m0hrj5k1kggcvsywn6j7kz0scdwzvfd6bcla6h";
rev = "3b756bc1066a6df6b54415f2aa7eceaa67ee1ee4";
sha256 = "1c9nsg36an3jyma0bhz6c9ymmcrayim6cxn82g37skl040gksvn4";
};
};
@ -2731,12 +2742,12 @@ let
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
version = "2020-01-04";
version = "2020-01-08";
src = fetchFromGitHub {
owner = "majutsushi";
repo = "tagbar";
rev = "3753b235a1163cfbc3b7c417825d1910b2f66100";
sha256 = "16nw145n17d9fnwhcp42k85sf2mx2nyp7wy4gllhw48xnwgh6qpb";
rev = "3bd3ba403dfaf5868656264f979fc0dc63526afb";
sha256 = "1s9y6qxvys393gsql4x5v0y2wfdb8b2a7mv8a39as98msq67a4sx";
};
};
@ -2919,12 +2930,12 @@ let
unicode-vim = buildVimPluginFrom2Nix {
pname = "unicode-vim";
version = "2019-11-06";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "unicode.vim";
rev = "49f79785e7fba0f40519a6b9074dcceb8626f7d5";
sha256 = "1k2b4wh0244dx7zinag88wfcwl2x2042z0zsyv9b77w81h8qfdd1";
rev = "d450defdb29842e66b779715941a98cbf73736ea";
sha256 = "196fi75rvhj0lrzpzkpzvlnrncnjysxj8iww0drc1aawjfkmn1ni";
};
};
@ -3216,23 +3227,23 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2020-01-03";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "66f77d4a77e54946fedaac7d54d02271751eab40";
sha256 = "008k8v0nx219lbn0vsc1cwr537lg0gdb9s4d7hjpdq2rhh79zsg3";
rev = "c1de3d33701492a388684ffcc9899faf4b863e92";
sha256 = "0pw0laiigsbivsrxiy654jnsxjq8x855pk6y0mdilkwvinza0z0j";
};
};
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
version = "2020-01-03";
version = "2020-01-07";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
rev = "14c3a60ab0f42aa1001d8f32ffaab2c28935a1e7";
sha256 = "0k25x599sfaw931p5b83cpqhz5dzjxp01v3qlsi78rhjyw1y83jf";
rev = "9cfa14a6b7e2bd923b3f14252091ed35eda188fd";
sha256 = "09ap3w0ixbk5yxsyw165kh7lxmrbjlnz16a1z5qpd9d7afbl3k69";
};
};
@ -3260,12 +3271,12 @@ let
vim-asterisk = buildVimPluginFrom2Nix {
pname = "vim-asterisk";
version = "2019-09-23";
version = "2020-01-07";
src = fetchFromGitHub {
owner = "haya14busa";
repo = "vim-asterisk";
rev = "7cf0d8f379babbdbf538aefe3af444ac4ba21dce";
sha256 = "0y21ziz36sqa84dy9pv2jnr0ppalxn54bsk82zfc6064h3bqn77r";
rev = "66a64172d21fab44312d0d49b22f63eeeaf89b23";
sha256 = "1lksnr4mix9y2al2yfysrxqcska3cd82ck89fkjg5zqzb5wz20vs";
};
};
@ -3282,12 +3293,12 @@ let
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
version = "2019-12-04";
version = "2020-01-09";
src = fetchFromGitHub {
owner = "Chiel92";
repo = "vim-autoformat";
rev = "354abcd3d533ba07eebc510102870d85d4e2c466";
sha256 = "1hngbjj12q5v73smyhsay4irp3q71cxyc60n97ybfik5mmm455nj";
rev = "4159c742ed0b547026b9e398ef78b31527b5e167";
sha256 = "0yq4jl252bndr45yhqwmv9mzgjsscywm0wn0lqz70xbz9ik69gvk";
};
};
@ -3403,12 +3414,12 @@ let
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
version = "2020-01-01";
version = "2020-01-08";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
rev = "7556c68b1d68b9a2b1b4a9df838cdc4bcf87ba0a";
sha256 = "0bi6nbma0bwzvn7l6w88qgr4fbpfbipv936z346sh59dk17j4nv6";
rev = "024911c7fede0105a3381f6bc3ed54364ecbe77d";
sha256 = "0yjvkxz6qk1yxdbjb6b0zxsab1h880l4dr6c74rcmak9m1m12r66";
};
};
@ -3700,12 +3711,12 @@ let
vim-elm-syntax = buildVimPluginFrom2Nix {
pname = "vim-elm-syntax";
version = "2019-11-28";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "andys8";
repo = "vim-elm-syntax";
rev = "7ed55d9bc2c0cfd023d7cc6541634bcbf36430b5";
sha256 = "1kq7qcw9l41q646a2ilwy94lj1qz9as14aqfmzkbi938yij18zpx";
rev = "904025e5db117fe292fdb7ae490feff1540696ea";
sha256 = "0nm1pzq5qg9mcg0vhvqjbnq20f98njf2yn0sfzlyjgna2ivvjasg";
};
};
@ -3865,12 +3876,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2020-01-06";
version = "2020-01-11";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "ddd64fc4c5c5365d56478f100f19898375244890";
sha256 = "1b6mw8bb8dc46vjz5qb2v0n5kfvwz4hk7q0frflrsyc6z3pw7hab";
rev = "6bc345f6f16aee0dcc361f2f3bf80e4964f461af";
sha256 = "0fbbi9gsmrjbff75y0r9zdjcbyc7lf5j9pyski3y5wma4z3l4idr";
};
};
@ -3909,12 +3920,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
version = "2019-12-03";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
rev = "1c53af9a0d3b622af5a62d69ddfc141c841a28c1";
sha256 = "0269cjkcx4arq7phyqv80ziafg5p1in5ci7207svixbfdg5hlmfs";
rev = "0946c53cfc6edfb8dbf4b25a27d013c0b6ec6619";
sha256 = "06n4w9c8w2dyh8nwmlmz4d8hqy4yk9i6w01qa9plbvkhb1lrv21l";
};
};
@ -3942,12 +3953,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2020-01-03";
version = "2020-01-08";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "ee2071d8e63f9aab98d750a91fcc3358e9987bc9";
sha256 = "0a2ac5y8x3lhry5dzq2jbzvryfbvrdvn7bkd2wwm5bf2y9zpkbwk";
rev = "810e4b9faf1583443fe2d027d11993fb698b080f";
sha256 = "0841030jxifv0x8y4vqz0dvwkxirbynra5iibfgyv485ynhw2l8i";
};
};
@ -4427,12 +4438,12 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
version = "2019-12-30";
version = "2020-01-07";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
rev = "6cb8410e10f1b6a23adf238c1f93ce19a3eef83a";
sha256 = "1zqv58s35qvp53an15mvs7ywvarsqxc0has6yji99jwmjiq68pag";
rev = "2384903e1dd6314934f58e3c88b10924dd1bf4f7";
sha256 = "0xs64i4g27w8bdmznjilqg5rlrpaw12qiclg1p4l3ryyid27wki7";
};
};
@ -5120,12 +5131,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
version = "2020-01-03";
version = "2020-01-07";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
rev = "f324a43a5f6a941a55ee992bb852f3c2c504a509";
sha256 = "0dgxsn96vw4zgci58lzr4d4d4kwjbk9d52h51ibh3mhsikmpr7xk";
rev = "977cc05194bdac51970bf83d0fe6fafc297012de";
sha256 = "0jj7j4mrkx0h1kcz50zs316gbppciypnv541hpsv32wzfcjj2x9m";
};
};
@ -5285,23 +5296,23 @@ let
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
version = "2020-01-02";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
rev = "1df8ac3e1bc33e1c70bd3a1713d8c9cd2eb491e1";
sha256 = "0ivkm9vzzfn1iwzkkgk54kn846qnhvsaf8f4nzz3mllirjsl14am";
rev = "5ae986685ba479718b3f59263c519976cf9b4c80";
sha256 = "1dhgzpjykx9slv6lfbjnyci5ndixisdgym3y8zanhhhjp4nff41b";
};
};
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
version = "2019-12-07";
version = "2020-01-09";
src = fetchFromGitHub {
owner = "janko-m";
repo = "vim-test";
rev = "e9e824cf3f22fa1cddabb7ef739f2481436c3924";
sha256 = "0nl1b3zzw3w413lmdl4fhm8ia079hr1rz1kpx7sf0i86lx1c0dcv";
rev = "2f4efe7028e493a3d9eb06ccb7e27780b81687b7";
sha256 = "1yfpishvgj1zdnhsixzjqnbmvfw8qg908zqnis3gk8s9fmnrw6fz";
};
};
@ -5505,12 +5516,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
version = "2019-12-18";
version = "2020-01-11";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
rev = "d332d08365bc735f60904a4207d650f191598378";
sha256 = "0g5lawg641ma216v53ivhbkzpmdqhcmgybb5kh1rz6s991j51ziy";
rev = "1b4d7269600a926a394b146f7d39044cd4dafa19";
sha256 = "0wknx72x7mbkw9007b6ylp1cpl6jap4kv3y85f9sz2lwlsbbkk4b";
};
};
@ -5626,12 +5637,12 @@ let
vimagit = buildVimPluginFrom2Nix {
pname = "vimagit";
version = "2019-07-24";
version = "2020-01-12";
src = fetchFromGitHub {
owner = "jreybert";
repo = "vimagit";
rev = "94762b1356ebdcb8ec486a86f45e69ef77a69465";
sha256 = "1p8izqdkx8g1aqmq9a2qm506bs4mvc4xdbzkh2k5xprm5vc14z0s";
rev = "bf7b16e99e075b019e56f2fbfb96c493ca3635e2";
sha256 = "1f7gvlhrvvkf69y5vfrkvidhx8aa03n1aqmdhk9qjd6sglfg5w0i";
};
};
@ -5692,12 +5703,12 @@ let
vimproc-vim = buildVimPluginFrom2Nix {
pname = "vimproc-vim";
version = "2019-11-28";
version = "2020-01-06";
src = fetchFromGitHub {
owner = "Shougo";
repo = "vimproc.vim";
rev = "89065f62883edb10a99aa1b1640d6d411907316b";
sha256 = "0699kf269rsyabl49m4n7vsi5bbxk129wq6ml3ykhy9g9m2b8a3k";
rev = "7425059fe2d9689f8560f1a47590677740669fdd";
sha256 = "1rp5jq4jv8zga98pw62635mby0sgw0inzknlwcdy0f2lfbdvaq8g";
};
};
@ -5714,12 +5725,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2019-12-31";
version = "2020-01-11";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "020206fbe1f6981855a3fe2f96ef893db782d4b8";
sha256 = "113d1zdmx3vhjig4xrp1kqlzapdhygis2ky2paww42j22vakqywc";
rev = "b39262879240e699ac90618003d47857be664c2d";
sha256 = "17r6nckqqw6mcpxcvh8whv3xpmnf77ws1hyiphw2dppfmr3jpp36";
};
};
@ -5758,12 +5769,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
version = "2020-01-06";
version = "2020-01-12";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
rev = "dcf134c83a6a3f9618a97cafab5b7fb1f1df3f84";
sha256 = "0w9q69a2k8a39b8zrd3sildisrdskbk6cgvbkmb3fqsr0zdzjxzv";
rev = "221893d85d2e8ed5ec51da12bf23d2e5bada57cf";
sha256 = "1ggwkmi6haj7hayiki3nd9vrc14l4z1912jd06w22hmyl86926x9";
};
};
@ -5835,12 +5846,12 @@ let
xptemplate = buildVimPluginFrom2Nix {
pname = "xptemplate";
version = "2019-10-29";
version = "2020-01-07";
src = fetchFromGitHub {
owner = "drmingdrmer";
repo = "xptemplate";
rev = "4dabcf320f18e33923dbcf793d3c04330dcb79a1";
sha256 = "07sr3ixlgfv0sql48fxvyimwdb8xr3iklmzfxb5wxfxgvhr4xbs8";
rev = "9cd1c622a5a7cc383ae3df2cec2bac5cb102fa7f";
sha256 = "01szas3gv4zw1v6c8yp5p2hygf3fqmpx0y2h6sn8696pfph7vjk3";
};
};
@ -5868,12 +5879,12 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
version = "2020-01-06";
version = "2020-01-11";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
rev = "48184a10ecdda3efce0131aa73495f1edc449a33";
sha256 = "0nsdq17r2m2pmnz077rliqdlwk5sn1aj3bxl648bsli7rjacgaqq";
rev = "81137eba4f2b3ed093e60dbba7d29b6d3ae4c988";
sha256 = "04hprqqxx84lwnfnfj7x0fnsbc45xk8grf3akbzrpl1a0v36b0r3";
fetchSubmodules = true;
};
};
@ -5925,12 +5936,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
version = "2020-01-02";
version = "2020-01-09";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig.vim";
rev = "7b644a313bf3e32a3b0c4616660d61f5ec8872d9";
sha256 = "1icv1qa4wf1kaknfs045m8md2938qggzl6a5wf76lcn1iw5nr1cc";
rev = "9c22f756b8d2b2e0e3557671a84a555f52aa1a87";
sha256 = "1dd0by3z1ac55fm52nvxm7qf41icm0pdhzmdpdmsizbfz75nnhwz";
};
};

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -377,6 +377,7 @@ rust-lang/rust.vim
ryanoasis/vim-devicons
Rykka/riv.vim
ryvnf/readline.vim
sakhnik/nvim-gdb
samoshkin/vim-mergetool
sbdchd/neoformat
scrooloose/nerdcommenter

4
pkgs/os-specific/linux/firejail/default.nix
View File

@ -36,10 +36,10 @@ stdenv.mkDerivation {
sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile
'';
# We need to set the directory for the .local override files back to
# We need to set the directory for the .local override files to
# /etc/firejail so we can actually override them
postInstall = ''
sed -E -e 's@^include (.*)(/firejail/.*.local)$@include /etc\2@g' -i $out/etc/firejail/*.profile
sed -E -e 's@^include (.*.local)$@include /etc/firejail/\1@g' -i $out/etc/firejail/*.profile
'';
# At high parallelism, the build sometimes fails with:

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.163";
version = "4.14.164";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0jdh54rqdsb3b908v2q4xjn8y45b7rdnwgab0s4qf5alznfcqagb";
sha256 = "0jzbgpxlfy64q7zaqix87k8ci1fr9lkx1xr9m5zjniziydhi00x2";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.94";
version = "4.19.95";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0rvlz94mjl7ygpmhz0yn2whx9dq9fmy0w1472bj16hkwbaki0an6";
sha256 = "1c2g5wcf4zgy5q51qrf0s4hf3pr1j8gi8gn27w8cafn1xqrcmvaa";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.208";
version = "4.4.209";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "03jj91z5dc0ybpjy9w6aanb3k53gcj7gsjc32h3ldf72hlmgz6aq";
sha256 = "0m94795grq3sbj7jlmwc0ncq3vap9lf1z00sdiys17kjs3bcfbnh";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.208";
version = "4.9.209";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0njjw1i8dilihn1hz62zra4b9y05fb3r2k2sqlkd0wfn86c1rbdp";
sha256 = "1qarm90l1r4y68v5swhf81z6v6gspa8sw9jab3fxrz8mz6zdan02";
};
} // (args.argsOverride or {}))

18
pkgs/os-specific/linux/kernel/linux-5.3.nix
View File

@ -1,18 +0,0 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
buildLinux (args // rec {
version = "5.3.18";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "133342nv9ddjad2rizmcbilg9rhg339sfqr9l77j4cgkqhblkw90";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.4.10";
version = "5.4.11";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1p9f0h9fl1xy13dag1x7j2ic8kdv0zsp42c8baxn7cz3llc04g7j";
sha256 = "0b6pamnhyzf4n6sl8lxcnllrn41xmbldipfca23j1n71spjkdgb2";
};
} // (args.argsOverride or {}))

2
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "17185";
rev = "17192";
sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789";
}
, ...

4
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.5-rc3";
version = "5.5-rc5";
extraMeta.branch = "5.5";
# modDirVersion needs to be x.y.z, will always add .0
@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1rf394d1d6c0mvf6006gq1bscq3jjcvj9xxmdwallfwpp9igs8id";
sha256 = "0h5ks0c0pdl0awiysqja6ky5ykhjcdicc01wi01wzhjklq9j0lmq";
};
# Should the testing kernels ever be built on Hydra?

22
pkgs/os-specific/linux/rfkill/udev.nix
View File

@ -8,18 +8,18 @@
# udev.packages = [ pkgs.rfkill_udev ];
#
# Add a hook script in the managed etc directory, e.g.:
# etc = [
# { source = pkgs.writeScript "rtfkill.hook" ''
# #!${pkgs.runtimeShell}
# etc."rfkill.hook" = {
# mode = "0755";
# text = ''
# #!${pkgs.runtimeShell}
#
# if [ "$RFKILL_STATE" -eq "1" ]; then
# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on
# else
# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-off
# fi
# '';
# target = "rfkill.hook";
# }
# if [ "$RFKILL_STATE" -eq "1" ]; then
# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on
# else
# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-off
# fi
# '';
# }
# Note: this package does not need the binaries
# in the rfkill package.

4
pkgs/servers/dante/default.nix
View File

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ];
configureFlags = ["--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}"];
configureFlags = if !stdenv.isDarwin
then [ "--with-libc=libc.so.6" ]
else [ "--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}" ];
dontAddDisableDepTrack = stdenv.isDarwin;

74
pkgs/servers/rippled/default.nix
View File

@ -1,34 +1,28 @@
{ stdenv, fetchFromGitHub, fetchgit, fetchurl, git, cmake, pkgconfig
{ stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkgconfig
, openssl, boost, zlib }:
let
sqlite3 = fetchurl {
sqlite3 = fetchurl rec {
url = "https://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip";
sha256 = "0vh9aa5dyvdwsyd8yp88ss300mv2c2m40z79z569lcxa6fqwlpfy";
};
beast = fetchgit {
url = "https://github.com/boostorg/beast.git";
rev = "2f9a8440c2432d8a196571d6300404cb76314125";
sha256 = "1n9ms5cn67b0p0mhldz5psgylds22sm5x22q7knrsf20856vlk5a";
fetchSubmodules = false;
leaveDotGit = true;
passthru.url = url;
};
docca = fetchgit {
url = "https://github.com/vinniefalco/docca.git";
rev = "335dbf9c3613e997ed56d540cc8c5ff2e28cab2d";
sha256 = "09cb90k0ygmnlpidybv6nzf6is51i80lnwlvad6ijc3gf1z6i1yh";
fetchSubmodules = false;
sha256 = "1yisdg7q2p9q9gz0c446796p3ggx9s4d6g8w4j1pjff55655805h";
leaveDotGit = true;
fetchSubmodules = false;
};
rocksdb = fetchgit {
rocksdb = fetchgit rec {
url = "https://github.com/facebook/rocksdb.git";
rev = "a297643f2e327a8bc7061bfc838fdf11935a2cf2";
sha256 = "00z8i4fwr27j9d4ymnls7rcgfvm6xh36a4hy2m2njx4x513pgyzw";
fetchSubmodules = false;
rev = "v5.17.2";
sha256 = "0d9ssggjls1hc4zhng65yg8slqlcw0lr23qr6f39shg42lzr227p";
leaveDotGit = true;
fetchSubmodules = false;
postFetch = "cd $out && git tag ${rev}";
};
lz4 = fetchgit rec {
@ -51,8 +45,8 @@ let
soci = fetchgit {
url = "https://github.com/SOCI/soci.git";
rev = "3a1f602b3021b925d38828e3ff95f9e7f8887ff7";
sha256 = "0lnps42cidlrn43h13b9yc8cs3fwgz7wb6a1kfc9rnw7swkh757f";
rev = "04e1870294918d20761736743bb6136314c42dd5";
sha256 = "0w3b7qi3bwn8bxh4qbqy6c1fw2bbwh7pxvk8b3qb6h4qgsh6kx89";
leaveDotGit = true;
fetchSubmodules = false;
};
@ -67,11 +61,11 @@ let
};
nudb = fetchgit rec {
url = "https://github.com/vinniefalco/NuDB.git";
rev = "1.0.0";
sha256 = "142bxicv25xaw4fmpw8bbblb1grdw30wyj181xl4a5734zw3qgmz";
url = "https://github.com/CPPAlliance/NuDB.git";
rev = "2.0.1";
sha256 = "0h7hmwavrxzj1v547h3z0031ckwphjayfpv1mgcr6q86wm9p5468";
leaveDotGit = true;
fetchSubmodules = false;
fetchSubmodules = true; # submodules are needed, rocksdb is dependency
postFetch = "cd $out && git tag ${rev}";
};
@ -88,40 +82,54 @@ let
url = "https://github.com/google/googletest.git";
rev = "c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2";
sha256 = "0pj5b6jnrj5lrccz2disr8hklbnzd8hwmrwbfqmvhiwb9q9p0k2k";
leaveDotGit = true;
fetchSubmodules = false;
leaveDotGit = true;
};
google-benchmark = fetchgit {
url = "https://github.com/google/benchmark.git";
rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8";
sha256 = "0qg70j47zqnrbszlgrzmxpr4g88kq0gyq6v16bhaggfm83c6mg6i";
leaveDotGit = true;
fetchSubmodules = false;
leaveDotGit = true;
};
# hack to merge rocksdb revisions from rocksdb and nudb, so build process
# will find both
rocksdb-merged = runCommand "rocksdb-merged" {
buildInputs = [ git ];
} ''
commit=$(cd ${nudb} && git ls-tree HEAD extras/rocksdb | awk '{ print $3 }')
git clone ${rocksdb} $out && cd $out
git fetch ${nudb}/extras/rocksdb $commit
git checkout $commit
'';
in stdenv.mkDerivation rec {
pname = "rippled";
version = "1.2.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "ripple";
repo = "rippled";
rev = version;
sha256 = "1lm0zzz0hi2sh2f4iqq3scapzdjbxcjgr700fgham9wqgaj2ash5";
sha256 = "1z04378bg8lcyrnn7sl3j2zfxbwwy2biasg1d4fbaq4snxg5d1pq";
};
hardeningDisable = ["format"];
cmakeFlags = ["-Dstatic=OFF"];
cmakeFlags = [
"-Dstatic=OFF"
"-DBOOST_LIBRARYDIR=${boost.out}/lib"
"-DBOOST_INCLUDEDIR=${boost.dev}/include"
];
nativeBuildInputs = [ pkgconfig cmake git ];
buildInputs = [ openssl openssl.dev boost zlib ];
buildInputs = [ openssl openssl.dev zlib ];
preConfigure = ''
export HOME=$PWD
git config --global url."file://${beast}".insteadOf "https://github.com/vinniefalco/Beast.git"
git config --global url."file://${docca}".insteadOf "https://github.com/vinniefalco/docca.git"
git config --global url."file://${rocksdb}".insteadOf "https://github.com/facebook/rocksdb.git"
git config --global url."file://${docca}".insteadOf "${docca.url}"
git config --global url."file://${rocksdb-merged}".insteadOf "${rocksdb.url}"
git config --global url."file://${lz4}".insteadOf "${lz4.url}"
git config --global url."file://${libarchive}".insteadOf "${libarchive.url}"
git config --global url."file://${soci}".insteadOf "${soci.url}"
@ -131,7 +139,7 @@ in stdenv.mkDerivation rec {
git config --global url."file://${google-benchmark}".insteadOf "${google-benchmark.url}"
git config --global url."file://${google-test}".insteadOf "${google-test.url}"
substituteInPlace CMakeLists.txt --replace "URL https://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "URL ${sqlite3}"
substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}"
'';
doCheck = true;
@ -141,7 +149,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Ripple P2P payment network reference server";
homepage = https://ripple.com;
homepage = https://github.com/ripple/rippled;
maintainers = with maintainers; [ ehmry offline ];
license = licenses.isc;
platforms = [ "x86_64-linux" ];

4
pkgs/servers/web-apps/moodle/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, writeText }:
let
version = "3.8";
version = "3.8.1";
stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
in
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "00ssx0drgp1fy062x6alp0x8di7hjn4xc87v8skpy3aznchfxyk9";
sha256 = "1xz2wq16blw9p2b6wlrn9lr524gddm5jyac5prka8kp6lrk0v0y1";
};
phpConfig = writeText "config.php" ''

23
pkgs/tools/misc/broot/default.nix
View File

@ -1,17 +1,32 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
{ stdenv, rustPlatform, fetchFromGitHub, coreutils, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "0.10.2";
version = "0.11.8";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "1wisqb4cqdgsnjvmpgxbzs9zcw6npqw1kqxxs8mn33sxlikhbf2l";
sha256 = "1pbjlfwv4s50s731ryrcc54200g2i04acdxrxk4kpcvi6b19kbky";
};
cargoSha256 = "09gnyj97akychin1axp9kcww3c04xx7x1qnplhs2yxfki62r4y2b";
cargoSha256 = "07ncclp4yqqr2lncw4bbcmknm09qzmdcq8iwkhyyfiy3fpyw9hqc";
nativeBuildInputs = [ installShellFiles ];
postPatch = ''
substituteInPlace src/verb_store.rs --replace '"/bin/' '"${coreutils}/bin/'
'';
postInstall = ''
# install shell completion files
OUT_DIR=target/release/build/broot-*/out
installShellCompletion --bash $OUT_DIR/{br,broot}.bash
installShellCompletion --fish $OUT_DIR/{br,broot}.fish
installShellCompletion --zsh $OUT_DIR/{_br,_broot}
'';
meta = with stdenv.lib; {
description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands";

2
pkgs/tools/networking/axel/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
description = "Console downloading program with some features for parallel connections for faster downloading";
homepage = "https://github.com/axel-download-accelerator/axel";
maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux;
platforms = with platforms; unix;
license = licenses.gpl2;
};
}

32
pkgs/tools/security/fido2luks/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv
, rustPlatform
, fetchFromGitHub
, cryptsetup
, pkg-config
}:
rustPlatform.buildRustPackage rec {
pname = "fido2luks";
version = "0.2.2";
src = fetchFromGitHub {
owner = "shimunn";
repo = pname;
rev = version;
sha256 = "018qzbgmgm0f0d0c7i54nqqjbr4k5mzy1xfavi6hpifjll971wci";
};
buildInputs = [ cryptsetup ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "1kf757wxxk5h8dfbz588qw1pnyjbg5qzr7rz14i7x8rhmn5xwb74";
verifyCargoDeps = true;
meta = with stdenv.lib; {
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
homepage = "https://github.com/shimunn/fido2luks";
license = licenses.gpl3;
maintainers = with maintainers; [ prusnak mmahut ];
platforms = platforms.linux;
};
}

4
pkgs/tools/security/jwt-cli/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "jwt-cli";
@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "005y92acsn5j490jkp23ny7bsjd9ql1glybmbh4cyc8b15hmy618";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
meta = with stdenv.lib; {
description = "Super fast CLI tool to decode and encode JWTs";
homepage = "https://github.com/mike-engel/jwt-cli";

30
pkgs/top-level/all-packages.nix
View File

@ -1862,7 +1862,9 @@ in
jotta-cli = callPackage ../applications/misc/jotta-cli { };
jwt-cli = callPackage ../tools/security/jwt-cli { };
jwt-cli = callPackage ../tools/security/jwt-cli {
inherit (darwin.apple_sdk.frameworks) Security;
};
kapacitor = callPackage ../servers/monitoring/kapacitor { };
@ -3238,6 +3240,8 @@ in
flux = callPackage ../development/compilers/flux { };
fido2luks = callPackage ../tools/security/fido2luks {};
fierce = callPackage ../tools/security/fierce { };
figlet = callPackage ../tools/misc/figlet { };
@ -10485,6 +10489,8 @@ in
rman = callPackage ../development/tools/misc/rman { };
rnix-lsp = callPackage ../development/tools/rnix-lsp { };
rolespec = callPackage ../development/tools/misc/rolespec { };
rr = callPackage ../development/tools/analysis/rr { };
@ -10774,6 +10780,8 @@ in
alure = callPackage ../development/libraries/alure { };
alure2 = callPackage ../development/libraries/alure2 { };
agg = callPackage ../development/libraries/agg { };
allegro = allegro4;
@ -11057,9 +11065,8 @@ in
cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { };
cpp-netlib = callPackage ../development/libraries/cpp-netlib {
openssl = openssl_1_0_2;
};
cpp-netlib = callPackage ../development/libraries/cpp-netlib {};
uri = callPackage ../development/libraries/uri { };
cppcms = callPackage ../development/libraries/cppcms { };
@ -15670,7 +15677,9 @@ in
libtool = darwin.cctools;
};
rippled = callPackage ../servers/rippled { };
rippled = callPackage ../servers/rippled {
boost = boost17x;
};
rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix {
boost = boost167.override {
@ -16342,14 +16351,6 @@ in
];
};
linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.export_kernel_fpu_functions."5.3"
];
};
linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@ -16572,7 +16573,6 @@ in
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_5_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_3);
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
# When adding to this list:
@ -23022,6 +23022,8 @@ in
megaglest = callPackage ../games/megaglest {};
mindustry = callPackage ../games/mindustry { };
minecraft = callPackage ../games/minecraft { };
minecraft-server = callPackage ../games/minecraft-server { };

2
pkgs/top-level/python-packages.nix
View File

@ -2652,6 +2652,8 @@ in {
gpsoauth = callPackage ../development/python-modules/gpsoauth { };
gpxpy = callPackage ../development/python-modules/gpxpy { };
grip = callPackage ../development/python-modules/grip { };
gst-python = callPackage ../development/python-modules/gst-python {

1
pkgs/top-level/release-small.nix
View File

@ -156,7 +156,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
time = linux;
tinycc = linux;
udev = linux;
unar = linux;
unzip = all;
usbutils = linux;
utillinux = linux;

1
pkgs/top-level/release.nix
View File

@ -105,7 +105,6 @@ let
jobs.nix-info-tested.x86_64-linux
# Ensure that X11/GTK are in order.
jobs.thunderbird.x86_64-linux
jobs.unar.x86_64-linux
jobs.cachix.x86_64-linux
/*