From da58fe1b2c1f0f5ffa05627fe824ad1d226ab7a2 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 22 Jul 2021 19:36:58 +0200 Subject: [PATCH 01/16] cosign: add the sget client to the package Since Cosign v0.5.0 a client is available to securely fetch blobs from registries [0]. [0] https://github.com/sigstore/cosign/commit/eab1d40249b840e09a03e75acf91bc45f6522461 --- pkgs/tools/security/cosign/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index bdc32570dfa..36781679c20 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { vendorSha256 = "0f3al6ds0kqyv2fapgdg9i38rfx6h169pmj6az0sfnkh2psq73ia"; - subPackages = [ "cmd/cosign" ]; + excludedPackages = "\\(copasetic\\)"; preBuild = '' buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) From 26f2495d4012638d06f08561fbfec23177bd680a Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Thu, 8 Jul 2021 19:35:19 +0100 Subject: [PATCH 02/16] bic: init at v1.0.0 --- pkgs/development/interpreters/bic/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/interpreters/bic/default.nix diff --git a/pkgs/development/interpreters/bic/default.nix b/pkgs/development/interpreters/bic/default.nix new file mode 100644 index 00000000000..c27270f7a95 --- /dev/null +++ b/pkgs/development/interpreters/bic/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, readline +, autoreconfHook +, autoconf-archive +, gmp +, flex +, bison +}: + +stdenv.mkDerivation rec { + pname = "bic"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "hexagonal-sun"; + repo = pname; + rev = "v${version}"; + sha256 = "1ws46h1ngzk14dspmsggj9535yl04v9wh8v4gb234n34rdkdsyyw"; + }; + + buildInputs = [ readline gmp ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + bison + flex + ]; + + meta = with lib; { + description = "A C interpreter and API explorer"; + longDescription = '' + bic This a project that allows developers to explore and test C-APIs using a + read eval print loop, also known as a REPL. + ''; + license = with licenses; [ gpl2Plus ]; + homepage = "https://github.com/hexagonal-sun/bic"; + platforms = platforms.unix; + maintainers = with maintainers; [ hexagonal-sun ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a6ad9fe9d3..f5468b34678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1316,6 +1316,8 @@ in bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; + bic = callPackage ../development/interpreters/bic { }; + bit = callPackage ../applications/version-management/git-and-tools/bit { }; bitwarden = callPackage ../tools/security/bitwarden { }; From 14930cbad413269eaa4aa210575ccfba0504f708 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Sat, 10 Jul 2021 23:24:23 +0100 Subject: [PATCH 03/16] maintainers: add hexagonal-sun --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 162f9d1b4c9..c840796391b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4207,6 +4207,12 @@ githubId = 131599; name = "Martin Weinelt"; }; + hexagonal-sun = { + email = "dev@mattleach.net"; + github = "hexagonal-sun"; + githubId = 222664; + name = "Matthew Leach"; + }; hh = { email = "hh@m-labs.hk"; github = "HarryMakes"; From 23aa24109dbb6191012fdc4107380bc100a5d3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 22 Jul 2021 20:01:41 -0300 Subject: [PATCH 04/16] mojave-gtk-theme: 2020-11-29 -> 2021-07-20 - update version - run installPhase hooks - fix license - make relative symlinks for duplicated files --- pkgs/data/themes/mojave/default.nix | 67 +++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 17 deletions(-) diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 7959753f05e..bf2014344a6 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, glib +, gtk-engine-murrine +, gtk_engines +, inkscape +, jdupes +, optipng +, sassc +, which +}: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2020-11-29"; + version = "2021-07-20"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "07lcg28y0scpii29j85343kmcga4wyaayjpx9a118z838mnvb757"; + sha256 = "08j70kmjhvh06c3ahcracarrfq4vpy0zsp6zkcivbw4nf3bzp2zc"; }) (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; @@ -19,40 +31,61 @@ stdenv.mkDerivation rec { sourceRoot = "source"; - nativeBuildInputs = [ glib inkscape optipng sassc which ]; + nativeBuildInputs = [ + glib + inkscape + jdupes + optipng + sassc + which + ]; - buildInputs = [ gtk_engines ]; + buildInputs = [ + gtk_engines + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + # These fixup steps are slow and unnecessary. + dontPatchELF = true; + dontRewriteSymlinks = true; postPatch = '' patchShebangs . - for f in render-assets.sh \ - src/assets/gtk-2.0/render-assets.sh \ - src/assets/gtk-3.0/common-assets/render-assets.sh \ - src/assets/gtk-3.0/windows-assets/render-assets.sh \ - src/assets/metacity-1/render-assets.sh \ - src/assets/xfwm4/render-assets.sh + for f in \ + render-assets.sh \ + src/assets/cinnamon/thumbnails/render-thumbnails.sh \ + src/assets/gtk-2.0/render-assets.sh \ + src/assets/gtk/common-assets/render-assets.sh \ + src/assets/gtk/thumbnails/render-thumbnails.sh \ + src/assets/gtk/windows-assets/render-alt-assets.sh \ + src/assets/gtk/windows-assets/render-alt-small-assets.sh \ + src/assets/gtk/windows-assets/render-assets.sh \ + src/assets/gtk/windows-assets/render-small-assets.sh \ + src/assets/metacity-1/render-assets.sh \ + src/assets/xfwm4/render-assets.sh do substituteInPlace $f \ --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/optipng ${optipng}/bin/optipng done - - # Shut up inkscape's warnings - export HOME="$NIX_BUILD_ROOT" ''; installPhase = '' - name= ./install.sh -d $out/share/themes + runHook preInstall + name= ./install.sh --theme all --dest $out/share/themes install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* + jdupes -l -r $out/share + runHook postInstall ''; meta = with lib; { description = "Mac OSX Mojave like theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Mojave-gtk-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; From 88fc4c24b17b833777a1016d86137c3913981eb1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 23 Jul 2021 22:10:53 +0200 Subject: [PATCH 05/16] postgresql: fix build with clang on linux --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5d0a9cfa857..1f9a1ffc018 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -33,7 +33,7 @@ let inherit sha256; }; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ]; outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ From d328124ca503caec6ddf3409c4af43fd15e14ebb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Jul 2021 04:20:00 +0000 Subject: [PATCH 06/16] rubyPackages: update --- pkgs/top-level/ruby-packages.nix | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index a32cfbe0df6..957fe10d48f 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -147,10 +147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hb4br24c7awarvcdmairg9g9xs37nlc98fp5abhq3b426zlzskg"; + sha256 = "08c0mgsmw7xf3hwbnlsdmn3z5z84ldhw7w98n0lkvfizvvjn0mx2"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; atomos = { groups = ["default"]; @@ -239,10 +239,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "161azhqndf9gvnsvsx0k2x2kpalsgmlz233hvwc7ckbiral7q86s"; + sha256 = "1s7dr3jf5a2jg2dd23f97hsd29qj2cfah5rkjvhgb40z3k75vgy3"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; camping = { dependencies = ["mab" "rack"]; @@ -858,10 +858,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl"; + sha256 = "1iykfw2j6dd26rhgid3a17zghrmbmi68ppf3a7cdkvii68p4f37a"; type = "gem"; }; - version = "0.84.0"; + version = "0.85.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"]; @@ -869,10 +869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; + sha256 = "1xpq9w46alagszx2mx82mqxxmsmyni2bpxd08gygzpl03zwbpr63"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; faraday-em_http = { groups = ["default"]; @@ -929,10 +929,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; faraday-patron = { groups = ["default"]; @@ -1055,10 +1055,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02618y5gw8sbn258w298894if1xkn5gg7q6wj1sw0bx469xgj256"; + sha256 = "1mp4dgd7i26xp1n3ggagdc5xh52wm7gsmmq7mykfjm6bqvh0v302"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; gio2 = { dependencies = ["gobject-introspection"]; @@ -1066,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wflbi8yhrxv84q6lzrrqvdhpwrcklspkyzwyi47690wlbjff6cl"; + sha256 = "0gkik2d0c9xfljip17pafkln52wykrjvz9cf25da6hnxp73fvzwb"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; gitlab-markup = { groups = ["default"]; @@ -1087,10 +1087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aba6j1ixlb5bg2542dhm16c880vdk9cqn70247vhixzc3by0463"; + sha256 = "0daspjbnw3banifms1xshxzh4v4784zm3fqda1civqczyj62dw1n"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; globalid = { dependencies = ["activesupport"]; @@ -1109,10 +1109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rfjkgk5wxs19qah531k6ki6384iqf7b8cbdqc9l6ff9gvkf8cmw"; + sha256 = "1p2qn9cbdh3fav7x3ygp8jh7cr2yz4pqs6m979k43dj1vk49vb12"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1379,10 +1379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wqpp3m4zwy7l8n8z8d4krvf38q1gfx9lnsyipnfsapspsmsgdb6"; + sha256 = "0yky836g80jfvyhxn052q9fqrnhn72dsc2j10nirq7qylbq1jl7g"; type = "gem"; }; - version = "1.4.19"; + version = "1.5.5"; }; libv8 = { groups = ["default"]; @@ -1420,10 +1420,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; + sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1772,10 +1772,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xaqx3i4cx7xb5m5qfm7jclq3yyrj8abaqif0q1i72259g5klb8c"; + sha256 = "09rkarch6kd20cc9xj9v3yfvs7v2k8bxfzwi8vp56h4rcwmsy7m1"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; parallel = { groups = ["default"]; @@ -1793,10 +1793,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pxsi1i5z506xfzhiyavlasf8777h55ab40phvp7pfv9npmd5pnj"; + sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5"; type = "gem"; }; - version = "3.0.1.1"; + version = "3.0.2.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -2256,10 +2256,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045iralskypd95f42jdgbzp0alv2q0qlvya4qm6bkahg2rfb8s1x"; + sha256 = "1lk8ppn0a2b94fymlra80sygwn63pxyqy4cj4c3ic2697ll3mihj"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.4"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2267,10 +2267,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hnrfy928mwpa0ippqs4s8xwghwwp5h853naphgqxcd53l33chlv"; + sha256 = "0dbbll8k2xqdfpirzpfl3gi4asplay25mg91510i7qb601xbjpcy"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2350,10 +2350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; RubyInline = { dependencies = ["ZenTest"]; @@ -2528,10 +2528,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqmvwh6k638h6r13wsx1l0n0jvz07qys1lr7z8aaynscs0k6hyi"; + sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg"; type = "gem"; }; - version = "0.42.3"; + version = "0.43.0"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; From 4e5b3b49e4f34e657fabdb106da9f81ce5d6f096 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 09:22:42 +0000 Subject: [PATCH 07/16] jmol: 14.31.44 -> 14.31.46 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 5d2158843ed..efea1669254 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.44"; + version = "14.31.46"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-MHfqoQzUEL7nje7Y/hbaA8iktxfN7464TJXum5B6OCc="; + sha256 = "sha256-U8k8xQws0vIJ3ZICzZXxSbtl7boCzRqG9mFSTXvmCvg="; }; patchPhase = '' From 4f62b051375b0fdaa01ba37e915cfaaa7de40d80 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 18:06:55 +0200 Subject: [PATCH 08/16] discourse.mkDiscoursePlugin: remove phases --- pkgs/servers/web-apps/discourse/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 72ea8a943dc..74bd9a72234 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -65,7 +65,8 @@ let in stdenv.mkDerivation (builtins.removeAttrs args [ "bundlerEnvArgs" ] // { pluginName = if name != null then name else "${pname}-${version}"; - phases = [ "unpackPhase" "installPhase" ]; + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall mkdir -p $out From bf5d2c431b28feb24c55cfd1e373385ff31f25d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 22:21:31 +0200 Subject: [PATCH 09/16] python3Packages.tomli: 1.0.4 -> 1.1.0 --- pkgs/development/python-modules/tomli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 4204be03b94..c658339dcd9 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tomli"; - version = "1.0.4"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-ld0PsYnxVH3RbLG/NpvLDj9UhAe+QgwCQVXgGgqh8kE="; + sha256 = "1cj6iil9sii1zl0l4pw7h4alcnhwdbxinpph2f0rm5rghrp6prjm"; }; nativeBuildInputs = [ flit-core ]; From 53007f4f229ceb8ba2e95c6c35e51042c91ebcff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 22:21:48 +0200 Subject: [PATCH 10/16] black: 21.6b0 -> 21.7b0 --- pkgs/development/python-modules/black/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 6f4e05767bb..2b968fb991a 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -11,7 +11,7 @@ , pathspec , parameterized , regex -, toml +, tomli , typed-ast , typing-extensions , uvloop @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.6b0"; + version = "21.7b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "016f6bhnnnbcrrh3cvmpk77ww0nykv5n1qvgf8b3044dm14264yw"; + sha256 = "06d27adq6v6p8wspi0wwqz2pnq34p5jhnqvijbin54yyj5j3qdy8"; }; nativeBuildInputs = [ setuptools-scm ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { mypy-extensions pathspec regex - toml + tomli typed-ast # required for tests and python2 extra uvloop ] ++ lib.optional (pythonOlder "3.7") dataclasses From 5dede290891ed8c44d68fe5a279cdc47bc976916 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 25 Jul 2021 21:42:45 +0900 Subject: [PATCH 11/16] wrangler: 1.16.1 -> 1.18.0 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index bb1f2316485..b26d5a8a9db 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.16.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-chKmn38yB05NqDvtYWo4EwEIiD6kjy/1OMaMFM4qAA8="; + sha256 = "sha256-Ue9HCAYqv8DXiEZEuGRFPywNegakxBpb66RELP1Y+cg="; }; - cargoSha256 = "sha256-pG3ZsRPa/7QRkUik6a987SlGrl3B0thnN3h62JyzdJo="; + cargoSha256 = "sha256-HCsJG//RnlcmRSrBdf7iZTUOiQabMV2rICPLKvuE4AI="; nativeBuildInputs = [ pkg-config ]; From e8d424833ebbd90977106ea1c4cafa30ffc2571a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 20:29:43 +0000 Subject: [PATCH 12/16] dua: 2.14.2 -> 2.14.3 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 0c3d319f2a7..1d11f3c8deb 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.2"; + version = "2.14.3"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-gUTDiUH/jlGAGbhOOCa63wfNy5Y8W6VWlSb9E+hQjHY="; + sha256 = "sha256-Tste5DdUwCu1CNRzIcBEvyckrvhEg9C8M3y89luIMbE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-P8QFeP5KD5YeD4Px7OQNwCrvErgT9ytr4OlFkXuPgGU="; + cargoSha256 = "sha256-iHRPgQtanW2LcFLPPHmr2n1NeAPi0mDmHNeIv524lrM="; doCheck = false; From b9a3c230bdf5729c95f99a5aae44bc5b71fe8dab Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 15:13:39 +0200 Subject: [PATCH 13/16] ocamlPackages.{macaddr, ipaddr*}: 5.0.1 -> 5.1.0 https://github.com/mirage/ocaml-ipaddr/releases/tag/v5.1.0 --- pkgs/development/ocaml-modules/macaddr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 5552393b408..4f6f2e4287f 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,15 +4,15 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.0.1"; + version = "5.1.0"; useDune2 = true; minimumOCamlVersion = "4.04"; src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz"; - sha256 = "0ffqkhmnj8l085xgl7jxhs3ld9zsd9iavdg06nnhr1i9g1aayk1b"; + url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz"; + sha256 = "7e9328222c1a5f39b0751baecd7e27a842bdb0082fd48126eacbbad8816fbf5a"; }; checkInputs = [ ppx_sexp_conv ounit ]; From e2a89729c5cec70b2aa8cfa2ac39cdf69bcf51bd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 15:10:00 +0200 Subject: [PATCH 14/16] ocamlPackages.mirage-crypto: 0.10.1 -> 0.10.2 https://github.com/mirage/mirage-crypto/releases/tag/v0.10.2 --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 549838db396..b35d7cc910c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "028e2fc1f0a3e9b06603c6a253ecd043100099bc1c12c0567d8bc46d3781499c"; + sha256 = "96c4826fa3532c9d2ba21cd5fa25df003be3df20b2cc01068b60d59e0222d906"; }; useDune2 = true; From 8da4fa1e4b1498fd2cd0fa5f322290e6679072fc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 19 Jul 2021 09:31:51 +0200 Subject: [PATCH 15/16] ocamlPackages.otoml: init at 0.9.0 --- .../ocaml-modules/otoml/default.nix | 32 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/ocaml-modules/otoml/default.nix diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix new file mode 100644 index 00000000000..17e8fc855ea --- /dev/null +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, buildDunePackage +, menhir +, menhirLib +, uutf +}: + +buildDunePackage rec { + pname = "otoml"; + version = "0.9.0"; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "dmbaturin"; + repo = pname; + rev = version; + sha256 = "0l0c60rzgk11y8xq05kr8q9hkzb3c8vi995mq84x98ys73wb42j3"; + }; + + buildInputs = [ menhir ]; + + propagatedBuildInputs = [ menhirLib uutf ]; + + meta = { + description = "A TOML parsing and manipulation library for OCaml"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 200743944ee..8eb8a3944f9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -964,6 +964,8 @@ let otfm = callPackage ../development/ocaml-modules/otfm { }; + otoml = callPackage ../development/ocaml-modules/otoml { }; + otr = callPackage ../development/ocaml-modules/otr { }; owee = callPackage ../development/ocaml-modules/owee { }; From 6205812d88a5332f2d7f08570e8b17bcf13f518b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 20:12:39 +0200 Subject: [PATCH 16/16] ocamlPackages.imagelib: 20210402 -> 20210511 --- pkgs/development/ocaml-modules/imagelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 0a846214dc0..580db48769e 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; - version = "20210402"; + version = "20210511"; pname = "imagelib"; useDune2 = true; src = fetchurl { url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz"; - sha256 = "b3c8ace02b10b36b6c60b3ce3ae0b9109d4a861916ec320c59cc1194f4cc86e3"; + sha256 = "1cb94ea3731dc994c205940c9434543ce3f2470cdcb2e93a3e02ed793e80d480"; }; propagatedBuildInputs = [ decompress stdlib-shims ];