diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release-haskell.nix | 162 | ||||
| -rw-r--r-- | pkgs/top-level/ruby-packages.nix | 68 |
5 files changed, 184 insertions, 80 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 569b2fc471d..5ab47db86f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1337,6 +1337,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 { }; @@ -1407,6 +1409,8 @@ in codeql = callPackage ../development/tools/analysis/codeql { }; + corearchiver = libsForQt5.callPackage ../tools/archivers/corearchiver { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; @@ -2927,6 +2931,8 @@ in inklecate = callPackage ../development/compilers/inklecate {}; + interactsh = callPackage ../tools/misc/interactsh { }; + interlock = callPackage ../servers/interlock {}; iotools = callPackage ../tools/misc/iotools { }; @@ -3902,6 +3908,8 @@ in qtbase = qt5.qtbase; }; + coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; + c14 = callPackage ../applications/networking/c14 { }; corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; @@ -5898,6 +5906,8 @@ in httpx = callPackage ../tools/security/httpx { }; + hurl = callPackage ../tools/networking/hurl { }; + hub = callPackage ../applications/version-management/git-and-tools/hub { }; hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; @@ -6388,6 +6398,8 @@ in libscrypt = callPackage ../development/libraries/libscrypt { }; + libcsys = libsForQt5.callPackage ../development/libraries/libcsys { }; + libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; @@ -9353,7 +9365,7 @@ in tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; @@ -13453,7 +13465,9 @@ in sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; }; - libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; + libsigrokdecode = callPackage ../development/tools/libsigrokdecode { + python3 = python38; + }; # special forks used for dsview libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; @@ -16153,6 +16167,8 @@ in autoreconfHook = buildPackages.autoreconfHook269; }; + libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; + libasr = callPackage ../development/libraries/libasr { }; libass = callPackage ../development/libraries/libass { }; @@ -19599,6 +19615,8 @@ in hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; + ic-keysmith = callPackage ../tools/security/ic-keysmith { }; + icecream = callPackage ../servers/icecream { }; icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; @@ -23105,6 +23123,8 @@ in aseprite = callPackage ../applications/editors/aseprite { }; aseprite-unfree = aseprite.override { unfree = true; }; + assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; + astroid = callPackage ../applications/networking/mailreaders/astroid { }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -23472,6 +23492,8 @@ in copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + coreaction = libsForQt5.callPackage ../applications/misc/coreaction { }; + corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; coriander = callPackage ../applications/video/coriander { @@ -26734,6 +26756,8 @@ in tag = "-daemon-qt5"; }; + quill-qr = callPackage ../tools/security/quill-qr { }; + quirc = callPackage ../tools/graphics/quirc {}; quilter = callPackage ../applications/editors/quilter { }; @@ -30523,6 +30547,8 @@ in boolector = callPackage ../applications/science/logic/boolector {}; + bitwuzla = callPackage ../applications/science/logic/bitwuzla {}; + symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; mcy = callPackage ../applications/science/logic/mcy {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b872f3286e1..86a09b4a1fa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -42,6 +42,8 @@ let in { lib = haskellLib; + package-list = callPackage ../development/haskell-modules/package-list.nix {}; + compiler = { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; 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 { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index fe5241e3634..5173ec6cb36 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -18,18 +18,22 @@ let }; inherit (releaseLib) - pkgs - packagePlatforms + lib mapTestOn - aggregate + packagePlatforms + pkgs ; - inherit (pkgs) lib; - - # helper function which traverses a (nested) set + # Helper function which traverses a (nested) set # of derivations produced by mapTestOn and flattens # it to a list of derivations suitable to be passed # to `releaseTools.aggregate` as constituents. + # Removes all non derivations from the input jobList. + # + # accumulateDerivations :: [ Either Derivation AttrSet ] -> [ Derivation ] + # + # > accumulateDerivations [ drv1 "string" { foo = drv2; bar = { baz = drv3; }; } ] + # [ drv1 drv2 drv3 ] accumulateDerivations = jobList: lib.concatMap ( attrs: @@ -81,8 +85,45 @@ let recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; - staticHaskellPackagesPlatforms = - packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104; + # Remove multiple elements from a list at once. + # + # removeMany + # :: [a] -- list of elements to remove + # -> [a] -- list of elements from which to remove + # -> [a] + # + # > removeMany ["aarch64-linux" "x86_64-darwin"] ["aarch64-linux" "x86_64-darwin" "x86_64-linux"] + # ["x86_64-linux"] + removeMany = itemsToRemove: list: lib.foldr lib.remove list itemsToRemove; + + # Recursively remove platforms from the values in an attribute set. + # + # removePlatforms + # :: [String] + # -> AttrSet + # -> AttrSet + # + # > attrSet = { + # foo = ["aarch64-linux" "x86_64-darwin" "x86_64-linux"]; + # bar.baz = ["aarch64-linux" "x86_64-linux"]; + # bar.quux = ["aarch64-linux" "x86_64-darwin"]; + # } + # > removePlatforms ["aarch64-linux" "x86_64-darwin"] attrSet + # { + # foo = ["x86_64-linux"]; + # bar = { + # baz = ["x86_64-linux"]; + # quux = []; + # }; + # } + removePlatforms = platformsToRemove: packageSet: + lib.mapAttrsRecursive + (_: val: + if lib.isList val + then removeMany platformsToRemove val + else val + ) + packageSet; jobs = recursiveUpdateMany [ (mapTestOn { @@ -91,23 +132,8 @@ let tests.haskell = packagePlatforms pkgs.tests.haskell; - pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { - # remove musl ghc865Binary since it is known to be broken and - # causes an evaluation error on darwin. - # TODO: remove ghc865Binary altogether and use ghc8102Binary - ghc865Binary = {}; - }; - - # test some statically linked packages to catch regressions - # and get some cache going for static compilation with GHC - # Use integer-simple to avoid GMP linking problems (LGPL) - pkgsStatic.haskell.packages.integer-simple.ghc8104 = { - inherit (staticHaskellPackagesPlatforms) - hello - random - lens - ; - }; + nixosTests.agda = (packagePlatforms pkgs.nixosTests).agda; + agdaPackages = packagePlatforms pkgs.agdaPackages; # top-level packages that depend on haskellPackages inherit (pkgsPlatforms) @@ -215,6 +241,56 @@ let ; elmPackages.elm = pkgsPlatforms.elmPackages.elm; + + # GHCs linked to musl. + pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { + # remove musl ghc865Binary since it is known to be broken and + # causes an evaluation error on darwin. + # TODO: remove ghc865Binary altogether and use ghc8102Binary + ghc865Binary = {}; + + # remove integer-simple because it appears to be broken with + # musl and non-static-linking. + integer-simple = {}; + }; + + # Get some cache going for MUSL-enabled GHC. + pkgsMusl.haskellPackages = + removePlatforms + [ + # pkgsMusl is compiled natively with musl. It is not + # cross-compiled (unlike pkgsStatic). We can only + # natively bootstrap GHC with musl on x86_64-linux because + # upstream doesn't provide a musl bindist for aarch64. + "aarch64-linux" + + # musl only supports linux, not darwin. + "x86_64-darwin" + ] + { + inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) + hello + lens + random + ; + }; + + # Test some statically linked packages to catch regressions + # and get some cache going for static compilation with GHC. + # Use integer-simple to avoid GMP linking problems (LGPL) + pkgsStatic.haskell.packages.integer-simple.ghc8104 = + removePlatforms + [ + "aarch64-linux" # times out on Hydra + "x86_64-darwin" # TODO: reenable when static libiconv works on darwin + ] + { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104) + hello + lens + random + ; + }; }) (versionedCompilerJobs { # Packages which should be checked on more than the @@ -291,25 +367,7 @@ let (name: jobs.haskellPackages."${name}") (maintainedPkgNames pkgs.haskellPackages)); }; - staticHaskellPackages = pkgs.releaseTools.aggregate { - name = "static-haskell-packages"; - meta = { - description = "Static haskell builds using the pkgsStatic infrastructure"; - maintainers = [ - lib.maintainers.sternenseemann - lib.maintainers.rnhmjoj - ]; - }; - constituents = [ - # TODO: reenable darwin builds if static libiconv works - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.aarch64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.aarch64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux - ]; - }; + muslGHCs = pkgs.releaseTools.aggregate { name = "haskell-pkgsMusl-ghcs"; meta = { @@ -325,6 +383,22 @@ let jobs.pkgsMusl.haskell.compiler.ghc901 ]; }; + + staticHaskellPackages = pkgs.releaseTools.aggregate { + name = "static-haskell-packages"; + meta = { + description = "Static haskell builds using the pkgsStatic infrastructure"; + maintainers = [ + lib.maintainers.sternenseemann + lib.maintainers.rnhmjoj + ]; + }; + constituents = accumulateDerivations [ + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random + ]; + }; } ]; 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"]; |