From c355fbba9cadbffa0f7c086e6ee3b0a713336633 Mon Sep 17 00:00:00 2001 From: numinit Date: Sat, 22 Aug 2020 19:19:39 -0600 Subject: [PATCH 01/11] easyrsa: 3.0.0 -> 3.0.8 --- pkgs/tools/networking/easyrsa/default.nix | 9 ++-- pkgs/tools/networking/easyrsa/fix-paths.patch | 48 ++++++++++++------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 90e05e5310b..4568aec9c5d 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, runtimeShell }: let - version = "3.0.0"; + version = "3.0.8"; in stdenv.mkDerivation { pname = "easyrsa"; inherit version; @@ -10,14 +10,15 @@ in stdenv.mkDerivation { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "0wbdv3wmqwm5680rpb971l56xiw49adpicqshk3vhfmpvqzl4dbs"; + sha256 = "05q60s343ydh9j6hzj0840qdcq8fkyz06q68yw4pqgqg4w68rbgs"; }; patches = [ ./fix-paths.patch ]; installPhase = '' mkdir -p $out/share/easyrsa - cp -r easyrsa3/{openssl*.cnf,x509-types,vars.example} $out/share/easyrsa + cp -r easyrsa3/{*.cnf,x509-types,vars.example} $out/share/easyrsa + cp easyrsa3/openssl-easyrsa.cnf $out/share/easyrsa/safessl-easyrsa.cnf install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa substituteInPlace $out/bin/easyrsa \ --subst-var out \ @@ -35,7 +36,7 @@ in stdenv.mkDerivation { description = "Simple shell based CA utility"; homepage = "https://openvpn.net/"; license = licenses.gpl2; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.numinit ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/easyrsa/fix-paths.patch b/pkgs/tools/networking/easyrsa/fix-paths.patch index 82688fa7946..7891adcb20c 100644 --- a/pkgs/tools/networking/easyrsa/fix-paths.patch +++ b/pkgs/tools/networking/easyrsa/fix-paths.patch @@ -1,33 +1,49 @@ diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa -index 6fec288..210648a 100755 +index 261336f..7b9a79b 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa -@@ -1003,7 +1003,7 @@ Note: using Easy-RSA configuration from: $vars" +@@ -1661,7 +1661,7 @@ Note: using Easy-RSA configuration from: $vars" # Set defaults, preferring existing env-vars if present - set_var EASYRSA "$PWD" + set_var EASYRSA "$prog_dir" - set_var EASYRSA_OPENSSL openssl + set_var EASYRSA_OPENSSL "@openssl@" - set_var EASYRSA_PKI "$EASYRSA/pki" + set_var EASYRSA_PKI "$PWD/pki" set_var EASYRSA_DN cn_only set_var EASYRSA_REQ_COUNTRY "US" -@@ -1030,13 +1030,17 @@ Note: using Easy-RSA configuration from: $vars" - # Detect openssl config, preferring EASYRSA_PKI over EASYRSA - if [ -f "$EASYRSA_PKI/openssl-1.0.cnf" ]; then - set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-1.0.cnf" -- else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf" -+ elif [ -f "$EASYRSA/openssl-1.0.cnf" ]; then -+ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf" -+ else set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-1.0.cnf" - fi +@@ -1683,16 +1683,31 @@ Note: using Easy-RSA configuration from: $vars" + set_var EASYRSA_TEMP_DIR "$EASYRSA_PKI" + set_var EASYRSA_REQ_CN ChangeMe + set_var EASYRSA_DIGEST sha256 +- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" +- set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" + set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM" ++ if [ -f "$EASYRSA_PKI/safessl-easyrsa.conf" ]; then ++ set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" ++ elif [ -f "$EASYRSA/safessl-easyrsa.conf" ]; then ++ set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf" ++ elif [ -f "@out@/share/easyrsa/safessl-easyrsa.cnf" ]; then ++ set_var EASYRSA_SAFE_CONF "@out@/share/easyrsa/safessl-easyrsa.cnf" ++ fi ++ ++ if [ -f "$EASYRSA_PKI/openssl-easyrsa.conf" ]; then ++ set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" ++ elif [ -f "$EASYRSA/openssl-easyrsa.conf" ]; then ++ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf" ++ elif [ -f "@out@/share/easyrsa/openssl-easyrsa.cnf" ]; then ++ set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-easyrsa.cnf" ++ fi ++ # Same as above for the x509-types extensions dir if [ -d "$EASYRSA_PKI/x509-types" ]; then set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types" -- else set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" +- else +- #TODO: This should be removed. Not really suitable for packaging. + elif [ -d "$EASYRSA/x509-types" ]; then -+ set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" -+ else set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types" + set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" ++ else ++ set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types" fi # EASYRSA_ALGO_PARAMS must be set depending on selected algo From 49c789703ccb70acebfaec4388f543a9ad63520a Mon Sep 17 00:00:00 2001 From: hlolli Date: Sat, 14 Nov 2020 00:55:44 +0100 Subject: [PATCH 02/11] fetchMavenArtifact: support artifact classifier syntax --- .../fetchmavenartifact/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index 583a9ea396c..2058600960a 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -36,19 +36,28 @@ assert (repos != []) || (url != "") || (urls != []); let + classifierSplit = + with stdenv.lib.strings; + splitString "$" artifactId; + artifactId_ = builtins.head classifierSplit; + classifier = + with stdenv.lib; + if builtins.length classifierSplit > 1 + then concatStrings ["-" (builtins.elemAt classifierSplit 1)] + else ""; name_ = with stdenv.lib; concatStrings [ (replaceChars ["."] ["_"] groupId) "_" - (replaceChars ["."] ["_"] artifactId) "-" + (replaceChars ["."] ["_"] artifactId_) "-" version ]; mkJarUrl = repoUrl: with stdenv.lib; concatStringsSep "/" [ (removeSuffix "/" repoUrl) (replaceChars ["."] ["/"] groupId) - artifactId + artifactId_ version - "${artifactId}-${version}.jar" + "${artifactId_}-${version}${classifier}.jar" ]; urls_ = if url != "" then [url] @@ -57,7 +66,7 @@ let jar = fetchurl ( builtins.removeAttrs args ["groupId" "artifactId" "version" "repos" "url" ] - // { urls = urls_; name = "${name_}.jar"; } + // { urls = urls_; name = "${name_}${classifier}.jar"; } ); in stdenv.mkDerivation { @@ -67,7 +76,7 @@ in # packages packages that mention this derivation in their buildInputs. installPhase = '' mkdir -p $out/share/java - ln -s ${jar} $out/share/java/${artifactId}-${version}.jar + ln -s ${jar} $out/share/java/${artifactId_}-${version}${classifier}.jar ''; # We also add a `jar` attribute that can be used to easily obtain the path # to the downloaded jar file. From 6ea99ff06bacf6b71128d93ead8f018e13eb8a33 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 27 Sep 2020 22:40:39 +0200 Subject: [PATCH 03/11] greenfoot: init at 3.6.1 --- .../editors/greenfoot/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/editors/greenfoot/default.nix diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix new file mode 100644 index 00000000000..8205d52b43a --- /dev/null +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, makeWrapper, jdk }: + +stdenv.mkDerivation rec { + pname = "greenfoot"; + version = "3.6.1"; + src = fetchurl { + # We use the deb here. First instinct might be to go for the "generic" JAR + # download, but that is actually a graphical installer that is much harder + # to unpack than the deb. + url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; + sha256 = "112h6plpclj8kbv093m4pcczljhpd8d47d7a2am1yfgbyckx6hf0"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + + installPhase = '' + mkdir -p $out + cp -r usr/* $out + rm -r $out/share/greenfoot/jdk + rm -r $out/share/greenfoot/javafx + + makeWrapper ${jdk}/bin/java $out/bin/greenfoot \ + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/greenfoot/bluej.jar\" bluej.Boot -greenfoot=true -bluej.compiler.showunchecked=false -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API" + ''; + + meta = with stdenv.lib; { + description = "A simple integrated development environment for Java"; + homepage = "https://www.greenfoot.org/"; + license = licenses.gpl2ClasspathPlus; + maintainers = [ maintainers.charvp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 512ba7617d6..05eeadfefd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21023,6 +21023,10 @@ in gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + greenfoot = callPackage ../applications/editors/greenfoot/default.nix { + jdk = jetbrains.jdk; + }; + gspeech = callPackage ../applications/audio/gspeech { }; icesl = callPackage ../applications/misc/icesl { }; From 16a01272ee2a9b6c0d3af0b356ee869912cfb63c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 23 Sep 2020 00:41:47 +0300 Subject: [PATCH 04/11] sundials: assert that lapack and blas are compatible Instead of asserting that lapack and blas are both not using 64 bit index size, only make sure they are index size compatible. Plus, do it when evaluating buildInputs, per: https://github.com/NixOS/nixpkgs/pull/94892#discussion_r471110250 Don't pass SUNDIALS_INDEX_TYPE=int32_t if blas && lapack are compiled with 64 bit index size. Bonus: Use checkTarget and not an overrided checkPhase, per: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/explicit-phases.md --- .../libraries/sundials/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index e1b4d375282..2e1fd527e9a 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -7,9 +7,8 @@ , gfortran , suitesparse , lapackSupport ? true -, kluSupport ? true }: - -assert (!blas.isILP64) && (!lapack.isILP64); +, kluSupport ? true +}: stdenv.mkDerivation rec { pname = "sundials"; @@ -17,11 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ python - ] ++ stdenv.lib.optionals (lapackSupport) [ - gfortran - blas - lapack ] + ++ stdenv.lib.optionals (lapackSupport) + # Check that the same index size is used for both libraries + (assert (blas.isILP64 == lapack.isILP64); [ + gfortran + blas + lapack + ]) # KLU support is based on Suitesparse. # It is tested upstream according to the section 1.1.4 of # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) @@ -47,17 +49,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" ] ++ stdenv.lib.optionals (lapackSupport) [ - "-DSUNDIALS_INDEX_TYPE=int32_t" "-DLAPACK_ENABLE=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ stdenv.lib.optionals (kluSupport) [ "-DKLU_ENABLE=ON" "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" "-DKLU_LIBRARY_DIR=${suitesparse}/lib" - ]; + ] ++ stdenv.lib.optionals (lapackSupport && !lapack.isILP64) [ + # Use the correct index type according to lapack which is supposed to be + # the same index type compatible with blas, thanks to the assertion of + # buildInputs + "-DSUNDIALS_INDEX_TYPE=int32_t" + ] + ; doCheck = true; - checkPhase = "make test"; + checkTarget = "test"; meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; From 38ad37822813692de906c87f47801370ac1bcf1a Mon Sep 17 00:00:00 2001 From: hlolli Date: Sat, 5 Dec 2020 18:56:46 +0100 Subject: [PATCH 05/11] add classifier as an argument --- .../fetchmavenartifact/default.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index 2058600960a..42ad7603a8f 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -17,6 +17,8 @@ args@ artifactId , # Example: "4.3.6" version +, # Example: "jdk11" + classifier ? null , # List of maven repositories from where to fetch the artifact. # Example: [ http://oss.sonatype.org/content/repositories/public ]. repos ? defaultRepos @@ -36,28 +38,19 @@ assert (repos != []) || (url != "") || (urls != []); let - classifierSplit = - with stdenv.lib.strings; - splitString "$" artifactId; - artifactId_ = builtins.head classifierSplit; - classifier = - with stdenv.lib; - if builtins.length classifierSplit > 1 - then concatStrings ["-" (builtins.elemAt classifierSplit 1)] - else ""; name_ = with stdenv.lib; concatStrings [ (replaceChars ["."] ["_"] groupId) "_" - (replaceChars ["."] ["_"] artifactId_) "-" + (replaceChars ["."] ["_"] artifactId) "-" version ]; mkJarUrl = repoUrl: with stdenv.lib; concatStringsSep "/" [ (removeSuffix "/" repoUrl) (replaceChars ["."] ["/"] groupId) - artifactId_ + artifactId version - "${artifactId_}-${version}${classifier}.jar" + "${artifactId}-${version}-${optionalString (!isNull classifier) "-${classifier}"}.jar" ]; urls_ = if url != "" then [url] @@ -65,8 +58,8 @@ let else map mkJarUrl repos; jar = fetchurl ( - builtins.removeAttrs args ["groupId" "artifactId" "version" "repos" "url" ] - // { urls = urls_; name = "${name_}${classifier}.jar"; } + builtins.removeAttrs args ["groupId" "artifactId" "version" "classifier" "repos" "url" ] + // { urls = urls_; name = "${name_}.jar"; } ); in stdenv.mkDerivation { @@ -76,7 +69,7 @@ in # packages packages that mention this derivation in their buildInputs. installPhase = '' mkdir -p $out/share/java - ln -s ${jar} $out/share/java/${artifactId_}-${version}${classifier}.jar + ln -s ${jar} $out/share/java/${artifactId}-${version}.jar ''; # We also add a `jar` attribute that can be used to easily obtain the path # to the downloaded jar file. From 21d212d96e9b819ce157fbf625bd7cd3bdac2d24 Mon Sep 17 00:00:00 2001 From: Break Yang Date: Sat, 5 Dec 2020 21:29:32 -0800 Subject: [PATCH 06/11] pythonPacakges.clickhouse-cityhash: init at 1.0.2.3 --- .../clickhouse-cityhash/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/clickhouse-cityhash/default.nix diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix new file mode 100644 index 00000000000..4e632cb3403 --- /dev/null +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "clickhouse-cityhash"; + version = "1.0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z8nl0ly2p1h6nygwxs6y40q8y424w40fkjv3jyf8vvcg4h7sdrg"; + }; + + propagatedBuildInputs = [ setuptools ]; + + doCheck = false; + pythonImportsCheck = [ "clickhouse_cityhash" ]; + + meta = with lib; { + description = "Python-bindings for CityHash, a fast non-cryptographic hash algorithm"; + homepage = "https://github.com/xzkostyan/python-cityhash"; + license = licenses.upl; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa3a001a821..67ebb675120 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1215,6 +1215,8 @@ in { click-threading = callPackage ../development/python-modules/click-threading { }; + clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {}; + cliff = callPackage ../development/python-modules/cliff { }; clifford = callPackage ../development/python-modules/clifford { }; From 53b2e8a202f011aefaa725c21e72d7a6d33a403a Mon Sep 17 00:00:00 2001 From: Break Yang Date: Sat, 5 Dec 2020 21:29:48 -0800 Subject: [PATCH 07/11] pythonPacakges.clickhouse-driver: init at 0.1.5 --- .../clickhouse-driver/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/clickhouse-driver/default.nix diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix new file mode 100644 index 00000000000..9cb88b5cbc9 --- /dev/null +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytz +, tzlocal +, clickhouse-cityhash +, zstd +, lz4 +, freezegun +, mock +, nose +}: + +buildPythonPackage rec { + pname = "clickhouse-driver"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1827cm5z2zd6mxn9alq54bbzw6vhz4a30a54vacqn7nz691qs1gd"; + }; + + propagatedBuildInputs = [ + setuptools + pytz + tzlocal + clickhouse-cityhash + zstd + lz4 + ]; + + checkInputs = [ + freezegun + mock + nose + ]; + + doCheck = true; + pythonImportsCheck = [ "clickhouse_driver" ]; + + meta = with lib; { + description = "Python driver with native interface for ClickHouse"; + homepage = "https://github.com/mymarilyn/clickhouse-driver"; + license = licenses.mit; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67ebb675120..661b94eeb1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1217,6 +1217,8 @@ in { clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {}; + clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {}; + cliff = callPackage ../development/python-modules/cliff { }; clifford = callPackage ../development/python-modules/clifford { }; From cf7475d2061ac3ada4b226571a4a1bb91420b578 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 Nov 2020 16:15:18 +0100 Subject: [PATCH 08/11] ocamlPackages.odate: init at 0.6 --- .../ocaml-modules/odate/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/odate/default.nix diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix new file mode 100644 index 00000000000..aed5e92765f --- /dev/null +++ b/pkgs/development/ocaml-modules/odate/default.nix @@ -0,0 +1,29 @@ +{ lib, buildDunePackage, fetchFromGitHub +, menhir +}: + +buildDunePackage rec { + pname = "odate"; + version = "0.6"; + + useDune2 = true; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "hhugo"; + repo = pname; + rev = version; + sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; + }; + + buildInputs = [ menhir ]; + + meta = { + description = "Date and duration in OCaml"; + inherit (src.meta) homepage; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 793b7b78b0e..6fe157d2ea2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -740,6 +740,8 @@ let octavius = callPackage ../development/ocaml-modules/octavius { }; + odate = callPackage ../development/ocaml-modules/odate { }; + odoc = callPackage ../development/ocaml-modules/odoc { }; omd = callPackage ../development/ocaml-modules/omd { }; From 3afc4e8a813e6c2677395df9f4c901c545d73db9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Dec 2020 11:07:37 +0100 Subject: [PATCH 09/11] androidsdk_9_0: fix evaluation without aliases --- pkgs/development/mobile/androidenv/tools/25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix index 80b5858031d..7489569d507 100644 --- a/pkgs/development/mobile/androidenv/tools/25.nix +++ b/pkgs/development/mobile/androidenv/tools/25.nix @@ -3,7 +3,7 @@ deployAndroidPackage { name = "androidsdk"; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libxcb pkgs.xlibs.libXfixes pkgs.xlibs.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; inherit package os; patchInstructions = '' @@ -41,7 +41,7 @@ deployAndroidPackage { do wrapProgram $PWD/$i \ --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} done ${lib.optionalString (os == "linux") '' From c7cbc7098aca6ec0c32e350524eb2d035890deb4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 6 Dec 2020 12:16:17 +0100 Subject: [PATCH 10/11] gns3-{gui,server}: 2.2.16 -> 2.2.17 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index a0f35f3779d..3d22dca36d9 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.16"; + stableVersion = "2.2.17"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1kz5gr5rwqp1hn9fw17v6sy2467506zks574nqcd2vgxzhr6cy6x"; - serverSrcHash = "1r6qj1l8jgyjm67agn83zp9c2n7pgfzwyh8a5q314zxi18nm6rqp"; + guiSrcHash = "0dfyxr983w6lmbcvaf32bnm9cz7y7fp9jfaz8zxp1dvr6dr06cmv"; + serverSrcHash = "0m5ajd2zkafx89hvp202m351h1dygfc3jssl3m7nd7r42csyi2vj"; in { guiStable = mkGui { stable = true; From c3bd5609052952276fc5ce1f1755a3e21b83017e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 6 Dec 2020 12:37:47 +0100 Subject: [PATCH 11/11] glow: remove ehmry from maintainers Glow is potential spyware. --- pkgs/applications/editors/glow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index a54ce7345d0..d941c85e2c6 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; license = licenses.mit; - maintainers = with maintainers; [ ehmry Br1ght0ne penguwin ]; + maintainers = with maintainers; [ Br1ght0ne penguwin ]; }; }