mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 04:31:52 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a68e0fdca5
|
|
@ -24,7 +24,7 @@
|
|||
</section>
|
||||
<section xml:id="sec-release-22.05-incompatibilities">
|
||||
<title>Backward Incompatibilities</title>
|
||||
<itemizedlist spacing="compact">
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.ghc</literal> now refers to
|
||||
|
|
@ -46,6 +46,17 @@
|
|||
<literal>haskellPackages.callPackage</literal>).
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.emacsPackages.orgPackages</literal> is removed
|
||||
because org elpa is deprecated. The packages in the top level
|
||||
of <literal>pkgs.emacsPackages</literal>, such as org and
|
||||
org-contrib, refer to the ones in
|
||||
<literal>pkgs.emacsPackages.elpaPackages</literal> and
|
||||
<literal>pkgs.emacsPackages.nongnuPackages</literal> where the
|
||||
new versions will release.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
|
|
|
|||
|
|
@ -22,4 +22,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
instead to ensure cross compilation keeps working (or switch to
|
||||
`haskellPackages.callPackage`).
|
||||
|
||||
* `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated.
|
||||
The packages in the top level of `pkgs.emacsPackages`, such as org and
|
||||
org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
|
||||
`pkgs.emacsPackages.nongnuPackages` where the new versions will release.
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ class Logger:
|
|||
yield
|
||||
self.drain_log_queue()
|
||||
toc = time.time()
|
||||
self.log("({:.2f} seconds)".format(toc - tic))
|
||||
self.log("(finished: {}, in {:.2f} seconds)".format(message, toc - tic))
|
||||
|
||||
self.xml.endElement("nest")
|
||||
|
||||
|
|
@ -490,23 +490,24 @@ class Machine:
|
|||
return rootlog.nested(msg, my_attrs)
|
||||
|
||||
def wait_for_monitor_prompt(self) -> str:
|
||||
assert self.monitor is not None
|
||||
answer = ""
|
||||
while True:
|
||||
undecoded_answer = self.monitor.recv(1024)
|
||||
if not undecoded_answer:
|
||||
break
|
||||
answer += undecoded_answer.decode()
|
||||
if answer.endswith("(qemu) "):
|
||||
break
|
||||
return answer
|
||||
with self.nested("waiting for monitor prompt"):
|
||||
assert self.monitor is not None
|
||||
answer = ""
|
||||
while True:
|
||||
undecoded_answer = self.monitor.recv(1024)
|
||||
if not undecoded_answer:
|
||||
break
|
||||
answer += undecoded_answer.decode()
|
||||
if answer.endswith("(qemu) "):
|
||||
break
|
||||
return answer
|
||||
|
||||
def send_monitor_command(self, command: str) -> str:
|
||||
message = ("{}\n".format(command)).encode()
|
||||
self.log("sending monitor command: {}".format(command))
|
||||
assert self.monitor is not None
|
||||
self.monitor.send(message)
|
||||
return self.wait_for_monitor_prompt()
|
||||
with self.nested("sending monitor command: {}".format(command)):
|
||||
message = ("{}\n".format(command)).encode()
|
||||
assert self.monitor is not None
|
||||
self.monitor.send(message)
|
||||
return self.wait_for_monitor_prompt()
|
||||
|
||||
def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None:
|
||||
"""Wait for a systemd unit to get into "active" state.
|
||||
|
|
@ -533,7 +534,12 @@ class Machine:
|
|||
|
||||
return state == "active"
|
||||
|
||||
retry(check_active)
|
||||
with self.nested(
|
||||
"waiting for unit {}{}".format(
|
||||
unit, f" with user {user}" if user is not None else ""
|
||||
)
|
||||
):
|
||||
retry(check_active)
|
||||
|
||||
def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]:
|
||||
status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user)
|
||||
|
|
@ -757,7 +763,8 @@ class Machine:
|
|||
status, _ = self.execute("nc -z localhost {}".format(port))
|
||||
return status != 0
|
||||
|
||||
retry(port_is_closed)
|
||||
with self.nested("waiting for TCP port {} to be closed"):
|
||||
retry(port_is_closed)
|
||||
|
||||
def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]:
|
||||
return self.systemctl("start {}".format(jobname), user)
|
||||
|
|
@ -891,20 +898,20 @@ class Machine:
|
|||
retry(screen_matches)
|
||||
|
||||
def wait_for_console_text(self, regex: str) -> None:
|
||||
self.log("waiting for {} to appear on console".format(regex))
|
||||
# Buffer the console output, this is needed
|
||||
# to match multiline regexes.
|
||||
console = io.StringIO()
|
||||
while True:
|
||||
try:
|
||||
console.write(self.last_lines.get())
|
||||
except queue.Empty:
|
||||
self.sleep(1)
|
||||
continue
|
||||
console.seek(0)
|
||||
matches = re.search(regex, console.read())
|
||||
if matches is not None:
|
||||
return
|
||||
with self.nested("waiting for {} to appear on console".format(regex)):
|
||||
# Buffer the console output, this is needed
|
||||
# to match multiline regexes.
|
||||
console = io.StringIO()
|
||||
while True:
|
||||
try:
|
||||
console.write(self.last_lines.get())
|
||||
except queue.Empty:
|
||||
self.sleep(1)
|
||||
continue
|
||||
console.seek(0)
|
||||
matches = re.search(regex, console.read())
|
||||
if matches is not None:
|
||||
return
|
||||
|
||||
def send_key(self, key: str) -> None:
|
||||
key = CHAR_TO_KEY.get(key, key)
|
||||
|
|
@ -1019,7 +1026,7 @@ class Machine:
|
|||
)
|
||||
return any(pattern.search(name) for name in names)
|
||||
|
||||
with self.nested("Waiting for a window to appear"):
|
||||
with self.nested("waiting for a window to appear"):
|
||||
retry(window_is_visible)
|
||||
|
||||
def sleep(self, secs: int) -> None:
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
/*
|
||||
|
||||
# Updating
|
||||
|
||||
To update the list of packages from Org (ELPA),
|
||||
|
||||
1. Run `./update-org`.
|
||||
2. Check for evaluation errors:
|
||||
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages
|
||||
3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix`
|
||||
|
||||
*/
|
||||
|
||||
{ lib }:
|
||||
|
||||
self: let
|
||||
|
||||
generateOrg = lib.makeOverridable ({
|
||||
generated ? ./org-generated.nix
|
||||
}: let
|
||||
|
||||
imported = import generated {
|
||||
inherit (self) callPackage;
|
||||
};
|
||||
|
||||
super = imported;
|
||||
|
||||
overrides = {
|
||||
};
|
||||
|
||||
in super // overrides);
|
||||
|
||||
in generateOrg { }
|
||||
|
|
@ -11,10 +11,6 @@ curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/
|
|||
nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace
|
||||
git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix
|
||||
|
||||
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix
|
||||
nix-instantiate ../../../../../ -A emacs.pkgs.orgPackages --show-trace
|
||||
git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix
|
||||
|
||||
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json
|
||||
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages
|
||||
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell --show-trace ./emacs2nix.nix -i bash
|
||||
|
||||
exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix
|
||||
|
|
@ -1,17 +1,21 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule, makeWrapper }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeval";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "instrumenta";
|
||||
repo = "kubeval";
|
||||
rev = version;
|
||||
sha256 = "sha256-c5UESyWK1rfnD0etOuIroBUSqZQuu57jio7/ArItMP0=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-SqYNAUYPUJYmHj4cFEYqQ8hEkYWmmpav9AGOSFDc/M4=";
|
||||
vendorSha256 = "sha256-OAFxEb7IWhyRBEi8vgmekDSL/YpmD4EmUfildRaPR24=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -259,6 +259,15 @@
|
|||
"vendorSha256": "1i5ph7p4pj5ph9rkynii50n3npjprrcsmd15i430wpyjxvsjnw8c",
|
||||
"version": "3.6.0"
|
||||
},
|
||||
"dhall": {
|
||||
"owner": "awakesecurity",
|
||||
"provider-source-address": "registry.terraform.io/awakesecurity/dhall",
|
||||
"repo": "terraform-provider-dhall",
|
||||
"rev": "v0.0.1",
|
||||
"sha256": "1cymabpa03a5avf0j6jj2mpnc62ap9b82zmpsgzwdjrb3mf954fa",
|
||||
"vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n",
|
||||
"version": "0.0.1"
|
||||
},
|
||||
"digitalocean": {
|
||||
"owner": "digitalocean",
|
||||
"provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
|
||||
|
|
@ -371,10 +380,10 @@
|
|||
"owner": "integrations",
|
||||
"provider-source-address": "registry.terraform.io/integrations/github",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v4.18.0",
|
||||
"sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp",
|
||||
"rev": "v4.18.2",
|
||||
"sha256": "1m4ddj4bm84ljrkg8i98gdgbf5c89chv3yz13xbmyl2iga2x5bf7",
|
||||
"vendorSha256": null,
|
||||
"version": "4.18.0"
|
||||
"version": "4.18.2"
|
||||
},
|
||||
"gitlab": {
|
||||
"owner": "gitlabhq",
|
||||
|
|
@ -572,10 +581,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.6.1",
|
||||
"sha256": "164x0ddgqk3bj0za4h9kz69npgr4cw7w5hnl0pmxsgvsb04vwc0g",
|
||||
"rev": "v2.7.0",
|
||||
"sha256": "07rqk60k87dff2wgg72ar7sdg99hd210k8afvvz9xh1arj63ixxi",
|
||||
"vendorSha256": null,
|
||||
"version": "2.6.1"
|
||||
"version": "2.7.0"
|
||||
},
|
||||
"launchdarkly": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -699,10 +708,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/nomad",
|
||||
"repo": "terraform-provider-nomad",
|
||||
"rev": "v1.4.15",
|
||||
"sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1",
|
||||
"vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb",
|
||||
"version": "1.4.15"
|
||||
"rev": "v1.4.16",
|
||||
"sha256": "11pw1ss4rk8hmfk0q9n8nim441ig0cgl1qxsjzcfsznkp5bb11rw",
|
||||
"vendorSha256": "0b813dnkn15sdgvi4lh1l5fppgivzrcv5w56w0yf98vyy8wq7p0j",
|
||||
"version": "1.4.16"
|
||||
},
|
||||
"ns1": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -1120,10 +1129,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/vault",
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.0.0",
|
||||
"sha256": "0k6wwkjxj9ywv16713k6r3ybni9041jx0y0ma7ygcxwk3mciac1z",
|
||||
"rev": "v3.0.1",
|
||||
"sha256": "0ppx8kc4zf0yp09vbkmj875sqvklbx0p8a1ganpzdm3462zskra4",
|
||||
"vendorSha256": "03l8bk9jsqf4c7gv0hs1rli7wmlcvpdxmxhra9vndnz6g0jvkvyx",
|
||||
"version": "3.0.0"
|
||||
"version": "3.0.1"
|
||||
},
|
||||
"vcd": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Real-time 3D simulation of space";
|
||||
changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,15 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub, pyyaml }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
version = "0.2.0pre-2021-05-18";
|
||||
version = "0.1.8";
|
||||
pname = "podman-compose";
|
||||
|
||||
# "This project is still under development." -- README.md
|
||||
#
|
||||
# As of May 2021, the latest release (0.1.5) has fewer than half of all
|
||||
# commits. This project seems to have no release management, so the last
|
||||
# commit is the best one until proven otherwise.
|
||||
src = fetchFromGitHub {
|
||||
repo = "podman-compose";
|
||||
owner = "containers";
|
||||
rev = "62d2024feecf312e9591cc145f49cee9c70ab4fe";
|
||||
sha256 = "17992imkvi6129wvajsp0iz5iicfmh53i20qy2mzz17kcz30r2pp";
|
||||
rev = version;
|
||||
sha256 = "sha256-BN6rG46ejYY6UCNjKYQpxPQGTW3x12zpGDnH2SKn304=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyyaml ];
|
||||
|
|
@ -21,7 +17,7 @@ buildPythonApplication rec {
|
|||
meta = {
|
||||
description = "An implementation of docker-compose with podman backend";
|
||||
homepage = "https://github.com/containers/podman-compose";
|
||||
license = lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -228,8 +228,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
|
||||
postInstall = ''
|
||||
cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings
|
||||
chmod a+x -- $out/libexec/emit-kvm-warnings
|
||||
install -m755 -D $emitKvmWarningsPath $out/libexec/emit-kvm-warnings
|
||||
if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then
|
||||
makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \
|
||||
$out/bin/qemu-kvm \
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i3";
|
||||
version = "4.20";
|
||||
version = "4.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-jPTxdPbPVU84VjOAaBq+JYaOmVWIN5HgmG7NicU6wyI=";
|
||||
sha256 = "1rpwdgykcvmrmdz244f0wm7446ih1dcw8rlc1hm1c7cc42pyrq93";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gtk";
|
||||
version = "20201129";
|
||||
version = "20211130";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-lAlHRVB/P3A1qWsXQZPZ3uhgctR4FLa+ocUrsbleXJU=";
|
||||
sha256 = "0n6djx346bzk558yd9nk0r6hqszcbkj0h1pv2n8n15ps2j9lyvw8";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -252,18 +252,18 @@ let
|
|||
|
||||
in {
|
||||
ruby_2_7 = generic {
|
||||
version = rubyVersion "2" "7" "4" "";
|
||||
version = rubyVersion "2" "7" "5" "";
|
||||
sha256 = {
|
||||
src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh";
|
||||
git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p";
|
||||
src = "1wc1hwmz4m6iqlmqag8liyld917p6a8dvnhnpd1v8d8jl80bjm97";
|
||||
git = "16565fyl7141hr6q6d74myhsz46lvgam8ifnacshi68vzibwjbbh";
|
||||
};
|
||||
};
|
||||
|
||||
ruby_3_0 = generic {
|
||||
version = rubyVersion "3" "0" "2" "";
|
||||
version = rubyVersion "3" "0" "3" "";
|
||||
sha256 = {
|
||||
src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah";
|
||||
git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r";
|
||||
src = "1b4j39zyyvdkf1ax2c6qfa40b4mxfkr87zghhw19fmnzn8f8d1im";
|
||||
git = "1q19w5i1jkfxn7qq6f9v9ngax9h52gxwijk7hp312dx6amwrkaim";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
|
||||
|
||||
{
|
||||
"2.7.4" = ops useRailsExpress [
|
||||
"2.7.5" = ops useRailsExpress [
|
||||
"${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
|
||||
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
|
||||
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
|
||||
];
|
||||
"3.0.2" = ops useRailsExpress [
|
||||
"3.0.3" = ops useRailsExpress [
|
||||
"${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
|
||||
"${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ stdenv.mkDerivation {
|
|||
badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
|
||||
++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"
|
||||
++ optionals (versionOlder version "1.73") lib.platforms.riscv;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
};
|
||||
|
||||
preConfigure = optionalString useMpi ''
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.xbreak ];
|
||||
maintainers = with maintainers; [ xbreak hjones2199 ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudsplaining";
|
||||
version = "0.4.6";
|
||||
version = "0.4.8";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "salesforce";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-TFUOsfQ1QxdpmRUJPoHMCuCpmYpQodLkP5EVXKm+qsw=";
|
||||
sha256 = "sha256-t1eSPa1KqzUB2xYGkU10lVIZQ3CcIHiZZtTa0j2TUGc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "md-toc";
|
||||
version = "8.0.1";
|
||||
version = "8.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "frnmst";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-nh9KxjwF+O4n0qVo9yPP6fvKB5XFICh+Ak6oD2fQVdk=";
|
||||
sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -28,11 +28,6 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "fpyutils>=2.0,<2.1" "fpyutils>=2.0,<3"
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
"md_toc/tests/*.py"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.20.12";
|
||||
version = "1.20.17";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-J0EqIMSQEvev8sZ1XLgxPD68xlgPtlRTW/yBPyrekFQ=";
|
||||
sha256 = "sha256-7Zw8NxOEXDRmLChxHQXVU/HzR8z6HuLxX8bB3pZuCqc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
60
pkgs/development/python-modules/open-meteo/default.nix
Normal file
60
pkgs/development/python-modules/open-meteo/default.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "open-meteo";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-open-meteo";
|
||||
rev = "v${version}";
|
||||
sha256 = "tuAuY43HRz8zFTOhsm4TxSppP4CYTGPqQndDMxW3URs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
aresponses
|
||||
pydantic
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream doesn't set a version for the pyproject.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "0.0.0" "${version}" \
|
||||
--replace "--cov" "" \
|
||||
--replace 'aiohttp = "^3.8.1"' 'aiohttp = "^3.8.0"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"open_meteo"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for the Open-Meteo API";
|
||||
homepage = "https://github.com/frenck/python-open-meteo";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,47 +1,47 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, aspy-yaml
|
||||
, cached-property
|
||||
, cfgv
|
||||
, fetchPypi
|
||||
, identify
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, nodeenv
|
||||
, python
|
||||
, six
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, toml
|
||||
, virtualenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pre-commit";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "pre_commit";
|
||||
sha256 = "sha256-PCWt1429+2ooplF4DVwxGsQN0X8WDrOVSgxZ2kClBac=";
|
||||
sha256 = "sha256-/piXysgwqnFk29AqTnuQyuSWMEUc6IRkvKc9tIa6n2U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch
|
||||
./languages-use-the-hardcoded-path-to-python-binaries.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aspy-yaml
|
||||
cached-property
|
||||
cfgv
|
||||
identify
|
||||
nodeenv
|
||||
six
|
||||
pyyaml
|
||||
toml
|
||||
virtualenv
|
||||
] ++ lib.optional (pythonOlder "3.8") importlib-metadata
|
||||
++ lib.optional (pythonOlder "3.7") importlib-resources;
|
||||
] ++ lib.optional (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ lib.optional (pythonOlder "3.7") [
|
||||
importlib-resources
|
||||
];
|
||||
|
||||
# slow and impure
|
||||
doCheck = false;
|
||||
|
|
@ -55,7 +55,9 @@ buildPythonPackage rec {
|
|||
--subst-var-by nodeenv ${nodeenv}
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pre_commit" ];
|
||||
pythonImportsCheck = [
|
||||
"pre_commit"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A framework for managing and maintaining multi-language pre-commit hooks";
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
|
||||
index 299144e..6d12543 100755
|
||||
--- a/pre_commit/resources/hook-tmpl
|
||||
+++ b/pre_commit/resources/hook-tmpl
|
||||
@@ -25,8 +25,8 @@ ARGS.append('--')
|
||||
ARGS.extend(sys.argv[1:])
|
||||
|
||||
DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?'
|
||||
-if os.access(INSTALL_PYTHON, os.X_OK):
|
||||
- CMD = [INSTALL_PYTHON, '-mpre_commit']
|
||||
+if os.access('@pre-commit@/bin/pre-commit', os.X_OK):
|
||||
+ CMD = ['@pre-commit@/bin/pre-commit']
|
||||
elif which('pre-commit'):
|
||||
CMD = ['pre-commit']
|
||||
else:
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
, fetchzip
|
||||
, cmake
|
||||
, boost
|
||||
, catch
|
||||
, catch2
|
||||
, inchi
|
||||
, cairo
|
||||
, eigen
|
||||
|
|
@ -75,7 +75,7 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [
|
||||
boost
|
||||
catch
|
||||
catch2
|
||||
inchi
|
||||
eigen
|
||||
cairo
|
||||
|
|
@ -107,7 +107,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCATCH_DIR=${catch}/include/catch"
|
||||
"-DCATCH_DIR=${catch2}/include/catch2"
|
||||
"-DINCHI_LIBRARY=${inchi}/lib/libinchi.so"
|
||||
"-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so"
|
||||
"-DINCHI_INCLUDE_DIR=${inchi}/include/inchi"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tailscale";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "frenck";
|
||||
repo = "python-tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jqx2i8rghfxlb1c76f37viz9fc1vq95xb2jm3bpnx5yy4n5dly1";
|
||||
sha256 = "sha256-0qWuOSQncEldA073ByFWkpW97HY0JANSvnv8xX/NSs8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -54,7 +54,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Python client for the Tailscale API";
|
||||
homepage = "https://github.com/frenck/python-wled";
|
||||
homepage = "https://github.com/frenck/python-tailscale";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitterapi";
|
||||
version = "2.7.7";
|
||||
version = "2.7.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geduldig";
|
||||
repo = "TwitterAPI";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KEJ0lAg6Zi2vps+ZPTkT6ts87qnIBL9pFe1tPEzviCI=";
|
||||
sha256 = "sha256-3Ho8iw//X+eB7B/Q9TJGeoxAYjUJ96qsI1T3WYqZOpM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vehicle";
|
||||
version = "0.2.0";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "frenck";
|
||||
repo = "python-vehicle";
|
||||
rev = "v${version}";
|
||||
sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg";
|
||||
sha256 = "sha256-3DkfS8gx3C1/Vj8+IE7uxZ5i0cKJk0mJpBWQqAgb2Xo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -54,7 +54,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Python client providing RDW vehicle information";
|
||||
homepage = "https://github.com/frenck/python-wled";
|
||||
homepage = "https://github.com/frenck/python-vehicle";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bunnyfetch";
|
||||
version = "unstable-2021-06-19";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rosettea";
|
||||
repo = "bunnyfetch";
|
||||
rev = "24370338b936bae1ebdefea73e8372ac0b4d2858";
|
||||
sha256 = "09wcffx6ak4djm2lrxq43n27p9qmczng4rf11qpwx3w4w67jvpz9";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6MnjCXc9/8twdf8PHKsVJY1yWYwUf5R01vtQFJbyy7M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1vv69y0x06kn99lw995sbkb7vgd0yb18flkr2ml8ss7q2yvz37vi";
|
||||
vendorSha256 = "sha256-w+O1dU8t7uNvdlFnYhCdJCDixpWWZAnj9GrtsCbu9SM=";
|
||||
|
||||
# No upstream tests
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zerotierone";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zerotier";
|
||||
repo = "ZeroTierOne";
|
||||
rev = version;
|
||||
sha256 = "sha256-668KZ2E0jx/s+w4pl+oJbPlfdRGr6ypP2/FoFEBReIk=";
|
||||
sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
25
pkgs/tools/text/csvdiff/default.nix
Normal file
25
pkgs/tools/text/csvdiff/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "csvdiff";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aswinkarthik";
|
||||
repo = "csvdiff";
|
||||
rev = "v${version}";
|
||||
sha256 = "0cd1ikxsypjqisfnmr7zix3g7x8p892w77086465chyd39gpk97b";
|
||||
};
|
||||
|
||||
vendorSha256 = "1612s4kc0r8zw5y2n6agwdx9kwhxkdrjzagn4g22lzmjq02a64xf";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://aswinkarthik.github.io/csvdiff/";
|
||||
description = "A fast diff tool for comparing csv files";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ turion ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2632,6 +2632,8 @@ with pkgs;
|
|||
|
||||
csv2odf = callPackage ../applications/office/csv2odf { };
|
||||
|
||||
csvdiff = callPackage ../tools/text/csvdiff { };
|
||||
|
||||
csview = callPackage ../tools/text/csview { };
|
||||
|
||||
csvkit = callPackage ../tools/text/csvkit { };
|
||||
|
|
|
|||
|
|
@ -45,10 +45,6 @@ let
|
|||
inherit lib pkgs;
|
||||
};
|
||||
|
||||
mkOrgPackages = { lib }: import ../applications/editors/emacs/elisp-packages/org-packages.nix {
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/manual-packages.nix {
|
||||
inherit lib pkgs;
|
||||
};
|
||||
|
|
@ -66,14 +62,12 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
|
|||
, nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self
|
||||
, melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
|
||||
, melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
|
||||
, orgPackages ? mkOrgPackages { inherit lib; } self
|
||||
, manualPackages ? mkManualPackages { inherit pkgs lib; } self
|
||||
}: ({}
|
||||
// elpaPackages // { inherit elpaPackages; }
|
||||
// nongnuPackages // { inherit nongnuPackages; }
|
||||
// melpaStablePackages // { inherit melpaStablePackages; }
|
||||
// melpaPackages // { inherit melpaPackages; }
|
||||
// orgPackages // { inherit orgPackages; }
|
||||
// manualPackages // { inherit manualPackages; }
|
||||
// {
|
||||
|
||||
|
|
|
|||
|
|
@ -5359,6 +5359,8 @@ in {
|
|||
|
||||
open-garage = callPackage ../development/python-modules/open-garage { };
|
||||
|
||||
open-meteo = callPackage ../development/python-modules/open-meteo { };
|
||||
|
||||
openant = callPackage ../development/python-modules/openant { };
|
||||
|
||||
openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue