mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 12:08:17 +03:00
Merge master into staging-next
This commit is contained in:
commit
ae265ec922
@ -23,7 +23,7 @@
|
||||
description = "Network manager applet";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
serviceConfig.ExecStart = "${pkgs.networkmanager-applet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
|
||||
serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
|
||||
};
|
||||
|
||||
services.dbus.packages = [ pkgs.gcr ];
|
||||
|
@ -136,7 +136,7 @@ in
|
||||
# session requirements
|
||||
cinnamon-screensaver
|
||||
# cinnamon-killer-daemon: provided by cinnamon-common
|
||||
networkmanager-applet # session requirement - also nm-applet not needed
|
||||
networkmanagerapplet # session requirement - also nm-applet not needed
|
||||
|
||||
# For a polkit authentication agent
|
||||
polkit_gnome
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upwork";
|
||||
version = "5.6.10.7";
|
||||
version = "5.6.10.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb";
|
||||
sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280";
|
||||
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb";
|
||||
sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2022.4.1";
|
||||
version = "2022.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I=";
|
||||
hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
@ -1,13 +1,13 @@
|
||||
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:
|
||||
let
|
||||
ver = "1.2.54.0";
|
||||
ver = "1.2.312.0";
|
||||
source =
|
||||
if stdenv.isDarwin then {
|
||||
url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";
|
||||
sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg=";
|
||||
sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9";
|
||||
} else {
|
||||
url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";
|
||||
sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM=";
|
||||
sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7";
|
||||
};
|
||||
archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";
|
||||
in
|
||||
|
@ -12,7 +12,7 @@
|
||||
, libnotify
|
||||
, libxml2
|
||||
, libxslt
|
||||
, networkmanager-applet
|
||||
, networkmanagerapplet
|
||||
, pkg-config
|
||||
, python3
|
||||
, wrapGAppsNoGuiHook
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'' + lib.optionalString withGui ''
|
||||
substituteInPlace src/firewall-applet.in \
|
||||
--replace "/usr/bin/nm-connection-editor" "${networkmanager-applet}/bin/nm-conenction-editor"
|
||||
--replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,7 +9,9 @@ mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
# Tag v8.0.7 used to point to this commit, but was re-tagged later to a state
|
||||
# that fails to link properly
|
||||
rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd";
|
||||
sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";
|
||||
};
|
||||
|
||||
|
@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
|
||||
# relax version constraints of some dependencies
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "clize==4.1.1" "clize" \
|
||||
--replace "bleach==3.1.5" "bleach>=3.1.5,<5" \
|
||||
--replace "bleach==3.1.5" "bleach>=3.1.5,<6" \
|
||||
--replace "bottle==0.12.18" "bottle>=0.12.18,<1" \
|
||||
--replace "Paste==3.4.3" "Paste>=3.4.3,<4"
|
||||
'';
|
||||
|
@ -42,7 +42,7 @@
|
||||
, modemmanager
|
||||
, mutter
|
||||
, networkmanager
|
||||
, networkmanager-applet
|
||||
, networkmanagerapplet
|
||||
, libnma-gtk4
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -76,9 +76,8 @@ stdenv.mkDerivation rec {
|
||||
src = ./paths.patch;
|
||||
gcm = gnome-color-manager;
|
||||
gnome_desktop = gnome-desktop;
|
||||
networkmanagerapplet = networkmanager-applet;
|
||||
inherit glibc libgnomekbd tzdata;
|
||||
inherit cups;
|
||||
inherit cups networkmanagerapplet;
|
||||
})
|
||||
|
||||
# Fix Online Accounts configuration on X11
|
||||
|
@ -379,7 +379,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30
|
||||
|
||||
networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanager-applet’ directly."; # added 2019-12-12
|
||||
networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12
|
||||
|
||||
glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
, granite
|
||||
, gtk3
|
||||
, networkmanager
|
||||
, networkmanager-applet
|
||||
, networkmanagerapplet
|
||||
, libnma
|
||||
, switchboard
|
||||
}:
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
networkmanagerapplet = networkmanager-applet;
|
||||
inherit networkmanagerapplet;
|
||||
})
|
||||
];
|
||||
|
||||
|
@ -1,94 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,
|
||||
pypy, libffi, libedit, libuv, boost, zlib,
|
||||
variant ? "jit", buildWithPypy ? false }:
|
||||
|
||||
let
|
||||
commit-count = "1364";
|
||||
common-flags = "--thread --gcrootfinder=shadowstack --continuation";
|
||||
variants = {
|
||||
jit = { flags = "--opt=jit"; target = "target.py"; };
|
||||
jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; };
|
||||
no-jit = { flags = ""; target = "target.py"; };
|
||||
no-jit-preload = { flags = ""; target = "target_preload.py"; };
|
||||
};
|
||||
pixie-src = fetchFromGitHub {
|
||||
owner = "pixie-lang";
|
||||
repo = "pixie";
|
||||
rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";
|
||||
sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";
|
||||
};
|
||||
pypy-tag = "91db1a9";
|
||||
pypy-src = fetchurl {
|
||||
name = "pypy-src-${pypy-tag}";
|
||||
url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";
|
||||
sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";
|
||||
};
|
||||
libs = [ libffi libedit libuv boost.dev boost.out zlib ];
|
||||
include-path = lib.concatStringsSep ":"
|
||||
(map (p: "${p}/include") libs);
|
||||
library-path = lib.concatStringsSep ":"
|
||||
(map (p: "${p}/lib") libs);
|
||||
bin-path = lib.concatStringsSep ":"
|
||||
(map (p: "${p}/bin") [ gcc ]);
|
||||
build = {flags, target}: stdenv.mkDerivation rec {
|
||||
pname = "pixie";
|
||||
version = "0-r${commit-count}-${variant}";
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
buildInputs = libs;
|
||||
PYTHON = if buildWithPypy
|
||||
then "${pypy}/pypy-c/pypy-c"
|
||||
else python2.interpreter;
|
||||
unpackPhase = ''
|
||||
cp -R ${pixie-src} pixie-src
|
||||
mkdir pypy-src
|
||||
(cd pypy-src
|
||||
tar --strip-components=1 -xjf ${pypy-src})
|
||||
chmod -R +w pypy-src pixie-src
|
||||
'';
|
||||
patchPhase = ''
|
||||
(cd pixie-src
|
||||
patch -p1 < ${./load_paths.patch}
|
||||
libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'
|
||||
export libraryPaths
|
||||
substituteAllInPlace ./pixie/ffi-infer.pxi)
|
||||
'';
|
||||
buildPhase = ''(
|
||||
PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH";
|
||||
RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";
|
||||
cd pixie-src
|
||||
$PYTHON $RPYTHON ${common-flags} ${target}
|
||||
find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;
|
||||
)'';
|
||||
LD_LIBRARY_PATH = library-path;
|
||||
C_INCLUDE_PATH = include-path;
|
||||
LIBRARY_PATH = library-path;
|
||||
PATH = bin-path;
|
||||
installPhase = ''
|
||||
mkdir -p $out/share $out/bin
|
||||
cp pixie-src/pixie-vm $out/share/pixie-vm
|
||||
cp -R pixie-src/pixie $out/share/pixie
|
||||
makeWrapper $out/share/pixie-vm $out/bin/pixie \
|
||||
--prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \
|
||||
--prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \
|
||||
--prefix LIBRARY_PATH : ${LIBRARY_PATH} \
|
||||
--prefix PATH : ${PATH}
|
||||
'';
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
RES=$(./pixie-src/pixie-vm -e "(print :ok)")
|
||||
if [ "$RES" != ":ok" ]; then
|
||||
echo "ERROR Unexpected output: '$RES'"
|
||||
return 1
|
||||
else
|
||||
echo "$RES"
|
||||
fi
|
||||
'';
|
||||
meta = {
|
||||
description = "A clojure-like lisp, built with the pypy vm toolkit";
|
||||
homepage = "https://github.com/pixie-lang/pixie";
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
|
||||
maintainers = with lib.maintainers; [ bendlas ];
|
||||
};
|
||||
};
|
||||
in build (builtins.getAttr variant variants)
|
@ -1,46 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, pixie, rlwrap
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dust";
|
||||
version = "0-91";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixie-lang";
|
||||
repo = "dust";
|
||||
rev = "efe469661e749a71e86858fd006f61464810575a";
|
||||
sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc";
|
||||
};
|
||||
|
||||
buildInputs = [ pixie ];
|
||||
|
||||
patches = [ ./make-paths-configurable.patch ];
|
||||
|
||||
configurePhase = ''
|
||||
pixiePath="${pixie}/bin/pixie" \
|
||||
basePath="$out/share/dust" \
|
||||
rlwrapPath="${rlwrap}/bin/rlwrap" \
|
||||
substituteAll dust.in dust
|
||||
chmod +x dust
|
||||
'';
|
||||
|
||||
# FIXME: AOT for dust
|
||||
# buildPhase = ''
|
||||
# find . -name "*.pxi" -exec pixie-vm -c {} \;
|
||||
# '';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/dust
|
||||
cp -a src/ run.pxi $out/share/dust
|
||||
mv dust $out/bin/dust
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
|
||||
homepage = src.meta.homepage;
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
@ -1,25 +0,0 @@
|
||||
diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi
|
||||
index 9f13ac7..74301c2 100644
|
||||
--- a/pixie/ffi-infer.pxi
|
||||
+++ b/pixie/ffi-infer.pxi
|
||||
@@ -1,15 +1,12 @@
|
||||
(ns pixie.ffi-infer
|
||||
(:require [pixie.io-blocking :as io]))
|
||||
|
||||
+(defn -add-library-path [p]
|
||||
+ (swap! load-paths conj (str p "/include"))
|
||||
+ (swap! load-paths conj (str p "/lib")))
|
||||
|
||||
-(defn -add-rel-path [rel]
|
||||
- (swap! load-paths conj (str (first @load-paths) "/" rel)))
|
||||
-
|
||||
-(-add-rel-path "lib")
|
||||
-(-add-rel-path "include")
|
||||
-(-add-rel-path "../lib")
|
||||
-(-add-rel-path "../include")
|
||||
-
|
||||
+(doseq [lp @libraryPaths@]
|
||||
+ (-add-library-path lp))
|
||||
|
||||
(def *config* nil)
|
||||
(set-dynamic! (var *config*))
|
@ -1,119 +0,0 @@
|
||||
From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001
|
||||
From: Herwig Hochleitner <herwig@bendlas.net>
|
||||
Date: Sun, 28 Feb 2016 16:34:14 +0100
|
||||
Subject: [PATCH] make paths configurable
|
||||
|
||||
---
|
||||
dust | 52 ----------------------------------------------------
|
||||
dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 43 insertions(+), 52 deletions(-)
|
||||
delete mode 100755 dust
|
||||
create mode 100755 dust.in
|
||||
|
||||
diff --git a/dust b/dust
|
||||
deleted file mode 100755
|
||||
index ffced9b..0000000
|
||||
--- a/dust
|
||||
+++ /dev/null
|
||||
@@ -1,52 +0,0 @@
|
||||
-#!/usr/bin/env bash
|
||||
-
|
||||
-base_path=$0
|
||||
-if [ -L "$base_path" ]; then
|
||||
- base_path=`readlink $base_path`
|
||||
-fi
|
||||
-base_path=`dirname $base_path`
|
||||
-
|
||||
-pixie_path=`which pixie-vm`
|
||||
-if [ -z "$pixie_path" ]; then
|
||||
- echo "Error: 'pixie-vm' must be on your PATH"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-function set_load_path() {
|
||||
- load_path=""
|
||||
- if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
|
||||
- load_path="`cat .load-path`"
|
||||
- fi
|
||||
-}
|
||||
-
|
||||
-if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
|
||||
- echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
|
||||
- echo "To start you can run the following command:"
|
||||
- echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
|
||||
- echo
|
||||
-fi
|
||||
-
|
||||
-set_load_path
|
||||
-run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
|
||||
-
|
||||
-case $1 in
|
||||
- ""|"repl")
|
||||
- rlwrap_cmd=""
|
||||
- if [ -n "`which rlwrap`" ]; then
|
||||
- rlwrap_cmd="rlwrap -aignored -n"
|
||||
- fi
|
||||
- $rlwrap_cmd $pixie_path $load_path
|
||||
- ;;
|
||||
- "run")
|
||||
- shift
|
||||
- file=$1
|
||||
- shift
|
||||
- $pixie_path $load_path $file $@
|
||||
- ;;
|
||||
- -h|--help)
|
||||
- $run_dust help
|
||||
- ;;
|
||||
- *)
|
||||
- $run_dust $@
|
||||
- ;;
|
||||
-esac
|
||||
diff --git a/dust.in b/dust.in
|
||||
new file mode 100755
|
||||
index 0000000..44a7fbd
|
||||
--- /dev/null
|
||||
+++ b/dust.in
|
||||
@@ -0,0 +1,40 @@
|
||||
+#!/usr/bin/env bash
|
||||
+
|
||||
+base_path=@basePath@
|
||||
+pixie_path=@pixiePath@
|
||||
+rlwrap_cmd=@rlwrapPath@
|
||||
+
|
||||
+function set_load_path() {
|
||||
+ load_path=""
|
||||
+ if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
|
||||
+ load_path="`cat .load-path`"
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
+if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
|
||||
+ echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
|
||||
+ echo "To start you can run the following command:"
|
||||
+ echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
|
||||
+ echo
|
||||
+fi
|
||||
+
|
||||
+set_load_path
|
||||
+run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
|
||||
+
|
||||
+case $1 in
|
||||
+ ""|"repl")
|
||||
+ $rlwrap_cmd -aignored -n $pixie_path $load_path
|
||||
+ ;;
|
||||
+ "run")
|
||||
+ shift
|
||||
+ file=$1
|
||||
+ shift
|
||||
+ $pixie_path $load_path $file $@
|
||||
+ ;;
|
||||
+ -h|--help)
|
||||
+ $run_dust help
|
||||
+ ;;
|
||||
+ *)
|
||||
+ $run_dust $@
|
||||
+ ;;
|
||||
+esac
|
||||
--
|
||||
2.7.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python3, gtk3, cairo, glib, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goocanvas";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ];
|
||||
nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ];
|
||||
buildInputs = [ gtk3 cairo glib gobject-introspection ];
|
||||
|
||||
configureFlags = [
|
||||
|
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleach";
|
||||
version = "4.1.0";
|
||||
version = "5.0.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";
|
||||
hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,20 +1,21 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder,
|
||||
async_generator, traitlets, nbformat, nest-asyncio, jupyter-client,
|
||||
pytest, xmltodict, nbconvert, ipywidgets
|
||||
, doCheck ? true
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbclient";
|
||||
version = "0.5.13";
|
||||
version = "0.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g=";
|
||||
hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";
|
||||
};
|
||||
|
||||
inherit doCheck;
|
||||
doCheck = false; # Avoid infinite recursion
|
||||
checkInputs = [ pytest xmltodict nbconvert ipywidgets ];
|
||||
propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
|
||||
|
||||
|
@ -5,13 +5,11 @@
|
||||
, glibcLocales
|
||||
, entrypoints
|
||||
, bleach
|
||||
, beautifulsoup4
|
||||
, mistune
|
||||
, nbclient
|
||||
, jinja2
|
||||
, pygments
|
||||
, traitlets
|
||||
, testpath
|
||||
, jupyter_core
|
||||
, jupyterlab-pygments
|
||||
, nbformat
|
||||
@ -20,15 +18,18 @@
|
||||
, tornado
|
||||
, jupyter-client
|
||||
, defusedxml
|
||||
, tinycss2
|
||||
, beautifulsoup4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbconvert";
|
||||
version = "6.4.5";
|
||||
version = "6.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4=";
|
||||
hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";
|
||||
};
|
||||
|
||||
# Add $out/share/jupyter to the list of paths that are used to search for
|
||||
@ -44,10 +45,10 @@ buildPythonPackage rec {
|
||||
checkInputs = [ pytestCheckHook glibcLocales ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
entrypoints bleach mistune jinja2 pygments traitlets testpath
|
||||
entrypoints bleach mistune jinja2 pygments traitlets
|
||||
jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client
|
||||
defusedxml beautifulsoup4
|
||||
(nbclient.override { doCheck = false; }) # avoid infinite recursion
|
||||
defusedxml tinycss2 beautifulsoup4
|
||||
nbclient
|
||||
jupyterlab-pygments
|
||||
];
|
||||
|
||||
|
@ -24,12 +24,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-connector-python";
|
||||
version = "2.7.6";
|
||||
version = "2.7.7";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs=";
|
||||
sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-vUtJ9QVMmDGfkYTBoK8mVaJTEfNBQD5sTEp7kC0LNZw=";
|
||||
sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-rJjLXktWnT6kRx1/18AFr6KciaFF8PaTpz27wz+vGug=";
|
||||
cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
@ -2,20 +2,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-sync-readme";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phaazon";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc";
|
||||
sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah";
|
||||
cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";
|
||||
homepage = "https://github.com/phaazon/cargo-sync-readme";
|
||||
changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ b4dm4n ];
|
||||
};
|
||||
|
@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wails";
|
||||
version = "2.0.0-beta.34";
|
||||
version = "2.0.0-beta.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wailsapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg=";
|
||||
sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I=";
|
||||
} + "/v2";
|
||||
|
||||
vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0=";
|
||||
vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
@ -1,19 +1,19 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "aws-s3-exporter";
|
||||
version = "0.4.1";
|
||||
|
||||
goPackagePath = "github.com/ribbybibby/s3_exporter";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ribbybibby";
|
||||
repo = "s3_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq";
|
||||
sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
vendorSha256 = null;
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Exports Prometheus metrics about S3 buckets and objects";
|
||||
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-applet";
|
||||
attrPath = "networkmanagerapplet";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ lib, fetchFromGitHub, python2Packages, openssh, rsync }:
|
||||
{ lib, fetchFromGitHub, python3Packages, openssh, rsync }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pssh";
|
||||
version = "2.3.1";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lilydjwg";
|
||||
repo = "pssh";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";
|
||||
hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -20,6 +20,9 @@ python2Packages.buildPythonApplication rec {
|
||||
done
|
||||
'';
|
||||
|
||||
# Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parallel SSH Tools";
|
||||
longDescription = ''
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fulcio";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WxSN1pZ8E5vKMoqR5EkGgKnLuHYb5Wl2vzqPcPEkXWE=";
|
||||
sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-v3H+uUERDHZB2ArruCOClCQFEEW8ANeReObww+1VKOI=";
|
||||
vendorSha256 = "sha256-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopass";
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
@ -21,10 +21,10 @@ buildGoModule rec {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-swvZrsRuevBe8lVg67J0R9u3GB/Wc2ZR54Y6j1Bsa3E=";
|
||||
sha256 = "sha256-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Fq9jEJm65efBL5ShcB/XCM70UVDO/8STbbTOOHXrpSk=";
|
||||
vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
let
|
||||
pname = "jadx";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skylot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE=";
|
||||
hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA=";
|
||||
};
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
@ -40,7 +40,7 @@ let
|
||||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w=";
|
||||
outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM=";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
@ -324,6 +324,7 @@ mapAliases ({
|
||||
double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22
|
||||
dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;
|
||||
draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
|
||||
dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21
|
||||
dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03
|
||||
dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22
|
||||
dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07
|
||||
@ -849,7 +850,6 @@ mapAliases ({
|
||||
neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
|
||||
netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22
|
||||
netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
|
||||
networkmanagerapplet = networkmanager-applet; # Added 2022-04-30
|
||||
networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22
|
||||
networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22
|
||||
networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22
|
||||
@ -1002,6 +1002,7 @@ mapAliases ({
|
||||
pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19
|
||||
ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18
|
||||
piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22
|
||||
pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21
|
||||
pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18
|
||||
pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22
|
||||
planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02
|
||||
|
@ -8562,8 +8562,6 @@ with pkgs;
|
||||
|
||||
networkmanager = callPackage ../tools/networking/networkmanager { };
|
||||
|
||||
networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { };
|
||||
|
||||
networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
|
||||
|
||||
networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
|
||||
@ -8580,6 +8578,8 @@ with pkgs;
|
||||
|
||||
networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };
|
||||
|
||||
networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };
|
||||
|
||||
libnma = callPackage ../tools/networking/networkmanager/libnma { };
|
||||
|
||||
libnma-gtk4 = libnma.override { withGtk4 = true; };
|
||||
@ -14497,9 +14497,6 @@ with pkgs;
|
||||
|
||||
inherit (ocamlPackages) reason;
|
||||
|
||||
pixie = callPackage ../development/interpreters/pixie { };
|
||||
dust = callPackage ../development/interpreters/pixie/dust.nix { };
|
||||
|
||||
buildRubyGem = callPackage ../development/ruby-modules/gem { };
|
||||
defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
|
||||
inherit (darwin) DarwinTools cctools;
|
||||
|
Loading…
Reference in New Issue
Block a user