From 71c4eba5497c6589a1965bef9278b83757f2dbc6 Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Wed, 14 Sep 2022 16:10:14 +0200 Subject: [PATCH] Remove Haskell radix heap stuff --- .drone.yml | 20 +-- .gitignore | 2 +- algo2/radix-heap/default.nix | 20 --- algo2/radix-heap/nix/ghc.nix | 3 - algo2/radix-heap/nix/nixpkgs.nix | 5 - algo2/radix-heap/nix/sources.json | 15 --- algo2/radix-heap/nix/sources.nix | 174 ------------------------- algo2/radix-heap/radix-heap.cabal | 25 ---- algo2/radix-heap/src/Data/RadixHeap.hs | 3 - algo2/radix-heap/stack-shell.nix | 12 -- algo2/radix-heap/stack.yaml | 8 -- algo2/radix-heap/tests/Main.hs | 4 - algo2/radixheap/radixheap.c | 5 + 13 files changed, 13 insertions(+), 283 deletions(-) delete mode 100644 algo2/radix-heap/default.nix delete mode 100644 algo2/radix-heap/nix/ghc.nix delete mode 100644 algo2/radix-heap/nix/nixpkgs.nix delete mode 100644 algo2/radix-heap/nix/sources.json delete mode 100644 algo2/radix-heap/nix/sources.nix delete mode 100644 algo2/radix-heap/radix-heap.cabal delete mode 100644 algo2/radix-heap/src/Data/RadixHeap.hs delete mode 100644 algo2/radix-heap/stack-shell.nix delete mode 100644 algo2/radix-heap/stack.yaml delete mode 100644 algo2/radix-heap/tests/Main.hs create mode 100644 algo2/radixheap/radixheap.c diff --git a/.drone.yml b/.drone.yml index 636c430..6fb8379 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,17 +17,11 @@ steps: image: gcc:12.2.0 commands: - cd algo2 - - gcc -o pairingheap pairingheap.c - - ./pairingheap - ---- -kind: pipeline -type: docker -name: haskell - -steps: - - name: radix-heap - image: nixos/nix:2.11.0 + - gcc -o main pairingheap.c + - ./main + - name: radixheap + image: gcc:12.2.0 commands: - - cd algo2/radix-heap - - nix-shell --quiet --run "stack test" + - cd algo2/radixheap + - gcc -o main radixheap.c + - ./main diff --git a/.gitignore b/.gitignore index aae26c2..318053b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ .stack-work -algo2/pairingheap +main diff --git a/algo2/radix-heap/default.nix b/algo2/radix-heap/default.nix deleted file mode 100644 index 2e97753..0000000 --- a/algo2/radix-heap/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - pkgs ? import ./nix/nixpkgs.nix {} -}: -let - ghc = import ./nix/ghc.nix; - - paths = - [ - # Nix tooling - pkgs.niv - pkgs.nix-tree - - # Haskell tooling - pkgs.stack - (ghc pkgs) - ]; -in - pkgs.mkShell { - buildInputs = paths; - } diff --git a/algo2/radix-heap/nix/ghc.nix b/algo2/radix-heap/nix/ghc.nix deleted file mode 100644 index a315b5f..0000000 --- a/algo2/radix-heap/nix/ghc.nix +++ /dev/null @@ -1,3 +0,0 @@ -pkgs: -pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ -]) diff --git a/algo2/radix-heap/nix/nixpkgs.nix b/algo2/radix-heap/nix/nixpkgs.nix deleted file mode 100644 index 6fbb49b..0000000 --- a/algo2/radix-heap/nix/nixpkgs.nix +++ /dev/null @@ -1,5 +0,0 @@ -{}: -let - sources = import ./sources.nix; -in - import sources.nixpkgs {} diff --git a/algo2/radix-heap/nix/sources.json b/algo2/radix-heap/nix/sources.json deleted file mode 100644 index 0461ebc..0000000 --- a/algo2/radix-heap/nix/sources.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "nixpkgs": { - "branch": "nixpkgs-unstable", - "description": "Nix Packages collection", - "homepage": null, - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0343e3415784b2cd9c68924294794f7dbee12ab3", - "sha256": "0ypgcim0vbv2742m7rb1010ga4zlayvpdma5qqw13brp8q5vjvcy", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/0343e3415784b2cd9c68924294794f7dbee12ab3.tar.gz", - "url_template": "https://github.com///archive/.tar.gz", - "version": "5e7fb7699c84da3420495e40459dfbff459c16e4" - } -} diff --git a/algo2/radix-heap/nix/sources.nix b/algo2/radix-heap/nix/sources.nix deleted file mode 100644 index 1938409..0000000 --- a/algo2/radix-heap/nix/sources.nix +++ /dev/null @@ -1,174 +0,0 @@ -# This file has been generated by Niv. - -let - - # - # The fetchers. fetch_ fetches specs of type . - # - - fetch_file = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in - if spec.builtin or true then - builtins_fetchurl { inherit (spec) url sha256; name = name'; } - else - pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; - - fetch_tarball = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in - if spec.builtin or true then - builtins_fetchTarball { name = name'; inherit (spec) url sha256; } - else - pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; - - fetch_git = name: spec: - let - ref = - if spec ? ref then spec.ref else - if spec ? branch then "refs/heads/${spec.branch}" else - if spec ? tag then "refs/tags/${spec.tag}" else - abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; - in - builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; - - fetch_local = spec: spec.path; - - fetch_builtin-tarball = name: throw - ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=tarball -a builtin=true''; - - fetch_builtin-url = name: throw - ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=file -a builtin=true''; - - # - # Various helpers - # - - # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695 - sanitizeName = name: - ( - concatMapStrings (s: if builtins.isList s then "-" else s) - ( - builtins.split "[^[:alnum:]+._?=-]+" - ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name) - ) - ); - - # The set of packages used when specs are fetched using non-builtins. - mkPkgs = sources: system: - let - sourcesNixpkgs = - import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; - hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; - hasThisAsNixpkgsPath = == ./.; - in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then - import {} - else - abort - '' - Please specify either (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; - - # The actual fetching function. - fetch = pkgs: name: spec: - - if ! builtins.hasAttr "type" spec then - abort "ERROR: niv spec ${name} does not have a 'type' attribute" - else if spec.type == "file" then fetch_file pkgs name spec - else if spec.type == "tarball" then fetch_tarball pkgs name spec - else if spec.type == "git" then fetch_git name spec - else if spec.type == "local" then fetch_local spec - else if spec.type == "builtin-tarball" then fetch_builtin-tarball name - else if spec.type == "builtin-url" then fetch_builtin-url name - else - abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; - - # If the environment variable NIV_OVERRIDE_${name} is set, then use - # the path directly as opposed to the fetched source. - replace = name: drv: - let - saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name; - ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; - in - if ersatz == "" then drv else - # this turns the string into an actual Nix path (for both absolute and - # relative paths) - if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; - - # Ports of functions for older nix versions - - # a Nix version of mapAttrs if the built-in doesn't exist - mapAttrs = builtins.mapAttrs or ( - f: set: with builtins; - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) - ); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 - range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 - stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 - stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); - concatMapStrings = f: list: concatStrings (map f list); - concatStrings = builtins.concatStringsSep ""; - - # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331 - optionalAttrs = cond: as: if cond then as else {}; - - # fetchTarball version that is compatible between all the versions of Nix - builtins_fetchTarball = { url, name ? null, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchTarball; - in - if lessThan nixVersion "1.12" then - fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchTarball attrs; - - # fetchurl version that is compatible between all the versions of Nix - builtins_fetchurl = { url, name ? null, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchurl; - in - if lessThan nixVersion "1.12" then - fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchurl attrs; - - # Create the final "sources" from the config - mkSources = config: - mapAttrs ( - name: spec: - if builtins.hasAttr "outPath" spec - then abort - "The values in sources.json should not have an 'outPath' attribute" - else - spec // { outPath = replace name (fetch config.pkgs name spec); } - ) config.sources; - - # The "config" used by the fetchers - mkConfig = - { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null - , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile) - , system ? builtins.currentSystem - , pkgs ? mkPkgs sources system - }: rec { - # The sources, i.e. the attribute set of spec name to spec - inherit sources; - - # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers - inherit pkgs; - }; - -in -mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } diff --git a/algo2/radix-heap/radix-heap.cabal b/algo2/radix-heap/radix-heap.cabal deleted file mode 100644 index 8a14f01..0000000 --- a/algo2/radix-heap/radix-heap.cabal +++ /dev/null @@ -1,25 +0,0 @@ -name: radix-heap -version: 0.1 -synopsis: Radix heap implementation. -description: Radix heap implementation. -homepage: -license: MIT -author: Paul Brinkmeier -build-type: Simple -cabal-version: >=1.10 - -library - hs-source-dirs: src - exposed-modules: Data.RadixHeap - - build-depends: base - ghc-options: -Wall -Wextra - default-language: Haskell2010 - -test-suite test-suite - type: exitcode-stdio-1.0 - main-is: Main.hs - hs-source-dirs: tests - ghc-options: -Wall -Wextra - build-depends: base >= 4.7 && < 5 - default-language: Haskell2010 diff --git a/algo2/radix-heap/src/Data/RadixHeap.hs b/algo2/radix-heap/src/Data/RadixHeap.hs deleted file mode 100644 index 5476cac..0000000 --- a/algo2/radix-heap/src/Data/RadixHeap.hs +++ /dev/null @@ -1,3 +0,0 @@ -module Data.RadixHeap where - -data RadixHeap diff --git a/algo2/radix-heap/stack-shell.nix b/algo2/radix-heap/stack-shell.nix deleted file mode 100644 index ceb5dfb..0000000 --- a/algo2/radix-heap/stack-shell.nix +++ /dev/null @@ -1,12 +0,0 @@ -{}: -let - pkgs = import ./nix/nixpkgs.nix {}; - ghc = import ./nix/ghc.nix; -in - pkgs.haskell.lib.buildStackProject { - name = "radix-heap"; - ghc = ghc pkgs; - buildInputs = with pkgs; [ - zlib - ]; - } diff --git a/algo2/radix-heap/stack.yaml b/algo2/radix-heap/stack.yaml deleted file mode 100644 index 8a513e9..0000000 --- a/algo2/radix-heap/stack.yaml +++ /dev/null @@ -1,8 +0,0 @@ -resolver: ghc-9.0.2 -packages: -- . - -nix: - enable: true - shell-file: stack-shell.nix - path: ["nixpkgs=./nix/nixpkgs.nix"] diff --git a/algo2/radix-heap/tests/Main.hs b/algo2/radix-heap/tests/Main.hs deleted file mode 100644 index c6ec7bd..0000000 --- a/algo2/radix-heap/tests/Main.hs +++ /dev/null @@ -1,4 +0,0 @@ -module Main where - -main :: IO () -main = putStrLn "All tests passed." diff --git a/algo2/radixheap/radixheap.c b/algo2/radixheap/radixheap.c new file mode 100644 index 0000000..e136e0a --- /dev/null +++ b/algo2/radixheap/radixheap.c @@ -0,0 +1,5 @@ +#include + +int main() { + printf("Hello, radix heap!\n"); +}